Changed the project to suit to the new project structure