Move back to single project layout