Improve markup structure

Put separate consolidated articles into separate sections.
Move towards killing off h3.heading-level-3 CSS selector.

I'll probably wait at least an hour before I merge this myself :wink: