diff --git a/MANIFEST b/MANIFEST
index b8d70130a..221ebc3b6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -137,24 +137,24 @@ lib/iolog/iolog_swapids.c
 lib/iolog/iolog_timing.c
 lib/iolog/iolog_util.c
 lib/iolog/iolog_write.c
-lib/iolog/regress/corpus/log_json/id.json
-lib/iolog/regress/corpus/log_json/ls.json
-lib/iolog/regress/corpus/log_json/mailq.json
-lib/iolog/regress/corpus/log_json/make.json
-lib/iolog/regress/corpus/log_json/pkg_add.json
-lib/iolog/regress/corpus/log_json/pkg_delete.json
-lib/iolog/regress/corpus/log_json/printenv.json
-lib/iolog/regress/corpus/log_legacy/id.log
-lib/iolog/regress/corpus/log_legacy/ls.log
-lib/iolog/regress/corpus/log_legacy/mailq.log
-lib/iolog/regress/corpus/log_legacy/make.log
-lib/iolog/regress/corpus/log_legacy/pkg_add.log
-lib/iolog/regress/corpus/log_legacy/pkg_delete.log
-lib/iolog/regress/corpus/log_legacy/printenv.log
-lib/iolog/regress/corpus/timing/timing.1
-lib/iolog/regress/corpus/timing/timing.2
-lib/iolog/regress/corpus/timing/timing.3
-lib/iolog/regress/corpus/timing/timing.4
+lib/iolog/regress/corpus/seed/log_json/id.json
+lib/iolog/regress/corpus/seed/log_json/ls.json
+lib/iolog/regress/corpus/seed/log_json/mailq.json
+lib/iolog/regress/corpus/seed/log_json/make.json
+lib/iolog/regress/corpus/seed/log_json/pkg_add.json
+lib/iolog/regress/corpus/seed/log_json/pkg_delete.json
+lib/iolog/regress/corpus/seed/log_json/printenv.json
+lib/iolog/regress/corpus/seed/log_legacy/id.log
+lib/iolog/regress/corpus/seed/log_legacy/ls.log
+lib/iolog/regress/corpus/seed/log_legacy/mailq.log
+lib/iolog/regress/corpus/seed/log_legacy/make.log
+lib/iolog/regress/corpus/seed/log_legacy/pkg_add.log
+lib/iolog/regress/corpus/seed/log_legacy/pkg_delete.log
+lib/iolog/regress/corpus/seed/log_legacy/printenv.log
+lib/iolog/regress/corpus/seed/timing/timing.1
+lib/iolog/regress/corpus/seed/timing/timing.2
+lib/iolog/regress/corpus/seed/timing/timing.3
+lib/iolog/regress/corpus/seed/timing/timing.4
 lib/iolog/regress/fuzz/fuzz_iolog_json.c
 lib/iolog/regress/fuzz/fuzz_iolog_json.dict
 lib/iolog/regress/fuzz/fuzz_iolog_legacy.c
@@ -231,9 +231,9 @@ lib/util/progname.c
 lib/util/pw_dup.c
 lib/util/pwrite.c
 lib/util/reallocarray.c
-lib/util/regress/corpus/sudo_conf/sudo.conf.1
-lib/util/regress/corpus/sudo_conf/sudo.conf.2
-lib/util/regress/corpus/sudo_conf/sudo.conf.3
+lib/util/regress/corpus/seed/sudo_conf/sudo.conf.1
+lib/util/regress/corpus/seed/sudo_conf/sudo.conf.2
+lib/util/regress/corpus/seed/sudo_conf/sudo.conf.3
 lib/util/regress/fnmatch/fnm_test.c
 lib/util/regress/fnmatch/fnm_test.in
 lib/util/regress/fuzz/fuzz_sudo_conf.c
@@ -351,12 +351,12 @@ logsrvd/logsrv_util.h
 logsrvd/logsrvd.c
 logsrvd/logsrvd.h
 logsrvd/logsrvd_conf.c
-logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.1
-logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.2
-logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.3
-logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.4
-logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.5
-logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.6
+logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.1
+logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.2
+logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.3
+logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.4
+logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.5
+logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.6
 logsrvd/regress/fuzz/fuzz_logsrvd_conf.c
 logsrvd/sendlog.c
 logsrvd/sendlog.h
@@ -660,11 +660,11 @@ plugins/sudoers/rcstr.c
 plugins/sudoers/redblack.c
 plugins/sudoers/redblack.h
 plugins/sudoers/regress/check_symbols/check_symbols.c
