changing project structure slightly