Reorganizing the project