Cosmetic fixes to project structure