Moved Solver to main Package