Project structure improvements