Reorganizing the project structure