fixup validation module structure