Improved project structure and build