Renamed / moved project folder structure