-renamed all entities and embeddables as EntityN and EmbeddableN to
better depict the entity-embeddable relationships