Solver refactoring
MainWindow refactoring