Project structure upgraded