Reorganize the Solution