Reorganize lots of stuff