Restructe the solution