Project structure remastered