Reorganize a ton of things.