Changing project structure a bit more.