Renamed and removed some files.