Improved project layout