Renamed project and restructured code