Improved project structure.