Reorganizing the files in the project