Reorganized the project layout