Reorder schemas for readability

It is easier to relate entries to their enclosing hash if they are not at the
end of lots of closing braces.