Removed old assets and classes
Renamed classes