diff --git a/Rocky-9-aarch64-generic-Minimal.ks b/Rocky-9-aarch64-generic-Minimal.ks
index ddec97f..3f08e6b 100644
--- a/Rocky-9-aarch64-generic-Minimal.ks
+++ b/Rocky-9-aarch64-generic-Minimal.ks
@@ -1,3 +1,3 @@
-%include includes/rockyrepos9.ksi
-%include includes/gen-reposcommon9.ksi
+%include includes/repos/rockyrepos9.ksi
+%include includes/repos/gen-reposcommon9.ksi
 %include includes/gen-rockycommon9.ksi
diff --git a/includes/gen-partitions9.ksi b/includes/disks/gen-partitions9.ksi
similarity index 100%
rename from includes/gen-partitions9.ksi
rename to includes/disks/gen-partitions9.ksi
diff --git a/includes/gen-rockycommon9.ksi b/includes/gen-rockycommon9.ksi
index cc68670..87b5dc0 100644
--- a/includes/gen-rockycommon9.ksi
+++ b/includes/gen-rockycommon9.ksi
@@ -1,9 +1,9 @@
 rootpw --lock
 %include includes/basecommon9.ksi
-%include includes/gen-partitions9.ksi
-%include includes/packages9.ksi
-%include includes/gen-packages9.ksi
-%include includes/precommon9.ksi
-%include includes/rockyreadme9.ksi
-%include includes/gen-postcommon9.ksi
-%include includes/postcommon9.ksi
+%include includes/disks/gen-partitions9.ksi
+%include includes/packages/packages9.ksi
+%include includes/packages/gen-packages9.ksi
+%include includes/pre/precommon9.ksi
+%include includes/post/rockyreadme9.ksi
+%include includes/post/gen-postcommon9.ksi
+%include includes/post/postcommon9.ksi
diff --git a/includes/gen-packages9.ksi b/includes/packages/gen-packages9.ksi
similarity index 100%
rename from includes/gen-packages9.ksi
rename to includes/packages/gen-packages9.ksi
diff --git a/includes/packages9.ksi b/includes/packages/packages9.ksi
similarity index 100%
rename from includes/packages9.ksi
rename to includes/packages/packages9.ksi
diff --git a/includes/gen-postcommon9.ksi b/includes/post/gen-postcommon9.ksi
similarity index 100%
rename from includes/gen-postcommon9.ksi
rename to includes/post/gen-postcommon9.ksi
diff --git a/includes/postcommon9.ksi b/includes/post/postcommon9.ksi
similarity index 100%
rename from includes/postcommon9.ksi
rename to includes/post/postcommon9.ksi
diff --git a/includes/rockyreadme9.ksi b/includes/post/rockyreadme9.ksi
similarity index 100%
rename from includes/rockyreadme9.ksi
rename to includes/post/rockyreadme9.ksi
diff --git a/includes/rootfs-expand.ksi b/includes/post/rootfs-expand.ksi
similarity index 100%
rename from includes/rootfs-expand.ksi
rename to includes/post/rootfs-expand.ksi
diff --git a/includes/precommon9.ksi b/includes/pre/precommon9.ksi
similarity index 100%
rename from includes/precommon9.ksi
rename to includes/pre/precommon9.ksi
diff --git a/includes/gen-reposcommon9.ksi b/includes/repos/gen-reposcommon9.ksi
similarity index 100%
rename from includes/gen-reposcommon9.ksi
rename to includes/repos/gen-reposcommon9.ksi
diff --git a/includes/rockyrepos9.ksi b/includes/repos/rockyrepos9.ksi
similarity index 100%
rename from includes/rockyrepos9.ksi
rename to includes/repos/rockyrepos9.ksi