diff --git a/system/modules/0_template/default.nix b/system/systemmodules/0_template/default.nix
similarity index 100%
rename from system/modules/0_template/default.nix
rename to system/systemmodules/0_template/default.nix
diff --git a/system/modules/0_template/options.nix b/system/systemmodules/0_template/options.nix
similarity index 100%
rename from system/modules/0_template/options.nix
rename to system/systemmodules/0_template/options.nix
diff --git a/system/modules/1_deprecated/agenix/default.nix b/system/systemmodules/1_deprecated/agenix/default.nix
similarity index 100%
rename from system/modules/1_deprecated/agenix/default.nix
rename to system/systemmodules/1_deprecated/agenix/default.nix
diff --git a/system/modules/1_deprecated/agenix/options.nix b/system/systemmodules/1_deprecated/agenix/options.nix
similarity index 100%
rename from system/modules/1_deprecated/agenix/options.nix
rename to system/systemmodules/1_deprecated/agenix/options.nix
diff --git a/system/modules/1_deprecated/agenix/void.age b/system/systemmodules/1_deprecated/agenix/void.age
similarity index 100%
rename from system/modules/1_deprecated/agenix/void.age
rename to system/systemmodules/1_deprecated/agenix/void.age
diff --git a/system/modules/1_deprecated/containers/default.nix b/system/systemmodules/1_deprecated/containers/default.nix
similarity index 100%
rename from system/modules/1_deprecated/containers/default.nix
rename to system/systemmodules/1_deprecated/containers/default.nix
diff --git a/system/modules/1_deprecated/containers/options.nix b/system/systemmodules/1_deprecated/containers/options.nix
similarity index 100%
rename from system/modules/1_deprecated/containers/options.nix
rename to system/systemmodules/1_deprecated/containers/options.nix
diff --git a/system/modules/bootloader/default.nix b/system/systemmodules/bootloader/default.nix
similarity index 100%
rename from system/modules/bootloader/default.nix
rename to system/systemmodules/bootloader/default.nix
diff --git a/system/modules/bootloader/options.nix b/system/systemmodules/bootloader/options.nix
similarity index 100%
rename from system/modules/bootloader/options.nix
rename to system/systemmodules/bootloader/options.nix
diff --git a/system/modules/default.nix b/system/systemmodules/default.nix
similarity index 100%
rename from system/modules/default.nix
rename to system/systemmodules/default.nix
diff --git a/system/modules/desktopportal/default.nix b/system/systemmodules/desktopportal/default.nix
similarity index 100%
rename from system/modules/desktopportal/default.nix
rename to system/systemmodules/desktopportal/default.nix
diff --git a/system/modules/desktopportal/options.nix b/system/systemmodules/desktopportal/options.nix
similarity index 100%
rename from system/modules/desktopportal/options.nix
rename to system/systemmodules/desktopportal/options.nix
diff --git a/system/modules/docker/default.nix b/system/systemmodules/docker/default.nix
similarity index 100%
rename from system/modules/docker/default.nix
rename to system/systemmodules/docker/default.nix
diff --git a/system/modules/docker/options.nix b/system/systemmodules/docker/options.nix
similarity index 100%
rename from system/modules/docker/options.nix
rename to system/systemmodules/docker/options.nix
diff --git a/system/modules/fonts/default.nix b/system/systemmodules/fonts/default.nix
similarity index 100%
rename from system/modules/fonts/default.nix
rename to system/systemmodules/fonts/default.nix
diff --git a/system/modules/fonts/options.nix b/system/systemmodules/fonts/options.nix
similarity index 100%
rename from system/modules/fonts/options.nix
rename to system/systemmodules/fonts/options.nix
diff --git a/system/modules/impermanence/default.nix b/system/systemmodules/impermanence/default.nix
similarity index 100%
rename from system/modules/impermanence/default.nix
rename to system/systemmodules/impermanence/default.nix
diff --git a/system/modules/impermanence/options.nix b/system/systemmodules/impermanence/options.nix
similarity index 100%
rename from system/modules/impermanence/options.nix
rename to system/systemmodules/impermanence/options.nix
diff --git a/system/modules/mime/default.nix b/system/systemmodules/mime/default.nix
similarity index 100%
rename from system/modules/mime/default.nix
rename to system/systemmodules/mime/default.nix
diff --git a/system/modules/mime/options.nix b/system/systemmodules/mime/options.nix
similarity index 100%
rename from system/modules/mime/options.nix
rename to system/systemmodules/mime/options.nix
diff --git a/system/modules/network/default.nix b/system/systemmodules/network/default.nix
similarity index 100%
rename from system/modules/network/default.nix
rename to system/systemmodules/network/default.nix
diff --git a/system/modules/network/options.nix b/system/systemmodules/network/options.nix
similarity index 100%
rename from system/modules/network/options.nix
rename to system/systemmodules/network/options.nix
diff --git a/system/modules/polkit/default.nix b/system/systemmodules/polkit/default.nix
similarity index 100%
rename from system/modules/polkit/default.nix
rename to system/systemmodules/polkit/default.nix
diff --git a/system/modules/polkit/options.nix b/system/systemmodules/polkit/options.nix
similarity index 100%
rename from system/modules/polkit/options.nix
rename to system/systemmodules/polkit/options.nix
diff --git a/system/modules/sops-nix/default.nix b/system/systemmodules/sops-nix/default.nix
similarity index 100%
rename from system/modules/sops-nix/default.nix
rename to system/systemmodules/sops-nix/default.nix
diff --git a/system/modules/sops-nix/options.nix b/system/systemmodules/sops-nix/options.nix
similarity index 100%
rename from system/modules/sops-nix/options.nix
rename to system/systemmodules/sops-nix/options.nix
diff --git a/system/modules/sops-nix/secrets.yaml b/system/systemmodules/sops-nix/secrets.yaml
similarity index 100%
rename from system/modules/sops-nix/secrets.yaml
rename to system/systemmodules/sops-nix/secrets.yaml