Reorganized the project structure