Reorganize all the things