I completely reorder things. In the original, Congress comes right after the preamble. Topic 1 here is Bill of Rights stuff, stuff from various parts of the original seven articles, such as habeus corpus, and some new stuff. Various would-be Madisons similarly put peoples rights stuff first. The original Second Amendment, now re-worded, is in Topic 2, since it is about a State right.

AN advantage of an omnibus amendment is it can be limited to currently active material. That allows re-formatting.