Reorganize stuff.