changing project structure more