Moving doctype associations to sub-map
Completing move to sub-maps for top-level preferences