Improved project structure