Revert "Generated Entities and Mappings"
Revert "Revert "Generated Entities and Mappings""

This reverts commit b48632b12979b68c750d307a95fbb12effa60221.