Moved Validator to solver package; updated imports