Some improvements to the project structure.