Renamed files
Removed old files.