fix the project structure