-plugins/sudoers/regress/corpus/policy/policy.1
-plugins/sudoers/regress/corpus/policy/policy.2
-plugins/sudoers/regress/corpus/policy/policy.3
-plugins/sudoers/regress/corpus/policy/policy.4
-plugins/sudoers/regress/corpus/policy/policy.5
+plugins/sudoers/regress/corpus/seed/policy/policy.1
+plugins/sudoers/regress/corpus/seed/policy/policy.2
+plugins/sudoers/regress/corpus/seed/policy/policy.3
+plugins/sudoers/regress/corpus/seed/policy/policy.4
+plugins/sudoers/regress/corpus/seed/policy/policy.5
 plugins/sudoers/regress/cvtsudoers/sudoers
 plugins/sudoers/regress/cvtsudoers/sudoers.defs
 plugins/sudoers/regress/cvtsudoers/test1.out.ok
diff --git a/lib/iolog/Makefile.in b/lib/iolog/Makefile.in
index 37d77a46a..4f19563fd 100644
--- a/lib/iolog/Makefile.in
+++ b/lib/iolog/Makefile.in
@@ -119,15 +119,15 @@ HOST_PORT_TEST_OBJS = host_port_test.lo
 
 FUZZ_IOLOG_JSON_OBJS = fuzz_iolog_json.lo
 
