Tidying and optimising project structure