Reorganize slightly.
Deduplicate ALL THE THINGS EVER.