Remove old generated entities
Split the configuration out and namespace the entities
Add the generated entities