Starting refactoring of the Validation module.