Reorganize the original