Reordered and reorganized a bunch of stuff.