Reorganize the project structure