diff --git a/src/fuzz/fuzz-unit-file.c b/src/core/fuzz-unit-file.c
similarity index 100%
rename from src/fuzz/fuzz-unit-file.c
rename to src/core/fuzz-unit-file.c
diff --git a/src/fuzz/fuzz-unit-file.options b/src/core/fuzz-unit-file.options
similarity index 100%
rename from src/fuzz/fuzz-unit-file.options
rename to src/core/fuzz-unit-file.options
diff --git a/src/fuzz/meson.build b/src/fuzz/meson.build
index f4508b5140..36bef1c7af 100644
--- a/src/fuzz/meson.build
+++ b/src/fuzz/meson.build
@@ -7,7 +7,7 @@ fuzzers += [
          [libjournal_core,
           libshared]],
 
-        [['src/fuzz/fuzz-dns-packet.c',
+        [['src/resolve/fuzz-dns-packet.c',
           dns_type_headers],
          [libsystemd_resolve_core,
           libshared],
@@ -15,28 +15,19 @@ fuzzers += [
           libgpg_error,
           libm]],
 
-        [['src/fuzz/fuzz-dhcp6-client.c',
-          'src/libsystemd-network/dhcp-identifier.h',
-          'src/libsystemd-network/dhcp-identifier.c',
-          'src/libsystemd-network/dhcp6-internal.h',
-          'src/systemd/sd-dhcp6-client.h'],
+        [['src/libsystemd-network/fuzz-dhcp6-client.c'],
          [libshared,
           libsystemd_network]],
 
-        [['src/fuzz/fuzz-dhcp-server.c'],
+        [['src/libsystemd-network/fuzz-dhcp-server.c'],
          [libsystemd_network,
           libshared]],
 
-        [['src/fuzz/fuzz-lldp.c'],
+        [['src/libsystemd-network/fuzz-lldp.c'],
          [libshared,
           libsystemd_network]],
 
-        [['src/fuzz/fuzz-ndisc-rs.c',
-          'src/libsystemd-network/dhcp-identifier.h',
-          'src/libsystemd-network/dhcp-identifier.c',
-          'src/libsystemd-network/icmp6-util.h',
-          'src/systemd/sd-dhcp6-client.h',
-          'src/systemd/sd-ndisc.h'],
+        [['src/libsystemd-network/fuzz-ndisc-rs.c'],
          [libshared,
           libsystemd_network]],
 
@@ -44,54 +35,54 @@ fuzzers += [
 
         [['src/fuzz/fuzz-varlink.c']],
 
-        [['src/fuzz/fuzz-unit-file.c'],
+        [['src/core/fuzz-unit-file.c'],
          [libcore,
           libshared],
          [libmount]],
 
-        [['src/fuzz/fuzz-journald-audit.c',
-          'src/fuzz/fuzz-journald.c'],
+        [['src/journal/fuzz-journald-audit.c',
+          'src/journal/fuzz-journald.c'],
          [libjournal_core,
           libshared],
          [libselinux]],
 
-        [['src/fuzz/fuzz-journald-kmsg.c',
-          'src/fuzz/fuzz-journald.c'],
+        [['src/journal/fuzz-journald-kmsg.c',
+          'src/journal/fuzz-journald.c'],
          [libjournal_core,
           libshared],
          [libselinux]],
 
-        [['src/fuzz/fuzz-journald-native.c',
-          'src/fuzz/fuzz-journald.c'],
+        [['src/journal/fuzz-journald-native.c',
+          'src/journal/fuzz-journald.c'],
          [libjournal_core,
           libshared],
          [libselinux]],
 
-        [['src/fuzz/fuzz-journald-native-fd.c',
-          'src/fuzz/fuzz-journald.c'],
+        [['src/journal/fuzz-journald-native-fd.c',
+          'src/journal/fuzz-journald.c'],
          [libjournal_core,
           libshared],
          [libselinux]],
 
-        [['src/fuzz/fuzz-journald-stream.c',
-          'src/fuzz/fuzz-journald.c'],
+        [['src/journal/fuzz-journald-stream.c',
+          'src/journal/fuzz-journald.c'],
          [libjournal_core,
           libshared],
          [libselinux]],
 
-        [['src/fuzz/fuzz-journald-syslog.c',
-          'src/fuzz/fuzz-journald.c'],
+        [['src/journal/fuzz-journald-syslog.c',
+          'src/journal/fuzz-journald.c'],
          [libjournal_core,
           libshared],
          [libselinux]],
 
-        [['src/fuzz/fuzz-journal-remote.c'],
+        [['src/journal-remote/fuzz-journal-remote.c'],
          [libsystemd_journal_remote,
           libshared]],
 
         [['src/fuzz/fuzz-udev-database.c']],
 
-        [['src/fuzz/fuzz-udev-rules.c'],
+        [['src/udev/fuzz-udev-rules.c'],
          [libudevd_core,
           libshared],
          [threads,
@@ -105,12 +96,12 @@ fuzzers += [
 
         [['src/fuzz/fuzz-hostname-setup.c']],
 
-        [['src/fuzz/fuzz-nspawn-settings.c'],
+        [['src/nspawn/fuzz-nspawn-settings.c'],
          [libshared,
           libnspawn_core],
          [libseccomp]],
 
-        [['src/fuzz/fuzz-nspawn-oci.c'],
+        [['src/nspawn/fuzz-nspawn-oci.c'],
          [libshared,
           libnspawn_core],
          [libseccomp]],
@@ -123,5 +114,5 @@ fuzzers += [
           'src/xdg-autostart-generator/xdg-autostart-service.h',
           'src/xdg-autostart-generator/xdg-autostart-service.c']],
 
-        [['src/fuzz/fuzz-udev-rule-parse-value.c']],
+        [['src/udev/fuzz-udev-rule-parse-value.c']],
 ]
diff --git a/src/fuzz/fuzz-journal-remote.c b/src/journal-remote/fuzz-journal-remote.c
similarity index 100%
rename from src/fuzz/fuzz-journal-remote.c
rename to src/journal-remote/fuzz-journal-remote.c
diff --git a/src/fuzz/fuzz-journal-remote.options b/src/journal-remote/fuzz-journal-remote.options
similarity index 100%
rename from src/fuzz/fuzz-journal-remote.options
rename to src/journal-remote/fuzz-journal-remote.options
diff --git a/src/fuzz/fuzz-journald-audit.c b/src/journal/fuzz-journald-audit.c
similarity index 100%
rename from src/fuzz/fuzz-journald-audit.c
rename to src/journal/fuzz-journald-audit.c
diff --git a/src/fuzz/fuzz-journald-kmsg.c b/src/journal/fuzz-journald-kmsg.c
similarity index 100%
rename from src/fuzz/fuzz-journald-kmsg.c
rename to src/journal/fuzz-journald-kmsg.c
diff --git a/src/fuzz/fuzz-journald-native-fd.c b/src/journal/fuzz-journald-native-fd.c
similarity index 100%
rename from src/fuzz/fuzz-journald-native-fd.c
rename to src/journal/fuzz-journald-native-fd.c
diff --git a/src/fuzz/fuzz-journald-native.c b/src/journal/fuzz-journald-native.c
similarity index 100%
rename from src/fuzz/fuzz-journald-native.c
rename to src/journal/fuzz-journald-native.c
diff --git a/src/fuzz/fuzz-journald-stream.c b/src/journal/fuzz-journald-stream.c
similarity index 100%
rename from src/fuzz/fuzz-journald-stream.c
rename to src/journal/fuzz-journald-stream.c
diff --git a/src/fuzz/fuzz-journald-stream.options b/src/journal/fuzz-journald-stream.options
similarity index 100%
rename from src/fuzz/fuzz-journald-stream.options
rename to src/journal/fuzz-journald-stream.options
diff --git a/src/fuzz/fuzz-journald-syslog.c b/src/journal/fuzz-journald-syslog.c
similarity index 100%
rename from src/fuzz/fuzz-journald-syslog.c
rename to src/journal/fuzz-journald-syslog.c
diff --git a/src/fuzz/fuzz-journald.c b/src/journal/fuzz-journald.c
similarity index 100%
rename from src/fuzz/fuzz-journald.c
rename to src/journal/fuzz-journald.c
diff --git a/src/fuzz/fuzz-journald.h b/src/journal/fuzz-journald.h
similarity index 100%
rename from src/fuzz/fuzz-journald.h
rename to src/journal/fuzz-journald.h
diff --git a/src/fuzz/fuzz-dhcp-server.c b/src/libsystemd-network/fuzz-dhcp-server.c
similarity index 100%
rename from src/fuzz/fuzz-dhcp-server.c
rename to src/libsystemd-network/fuzz-dhcp-server.c
diff --git a/src/fuzz/fuzz-dhcp-server.options b/src/libsystemd-network/fuzz-dhcp-server.options
similarity index 100%
rename from src/fuzz/fuzz-dhcp-server.options
rename to src/libsystemd-network/fuzz-dhcp-server.options
diff --git a/src/fuzz/fuzz-dhcp6-client.c b/src/libsystemd-network/fuzz-dhcp6-client.c
similarity index 100%
rename from src/fuzz/fuzz-dhcp6-client.c
rename to src/libsystemd-network/fuzz-dhcp6-client.c
diff --git a/src/fuzz/fuzz-dhcp6-client.options b/src/libsystemd-network/fuzz-dhcp6-client.options
similarity index 100%
rename from src/fuzz/fuzz-dhcp6-client.options
rename to src/libsystemd-network/fuzz-dhcp6-client.options
diff --git a/src/fuzz/fuzz-lldp.c b/src/libsystemd-network/fuzz-lldp.c
similarity index 100%
rename from src/fuzz/fuzz-lldp.c
rename to src/libsystemd-network/fuzz-lldp.c
diff --git a/src/fuzz/fuzz-lldp.options b/src/libsystemd-network/fuzz-lldp.options
similarity index 100%
rename from src/fuzz/fuzz-lldp.options
rename to src/libsystemd-network/fuzz-lldp.options
diff --git a/src/fuzz/fuzz-ndisc-rs.c b/src/libsystemd-network/fuzz-ndisc-rs.c
similarity index 100%
rename from src/fuzz/fuzz-ndisc-rs.c
rename to src/libsystemd-network/fuzz-ndisc-rs.c
diff --git a/src/fuzz/fuzz-ndisc-rs.options b/src/libsystemd-network/fuzz-ndisc-rs.options
similarity index 100%
rename from src/fuzz/fuzz-ndisc-rs.options
rename to src/libsystemd-network/fuzz-ndisc-rs.options
diff --git a/src/fuzz/fuzz-nspawn-oci.c b/src/nspawn/fuzz-nspawn-oci.c
similarity index 100%
rename from src/fuzz/fuzz-nspawn-oci.c
rename to src/nspawn/fuzz-nspawn-oci.c
diff --git a/src/fuzz/fuzz-nspawn-oci.options b/src/nspawn/fuzz-nspawn-oci.options
similarity index 100%
rename from src/fuzz/fuzz-nspawn-oci.options
rename to src/nspawn/fuzz-nspawn-oci.options
diff --git a/src/fuzz/fuzz-nspawn-settings.c b/src/nspawn/fuzz-nspawn-settings.c
similarity index 100%
rename from src/fuzz/fuzz-nspawn-settings.c
rename to src/nspawn/fuzz-nspawn-settings.c
diff --git a/src/fuzz/fuzz-nspawn-settings.options b/src/nspawn/fuzz-nspawn-settings.options
similarity index 100%
rename from src/fuzz/fuzz-nspawn-settings.options
rename to src/nspawn/fuzz-nspawn-settings.options
diff --git a/src/fuzz/fuzz-dns-packet.c b/src/resolve/fuzz-dns-packet.c
similarity index 100%
rename from src/fuzz/fuzz-dns-packet.c
rename to src/resolve/fuzz-dns-packet.c
diff --git a/src/fuzz/fuzz-dns-packet.options b/src/resolve/fuzz-dns-packet.options
similarity index 100%
rename from src/fuzz/fuzz-dns-packet.options
rename to src/resolve/fuzz-dns-packet.options
diff --git a/src/fuzz/fuzz-udev-rule-parse-value.c b/src/udev/fuzz-udev-rule-parse-value.c
similarity index 100%
rename from src/fuzz/fuzz-udev-rule-parse-value.c
rename to src/udev/fuzz-udev-rule-parse-value.c
diff --git a/src/fuzz/fuzz-udev-rules.c b/src/udev/fuzz-udev-rules.c
similarity index 100%
rename from src/fuzz/fuzz-udev-rules.c
rename to src/udev/fuzz-udev-rules.c
diff --git a/src/fuzz/fuzz-udev-rules.options b/src/udev/fuzz-udev-rules.options
similarity index 100%
rename from src/fuzz/fuzz-udev-rules.options
rename to src/udev/fuzz-udev-rules.options