Refactored validators to their own directories