Neat the project structure