Re-organize a bunch of stuff.