Reorganize the solution structure