Renamed and refactored some files to better locations.