Improve the project structure