Reorganized a bunch of stuff.