More faffing about the the project structure.