Renamed files and classes
Removed old files