Cleaning up the project structure