Redesigned project structure