Reorganization of the files in the project