separate Validator to another dist