Restructured the validations classes