Updated Solver to use new modules.