Move the CustomValidationPopup class into its own file