Project structure tidy-up