Project structure related changes