Renamed projects again to make them match, and put them in correct directories