Finish with restructuring solvers code.