Project structure tidy up.