Modified Project structure