Changed the project structure