Renamed project + cleanup