Reorganize all the things!

I went a little OCD crazy here. Feel free to ignore whatever.