Split the entity types into their own file
Added file include