Renamed and deleted unused files.