Renamed project and classes