Major tidy-up of the project structure