Merge "Renamed and moved InputWindow and related files"