Renamed some classes
Renamed some classes
Cleanup