diff --git a/meson.build b/meson.build
index f579807945..c7b7399d7e 100644
--- a/meson.build
+++ b/meson.build
@@ -2366,6 +2366,7 @@ subdir('src/fsck')
 subdir('src/fstab-generator')
 subdir('src/getty-generator')
 subdir('src/gpt-auto-generator')
+subdir('src/growfs')
 subdir('src/hibernate-resume')
 subdir('src/home')
 subdir('src/hostname')
@@ -2394,7 +2395,6 @@ subdir('src/nss-mymachines')
 subdir('src/nss-resolve')
 subdir('src/nss-systemd')
 subdir('src/oom')
-subdir('src/partition')
 subdir('src/path')
 subdir('src/pcrextend')
 subdir('src/pcrlock')
@@ -2404,6 +2404,7 @@ subdir('src/quotacheck')
 subdir('src/random-seed')
 subdir('src/rc-local-generator')
 subdir('src/remount-fs')
+subdir('src/repart')
 subdir('src/reply-password')
 subdir('src/resolve')
 subdir('src/rfkill')
diff --git a/src/partition/growfs.c b/src/growfs/growfs.c
similarity index 100%
rename from src/partition/growfs.c
rename to src/growfs/growfs.c
diff --git a/src/partition/makefs.c b/src/growfs/makefs.c
similarity index 100%
rename from src/partition/makefs.c
rename to src/growfs/makefs.c
diff --git a/src/growfs/meson.build b/src/growfs/meson.build
new file mode 100644
index 0000000000..0fcedb19d9
--- /dev/null
+++ b/src/growfs/meson.build
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-growfs',
+                'sources' : files('growfs.c'),
+        },
+        libexec_template + {
+                'name' : 'systemd-makefs',
+                'sources' : files('makefs.c'),
+        },
+]
diff --git a/src/partition/definitions/confext.repart.d/10-root.conf b/src/repart/definitions/confext.repart.d/10-root.conf
similarity index 100%
rename from src/partition/definitions/confext.repart.d/10-root.conf
rename to src/repart/definitions/confext.repart.d/10-root.conf
diff --git a/src/partition/definitions/confext.repart.d/20-root-verity.conf b/src/repart/definitions/confext.repart.d/20-root-verity.conf
similarity index 100%
rename from src/partition/definitions/confext.repart.d/20-root-verity.conf
rename to src/repart/definitions/confext.repart.d/20-root-verity.conf
diff --git a/src/partition/definitions/confext.repart.d/30-root-verity-sig.conf b/src/repart/definitions/confext.repart.d/30-root-verity-sig.conf
similarity index 100%
rename from src/partition/definitions/confext.repart.d/30-root-verity-sig.conf
rename to src/repart/definitions/confext.repart.d/30-root-verity-sig.conf
diff --git a/src/partition/definitions/portable.repart.d/10-root.conf b/src/repart/definitions/portable.repart.d/10-root.conf
similarity index 100%
rename from src/partition/definitions/portable.repart.d/10-root.conf
rename to src/repart/definitions/portable.repart.d/10-root.conf
diff --git a/src/partition/definitions/portable.repart.d/20-root-verity.conf b/src/repart/definitions/portable.repart.d/20-root-verity.conf
similarity index 100%
rename from src/partition/definitions/portable.repart.d/20-root-verity.conf
rename to src/repart/definitions/portable.repart.d/20-root-verity.conf
diff --git a/src/partition/definitions/portable.repart.d/30-root-verity-sig.conf b/src/repart/definitions/portable.repart.d/30-root-verity-sig.conf
similarity index 100%
rename from src/partition/definitions/portable.repart.d/30-root-verity-sig.conf
rename to src/repart/definitions/portable.repart.d/30-root-verity-sig.conf
diff --git a/src/partition/definitions/sysext.repart.d/10-root.conf b/src/repart/definitions/sysext.repart.d/10-root.conf
similarity index 100%
rename from src/partition/definitions/sysext.repart.d/10-root.conf
rename to src/repart/definitions/sysext.repart.d/10-root.conf
diff --git a/src/partition/definitions/sysext.repart.d/20-root-verity.conf b/src/repart/definitions/sysext.repart.d/20-root-verity.conf
similarity index 100%
rename from src/partition/definitions/sysext.repart.d/20-root-verity.conf
rename to src/repart/definitions/sysext.repart.d/20-root-verity.conf
diff --git a/src/partition/definitions/sysext.repart.d/30-root-verity-sig.conf b/src/repart/definitions/sysext.repart.d/30-root-verity-sig.conf
similarity index 100%
rename from src/partition/definitions/sysext.repart.d/30-root-verity-sig.conf
rename to src/repart/definitions/sysext.repart.d/30-root-verity-sig.conf
diff --git a/src/partition/meson.build b/src/repart/meson.build
similarity index 73%
rename from src/partition/meson.build
rename to src/repart/meson.build
index 2cfe43e029..bbf2584597 100644
--- a/src/partition/meson.build
+++ b/src/repart/meson.build
@@ -1,14 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 executables += [
-        libexec_template + {
-                'name' : 'systemd-growfs',
-                'sources' : files('growfs.c'),
-        },
-        libexec_template + {
-                'name' : 'systemd-makefs',
-                'sources' : files('makefs.c'),
-        },
         executable_template + {
                 'name' : 'systemd-repart',
                 'public' : true,
@@ -49,13 +41,13 @@ executables += [
 ]
 
 if conf.get('ENABLE_REPART') == 1
-        install_data('definitions/confext.repart.d/10-root.conf', install_dir : repartdefinitionsdir / 'confext.repart.d')
-        install_data('definitions/confext.repart.d/20-root-verity.conf', install_dir : repartdefinitionsdir / 'confext.repart.d')
-        install_data('definitions/confext.repart.d/30-root-verity-sig.conf', install_dir : repartdefinitionsdir / 'confext.repart.d')
-        install_data('definitions/portable.repart.d/10-root.conf', install_dir : repartdefinitionsdir / 'portable.repart.d')
-        install_data('definitions/portable.repart.d/20-root-verity.conf', install_dir : repartdefinitionsdir / 'portable.repart.d')
+        install_data('definitions/confext.repart.d/10-root.conf',             install_dir : repartdefinitionsdir / 'confext.repart.d')
+        install_data('definitions/confext.repart.d/20-root-verity.conf',      install_dir : repartdefinitionsdir / 'confext.repart.d')
+        install_data('definitions/confext.repart.d/30-root-verity-sig.conf',  install_dir : repartdefinitionsdir / 'confext.repart.d')
+        install_data('definitions/portable.repart.d/10-root.conf',            install_dir : repartdefinitionsdir / 'portable.repart.d')
+        install_data('definitions/portable.repart.d/20-root-verity.conf',     install_dir : repartdefinitionsdir / 'portable.repart.d')
         install_data('definitions/portable.repart.d/30-root-verity-sig.conf', install_dir : repartdefinitionsdir / 'portable.repart.d')
-        install_data('definitions/sysext.repart.d/10-root.conf', install_dir : repartdefinitionsdir / 'sysext.repart.d')
-        install_data('definitions/sysext.repart.d/20-root-verity.conf', install_dir : repartdefinitionsdir / 'sysext.repart.d')
-        install_data('definitions/sysext.repart.d/30-root-verity-sig.conf', install_dir : repartdefinitionsdir / 'sysext.repart.d')
+        install_data('definitions/sysext.repart.d/10-root.conf',              install_dir : repartdefinitionsdir / 'sysext.repart.d')
+        install_data('definitions/sysext.repart.d/20-root-verity.conf',       install_dir : repartdefinitionsdir / 'sysext.repart.d')
+        install_data('definitions/sysext.repart.d/30-root-verity-sig.conf',   install_dir : repartdefinitionsdir / 'sysext.repart.d')
 endif
diff --git a/src/partition/repart.c b/src/repart/repart.c
similarity index 100%
rename from src/partition/repart.c
rename to src/repart/repart.c