Reorganized the Solution.