-FUZZ_IOLOG_JSON_CORPUS = $(srcdir)/regress/corpus/log_json/*.json
+FUZZ_IOLOG_JSON_CORPUS = $(srcdir)/regress/corpus/seed/log_json/*.json
 
 FUZZ_IOLOG_LEGACY_OBJS = fuzz_iolog_legacy.lo
 
-FUZZ_IOLOG_LEGACY_CORPUS = $(srcdir)/regress/corpus/log_legacy/*.log
+FUZZ_IOLOG_LEGACY_CORPUS = $(srcdir)/regress/corpus/seed/log_legacy/*.log
 
 FUZZ_IOLOG_TIMING_OBJS = fuzz_iolog_timing.lo
 
-FUZZ_IOLOG_TIMING_CORPUS = $(srcdir)/regress/corpus/timing/timing.*
+FUZZ_IOLOG_TIMING_CORPUS = $(srcdir)/regress/corpus/seed/timing/timing.*
 
 all: libsudo_iolog.la
 
diff --git a/lib/iolog/regress/corpus/log_json/id.json b/lib/iolog/regress/corpus/seed/log_json/id.json
similarity index 100%
rename from lib/iolog/regress/corpus/log_json/id.json
rename to lib/iolog/regress/corpus/seed/log_json/id.json
diff --git a/lib/iolog/regress/corpus/log_json/ls.json b/lib/iolog/regress/corpus/seed/log_json/ls.json
similarity index 100%
rename from lib/iolog/regress/corpus/log_json/ls.json
rename to lib/iolog/regress/corpus/seed/log_json/ls.json
diff --git a/lib/iolog/regress/corpus/log_json/mailq.json b/lib/iolog/regress/corpus/seed/log_json/mailq.json
similarity index 100%
rename from lib/iolog/regress/corpus/log_json/mailq.json
rename to lib/iolog/regress/corpus/seed/log_json/mailq.json
diff --git a/lib/iolog/regress/corpus/log_json/make.json b/lib/iolog/regress/corpus/seed/log_json/make.json
similarity index 100%
rename from lib/iolog/regress/corpus/log_json/make.json
rename to lib/iolog/regress/corpus/seed/log_json/make.json
diff --git a/lib/iolog/regress/corpus/log_json/pkg_add.json b/lib/iolog/regress/corpus/seed/log_json/pkg_add.json
similarity index 100%
rename from lib/iolog/regress/corpus/log_json/pkg_add.json
rename to lib/iolog/regress/corpus/seed/log_json/pkg_add.json
diff --git a/lib/iolog/regress/corpus/log_json/pkg_delete.json b/lib/iolog/regress/corpus/seed/log_json/pkg_delete.json
similarity index 100%
rename from lib/iolog/regress/corpus/log_json/pkg_delete.json
rename to lib/iolog/regress/corpus/seed/log_json/pkg_delete.json
diff --git a/lib/iolog/regress/corpus/log_json/printenv.json b/lib/iolog/regress/corpus/seed/log_json/printenv.json
similarity index 100%
rename from lib/iolog/regress/corpus/log_json/printenv.json
rename to lib/iolog/regress/corpus/seed/log_json/printenv.json
diff --git a/lib/iolog/regress/corpus/log_legacy/id.log b/lib/iolog/regress/corpus/seed/log_legacy/id.log
similarity index 100%
rename from lib/iolog/regress/corpus/log_legacy/id.log
rename to lib/iolog/regress/corpus/seed/log_legacy/id.log
diff --git a/lib/iolog/regress/corpus/log_legacy/ls.log b/lib/iolog/regress/corpus/seed/log_legacy/ls.log
similarity index 100%
rename from lib/iolog/regress/corpus/log_legacy/ls.log
rename to lib/iolog/regress/corpus/seed/log_legacy/ls.log
diff --git a/lib/iolog/regress/corpus/log_legacy/mailq.log b/lib/iolog/regress/corpus/seed/log_legacy/mailq.log
similarity index 100%
rename from lib/iolog/regress/corpus/log_legacy/mailq.log
rename to lib/iolog/regress/corpus/seed/log_legacy/mailq.log
diff --git a/lib/iolog/regress/corpus/log_legacy/make.log b/lib/iolog/regress/corpus/seed/log_legacy/make.log
similarity index 100%
rename from lib/iolog/regress/corpus/log_legacy/make.log
rename to lib/iolog/regress/corpus/seed/log_legacy/make.log
diff --git a/lib/iolog/regress/corpus/log_legacy/pkg_add.log b/lib/iolog/regress/corpus/seed/log_legacy/pkg_add.log
similarity index 100%
rename from lib/iolog/regress/corpus/log_legacy/pkg_add.log
rename to lib/iolog/regress/corpus/seed/log_legacy/pkg_add.log
diff --git a/lib/iolog/regress/corpus/log_legacy/pkg_delete.log b/lib/iolog/regress/corpus/seed/log_legacy/pkg_delete.log
similarity index 100%
rename from lib/iolog/regress/corpus/log_legacy/pkg_delete.log
rename to lib/iolog/regress/corpus/seed/log_legacy/pkg_delete.log
diff --git a/lib/iolog/regress/corpus/log_legacy/printenv.log b/lib/iolog/regress/corpus/seed/log_legacy/printenv.log
similarity index 100%
rename from lib/iolog/regress/corpus/log_legacy/printenv.log
rename to lib/iolog/regress/corpus/seed/log_legacy/printenv.log
diff --git a/lib/iolog/regress/corpus/timing/timing.1 b/lib/iolog/regress/corpus/seed/timing/timing.1
similarity index 100%
rename from lib/iolog/regress/corpus/timing/timing.1
rename to lib/iolog/regress/corpus/seed/timing/timing.1
diff --git a/lib/iolog/regress/corpus/timing/timing.2 b/lib/iolog/regress/corpus/seed/timing/timing.2
similarity index 100%
rename from lib/iolog/regress/corpus/timing/timing.2
rename to lib/iolog/regress/corpus/seed/timing/timing.2
diff --git a/lib/iolog/regress/corpus/timing/timing.3 b/lib/iolog/regress/corpus/seed/timing/timing.3
similarity index 100%
rename from lib/iolog/regress/corpus/timing/timing.3
rename to lib/iolog/regress/corpus/seed/timing/timing.3
diff --git a/lib/iolog/regress/corpus/timing/timing.4 b/lib/iolog/regress/corpus/seed/timing/timing.4
similarity index 100%
rename from lib/iolog/regress/corpus/timing/timing.4
rename to lib/iolog/regress/corpus/seed/timing/timing.4
diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in
index d93d619ce..713a00fc9 100644
--- a/lib/util/Makefile.in
+++ b/lib/util/Makefile.in
@@ -176,7 +176,7 @@ VSYSLOG_TEST_OBJS = vsyslog_test.lo vsyslog.lo
 
 FUZZ_SUDO_CONF_OBJS = fuzz_sudo_conf.lo
 
-FUZZ_SUDO_CONF_CORPUS = $(srcdir)/regress/corpus/sudo_conf/sudo.conf.*
+FUZZ_SUDO_CONF_CORPUS = $(srcdir)/regress/corpus/seed/sudo_conf/sudo.conf.*
 
 all: libsudo_util.la
 
diff --git a/lib/util/regress/corpus/sudo_conf/sudo.conf.1 b/lib/util/regress/corpus/seed/sudo_conf/sudo.conf.1
similarity index 100%
rename from lib/util/regress/corpus/sudo_conf/sudo.conf.1
rename to lib/util/regress/corpus/seed/sudo_conf/sudo.conf.1
diff --git a/lib/util/regress/corpus/sudo_conf/sudo.conf.2 b/lib/util/regress/corpus/seed/sudo_conf/sudo.conf.2
similarity index 100%
rename from lib/util/regress/corpus/sudo_conf/sudo.conf.2
rename to lib/util/regress/corpus/seed/sudo_conf/sudo.conf.2
diff --git a/lib/util/regress/corpus/sudo_conf/sudo.conf.3 b/lib/util/regress/corpus/seed/sudo_conf/sudo.conf.3
similarity index 100%
rename from lib/util/regress/corpus/sudo_conf/sudo.conf.3
rename to lib/util/regress/corpus/seed/sudo_conf/sudo.conf.3
diff --git a/logsrvd/Makefile.in b/logsrvd/Makefile.in
index b38d903d0..a153ad20e 100644
--- a/logsrvd/Makefile.in
+++ b/logsrvd/Makefile.in
@@ -131,7 +131,7 @@ VERSION = @PACKAGE_VERSION@
 
 FUZZ_LOGSRVD_CONF_OBJS = fuzz_logsrvd_conf.o logsrvd_conf.o
 
-FUZZ_LOGSRVD_CONF_CORPUS = $(srcdir)/regress/corpus/logsrvd_conf/logsrvd.conf.*
+FUZZ_LOGSRVD_CONF_CORPUS = $(srcdir)/regress/corpus/seed/logsrvd_conf/logsrvd.conf.*
 
 all: $(PROGS)
 
diff --git a/logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.1 b/logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.1
similarity index 100%
rename from logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.1
rename to logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.1
diff --git a/logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.2 b/logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.2
similarity index 100%
rename from logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.2
rename to logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.2
diff --git a/logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.3 b/logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.3
similarity index 100%
rename from logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.3
rename to logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.3
diff --git a/logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.4 b/logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.4
similarity index 100%
rename from logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.4
rename to logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.4
diff --git a/logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.5 b/logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.5
similarity index 100%
rename from logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.5
rename to logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.5
diff --git a/logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.6 b/logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.6
similarity index 100%
rename from logsrvd/regress/corpus/logsrvd_conf/logsrvd.conf.6
rename to logsrvd/regress/corpus/seed/logsrvd_conf/logsrvd.conf.6
diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index ed172aa1c..dcb33fbe2 100644
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -246,7 +246,7 @@ FUZZ_POLICY_OBJS = editor.lo env.lo env_pattern.lo fuzz_policy.o fuzz_stubs.o \
 		   gc.lo iolog_path_escapes.lo locale.lo policy.lo \
 		   strlcpy_unesc.lo strvec_join.lo sudoers.lo sudoers_hooks.lo
 
-FUZZ_POLICY_CORPUS = $(srcdir)/regress/corpus/policy/policy.*
+FUZZ_POLICY_CORPUS = $(srcdir)/regress/corpus/seed/policy/policy.*
 
 FUZZ_SUDOERS_OBJS = check_aliases.o fuzz_stubs.o fuzz_sudoers.o fmtsudoers.lo \
 		    parse.lo locale.lo sudo_printf.o
diff --git a/plugins/sudoers/regress/corpus/policy/policy.1 b/plugins/sudoers/regress/corpus/seed/policy/policy.1
similarity index 100%
rename from plugins/sudoers/regress/corpus/policy/policy.1
rename to plugins/sudoers/regress/corpus/seed/policy/policy.1
diff --git a/plugins/sudoers/regress/corpus/policy/policy.2 b/plugins/sudoers/regress/corpus/seed/policy/policy.2
similarity index 100%
rename from plugins/sudoers/regress/corpus/policy/policy.2
rename to plugins/sudoers/regress/corpus/seed/policy/policy.2
diff --git a/plugins/sudoers/regress/corpus/policy/policy.3 b/plugins/sudoers/regress/corpus/seed/policy/policy.3
similarity index 100%
rename from plugins/sudoers/regress/corpus/policy/policy.3
rename to plugins/sudoers/regress/corpus/seed/policy/policy.3
diff --git a/plugins/sudoers/regress/corpus/policy/policy.4 b/plugins/sudoers/regress/corpus/seed/policy/policy.4
similarity index 100%
rename from plugins/sudoers/regress/corpus/policy/policy.4
rename to plugins/sudoers/regress/corpus/seed/policy/policy.4
diff --git a/plugins/sudoers/regress/corpus/policy/policy.5 b/plugins/sudoers/regress/corpus/seed/policy/policy.5
similarity index 100%
rename from plugins/sudoers/regress/corpus/policy/policy.5
rename to plugins/sudoers/regress/corpus/seed/policy/policy.5