More project structure maneuvering.