Changed Solver class name to Controller