Move the schema metadata fields which are on every schema instance into their own sub-object for tidiness.
Re-fix schema registration bootstrapping.