Reorganize a lot of things.