Project structure rejiggering