Reorganized the project file