Begin to re-format mappings to single-schema entities.
Refactor to single-schema entities.