Reorganized the project structure.