Renamed some classes and files