All solvers moved into a class