MEP 12: Gallery cleanup and reorganization (rebase)

Rebase of #1623. I rebased on a separate branch just in case I mess up. The gallery looks good on my end, but I don't have the green button so I can't check whether or not github gives the "We can’t automatically merge this pull request." message.