Merge "Renamed and moved InputWindow and related files" into sc-v2-dev