Fix the project structure