Adjust the project structure