reorganizing the project structure