Project structure changes