Prepared new Project structure