Moved Solvers to correct namespace