Reorganize a bunch of stuff