Move lib/validator to modules/validator