Reorganized the project