modulesets: Reorder some elements to satisfy the schema

This doesn’t introduce any semantic changes; just reorders the elements
to match the order required by the schemas. Sigh.

Helps: https://bugzilla.gnome.org/show_bug.cgi?id=696184