Refactoring classes and implementing solver start-up