Moved Validator to package solver; modified imports