Renamed and restructed project