Rename Validator to Validatable
Switch Validator module to Validatable