Reorganize the solution.