Reorganize the whole thing