Moved some content out of top level of the schema into local sections.