Renamed project and some reordering og CCs