Project structure redesigned