diff --git a/hosts/Anton/default.nix b/hosts/Anton/default.nix
index e4cd83a..e1f152b 100644
--- a/hosts/Anton/default.nix
+++ b/hosts/Anton/default.nix
@@ -15,9 +15,9 @@
     ./nfs.nix
     ./radicale.nix
 
-    ../../modules/common
-    ../../modules/server
-    ../../modules/home-manager
+    ../../modules/DEFAULT/COMMON
+    ../../modules/DEFAULT/SERVER
+    ../../modules/HOME-MANAGER/COMMON
 
   ];
 
diff --git a/hosts/Lenni/default.nix b/hosts/Lenni/default.nix
index ba9ef7b..516ecd9 100644
--- a/hosts/Lenni/default.nix
+++ b/hosts/Lenni/default.nix
@@ -4,9 +4,9 @@
     ./hardware-configuration.nix
     #./disko.nix
 
-    ../../modules/common
-    ../../modules/desktop
-    ../../modules/home-manager
+    ../../modules/DEFAULT/COMMON
+    ../../modules/DEFAULT/DESKTOP
+    ../../modules/HOME-MANAGER/COMMON
   ];
 
   common.syncthing = {
diff --git a/hosts/Lillie/default.nix b/hosts/Lillie/default.nix
index be8e2ef..d2a665e 100644
--- a/hosts/Lillie/default.nix
+++ b/hosts/Lillie/default.nix
@@ -4,9 +4,9 @@
     ./hardware-configuration.nix
     ./disko.nix
 
-    ../../modules/common
-    ../../modules/desktop
-    ../../modules/home-manager
+    ../../modules/DEFAULT/COMMON
+    ../../modules/DEFAULT/DESKTOP
+    ../../modules/HOME-MANAGER/COMMON
 
   ];
 }
diff --git a/hosts/Puenktchen/default.nix b/hosts/Puenktchen/default.nix
index 27a5fbb..a146a78 100644
--- a/hosts/Puenktchen/default.nix
+++ b/hosts/Puenktchen/default.nix
@@ -4,9 +4,9 @@
     ./hardware-configuration.nix
     ./disko.nix
 
-    ../../modules/common
-    ../../modules/desktop
-    ../../modules/home-manager
+    ../../modules/DEFAULT/COMMON
+    ../../modules/DEFAULT/DESKTOP
+    ../../modules/HOME-MANAGER/COMMON
   
   ];
 
diff --git a/modules/common/autoupdate.nix b/modules/DEFAULT/COMMON/autoupdate.nix
similarity index 100%
rename from modules/common/autoupdate.nix
rename to modules/DEFAULT/COMMON/autoupdate.nix
diff --git a/modules/common/default.nix b/modules/DEFAULT/COMMON/default.nix
similarity index 100%
rename from modules/common/default.nix
rename to modules/DEFAULT/COMMON/default.nix
diff --git a/modules/common/envvar.nix b/modules/DEFAULT/COMMON/envvar.nix
similarity index 100%
rename from modules/common/envvar.nix
rename to modules/DEFAULT/COMMON/envvar.nix
diff --git a/modules/common/garbage-collect.nix b/modules/DEFAULT/COMMON/garbage-collect.nix
similarity index 100%
rename from modules/common/garbage-collect.nix
rename to modules/DEFAULT/COMMON/garbage-collect.nix
diff --git a/modules/common/keyd.nix b/modules/DEFAULT/COMMON/keyd.nix
similarity index 100%
rename from modules/common/keyd.nix
rename to modules/DEFAULT/COMMON/keyd.nix
diff --git a/modules/common/locales.nix b/modules/DEFAULT/COMMON/locales.nix
similarity index 100%
rename from modules/common/locales.nix
rename to modules/DEFAULT/COMMON/locales.nix
diff --git a/modules/common/mimetype.nix b/modules/DEFAULT/COMMON/mimetype.nix
similarity index 100%
rename from modules/common/mimetype.nix
rename to modules/DEFAULT/COMMON/mimetype.nix
diff --git a/modules/common/nixvim/TODO.md b/modules/DEFAULT/COMMON/nixvim/TODO.md
similarity index 100%
rename from modules/common/nixvim/TODO.md
rename to modules/DEFAULT/COMMON/nixvim/TODO.md
diff --git a/modules/common/nixvim/autopairs.nix b/modules/DEFAULT/COMMON/nixvim/autopairs.nix
similarity index 100%
rename from modules/common/nixvim/autopairs.nix
rename to modules/DEFAULT/COMMON/nixvim/autopairs.nix
diff --git a/modules/common/nixvim/cmp.nix b/modules/DEFAULT/COMMON/nixvim/cmp.nix
similarity index 100%
rename from modules/common/nixvim/cmp.nix
rename to modules/DEFAULT/COMMON/nixvim/cmp.nix
diff --git a/modules/common/nixvim/default.nix b/modules/DEFAULT/COMMON/nixvim/default.nix
similarity index 100%
rename from modules/common/nixvim/default.nix
rename to modules/DEFAULT/COMMON/nixvim/default.nix
diff --git a/modules/common/nixvim/filetype.nix b/modules/DEFAULT/COMMON/nixvim/filetype.nix
similarity index 100%
rename from modules/common/nixvim/filetype.nix
rename to modules/DEFAULT/COMMON/nixvim/filetype.nix
diff --git a/modules/common/nixvim/gitsigns.nix b/modules/DEFAULT/COMMON/nixvim/gitsigns.nix
similarity index 100%
rename from modules/common/nixvim/gitsigns.nix
rename to modules/DEFAULT/COMMON/nixvim/gitsigns.nix
diff --git a/modules/common/nixvim/illuminate.nix b/modules/DEFAULT/COMMON/nixvim/illuminate.nix
similarity index 100%
rename from modules/common/nixvim/illuminate.nix
rename to modules/DEFAULT/COMMON/nixvim/illuminate.nix
diff --git a/modules/common/nixvim/lsp.nix b/modules/DEFAULT/COMMON/nixvim/lsp.nix
similarity index 100%
rename from modules/common/nixvim/lsp.nix
rename to modules/DEFAULT/COMMON/nixvim/lsp.nix
diff --git a/modules/common/nixvim/navic.nix b/modules/DEFAULT/COMMON/nixvim/navic.nix
similarity index 100%
rename from modules/common/nixvim/navic.nix
rename to modules/DEFAULT/COMMON/nixvim/navic.nix
diff --git a/modules/common/nixvim/neotree.nix b/modules/DEFAULT/COMMON/nixvim/neotree.nix
similarity index 100%
rename from modules/common/nixvim/neotree.nix
rename to modules/DEFAULT/COMMON/nixvim/neotree.nix
diff --git a/modules/common/nixvim/settings.nix b/modules/DEFAULT/COMMON/nixvim/settings.nix
similarity index 100%
rename from modules/common/nixvim/settings.nix
rename to modules/DEFAULT/COMMON/nixvim/settings.nix
diff --git a/modules/common/nixvim/treesitter.nix b/modules/DEFAULT/COMMON/nixvim/treesitter.nix
similarity index 100%
rename from modules/common/nixvim/treesitter.nix
rename to modules/DEFAULT/COMMON/nixvim/treesitter.nix
diff --git a/modules/common/nixvim/whichkey.nix b/modules/DEFAULT/COMMON/nixvim/whichkey.nix
similarity index 100%
rename from modules/common/nixvim/whichkey.nix
rename to modules/DEFAULT/COMMON/nixvim/whichkey.nix
diff --git a/modules/common/nixvim/yazi.nix b/modules/DEFAULT/COMMON/nixvim/yazi.nix
similarity index 100%
rename from modules/common/nixvim/yazi.nix
rename to modules/DEFAULT/COMMON/nixvim/yazi.nix
diff --git a/modules/common/optimise.nix b/modules/DEFAULT/COMMON/optimise.nix
similarity index 100%
rename from modules/common/optimise.nix
rename to modules/DEFAULT/COMMON/optimise.nix
diff --git a/modules/common/packages.nix b/modules/DEFAULT/COMMON/packages.nix
similarity index 100%
rename from modules/common/packages.nix
rename to modules/DEFAULT/COMMON/packages.nix
diff --git a/modules/common/sops.nix b/modules/DEFAULT/COMMON/sops.nix
similarity index 84%
rename from modules/common/sops.nix
rename to modules/DEFAULT/COMMON/sops.nix
index a51f189..03094f9 100644
--- a/modules/common/sops.nix
+++ b/modules/DEFAULT/COMMON/sops.nix
@@ -2,7 +2,7 @@
 {
 
 
-  sops.defaultSopsFile = ../../secrets/secrets.yaml;
+  sops.defaultSopsFile = ../../../secrets/secrets.yaml;
   sops.defaultSopsFormat = "yaml";
 
   sops.age.keyFile = "/home/willifan/.config/sops/age/keys.txt";
diff --git a/modules/common/stylix.nix b/modules/DEFAULT/COMMON/stylix.nix
similarity index 100%
rename from modules/common/stylix.nix
rename to modules/DEFAULT/COMMON/stylix.nix
diff --git a/modules/common/syncthing.nix b/modules/DEFAULT/COMMON/syncthing.nix
similarity index 100%
rename from modules/common/syncthing.nix
rename to modules/DEFAULT/COMMON/syncthing.nix
diff --git a/modules/common/users.nix b/modules/DEFAULT/COMMON/users.nix
similarity index 100%
rename from modules/common/users.nix
rename to modules/DEFAULT/COMMON/users.nix
diff --git a/modules/desktop/boot.nix b/modules/DEFAULT/DESKTOP/boot.nix
similarity index 100%
rename from modules/desktop/boot.nix
rename to modules/DEFAULT/DESKTOP/boot.nix
diff --git a/modules/desktop/default.nix b/modules/DEFAULT/DESKTOP/default.nix
similarity index 100%
rename from modules/desktop/default.nix
rename to modules/DEFAULT/DESKTOP/default.nix
diff --git a/modules/desktop/nfs-client.nix b/modules/DEFAULT/DESKTOP/nfs-client.nix
similarity index 100%
rename from modules/desktop/nfs-client.nix
rename to modules/DEFAULT/DESKTOP/nfs-client.nix
diff --git a/modules/desktop/nix-ld.nix b/modules/DEFAULT/DESKTOP/nix-ld.nix
similarity index 100%
rename from modules/desktop/nix-ld.nix
rename to modules/DEFAULT/DESKTOP/nix-ld.nix
diff --git a/modules/desktop/printers.nix b/modules/DEFAULT/DESKTOP/printers.nix
similarity index 100%
rename from modules/desktop/printers.nix
rename to modules/DEFAULT/DESKTOP/printers.nix
diff --git a/modules/desktop/remoteBuilder.nix b/modules/DEFAULT/DESKTOP/remoteBuilder.nix
similarity index 100%
rename from modules/desktop/remoteBuilder.nix
rename to modules/DEFAULT/DESKTOP/remoteBuilder.nix
diff --git a/modules/desktop/ssh-server.nix b/modules/DEFAULT/DESKTOP/ssh-server.nix
similarity index 100%
rename from modules/desktop/ssh-server.nix
rename to modules/DEFAULT/DESKTOP/ssh-server.nix
diff --git a/modules/server/boot.nix b/modules/DEFAULT/SERVER/boot.nix
similarity index 100%
rename from modules/server/boot.nix
rename to modules/DEFAULT/SERVER/boot.nix
diff --git a/modules/server/builder.nix b/modules/DEFAULT/SERVER/builder.nix
similarity index 100%
rename from modules/server/builder.nix
rename to modules/DEFAULT/SERVER/builder.nix
diff --git a/modules/server/default.nix b/modules/DEFAULT/SERVER/default.nix
similarity index 100%
rename from modules/server/default.nix
rename to modules/DEFAULT/SERVER/default.nix
diff --git a/modules/server/ssh-server.nix b/modules/DEFAULT/SERVER/ssh-server.nix
similarity index 100%
rename from modules/server/ssh-server.nix
rename to modules/DEFAULT/SERVER/ssh-server.nix
diff --git a/modules/home-manager/default.nix b/modules/HOME-MANAGER/COMMON/default.nix
similarity index 100%
rename from modules/home-manager/default.nix
rename to modules/HOME-MANAGER/COMMON/default.nix
diff --git a/modules/home-manager/git.nix b/modules/HOME-MANAGER/COMMON/git.nix
similarity index 100%
rename from modules/home-manager/git.nix
rename to modules/HOME-MANAGER/COMMON/git.nix
diff --git a/modules/home-manager/shell/bash.nix b/modules/HOME-MANAGER/COMMON/shell/bash.nix
similarity index 100%
rename from modules/home-manager/shell/bash.nix
rename to modules/HOME-MANAGER/COMMON/shell/bash.nix
diff --git a/modules/home-manager/shell/default.nix b/modules/HOME-MANAGER/COMMON/shell/default.nix
similarity index 100%
rename from modules/home-manager/shell/default.nix
rename to modules/HOME-MANAGER/COMMON/shell/default.nix
diff --git a/modules/home-manager/shell/eza.nix b/modules/HOME-MANAGER/COMMON/shell/eza.nix
similarity index 100%
rename from modules/home-manager/shell/eza.nix
rename to modules/HOME-MANAGER/COMMON/shell/eza.nix
diff --git a/modules/home-manager/shell/hyfetch.nix b/modules/HOME-MANAGER/COMMON/shell/hyfetch.nix
similarity index 100%
rename from modules/home-manager/shell/hyfetch.nix
rename to modules/HOME-MANAGER/COMMON/shell/hyfetch.nix
diff --git a/modules/home-manager/shell/nushell.nix b/modules/HOME-MANAGER/COMMON/shell/nushell.nix
similarity index 100%
rename from modules/home-manager/shell/nushell.nix
rename to modules/HOME-MANAGER/COMMON/shell/nushell.nix
diff --git a/modules/home-manager/shell/ssh.nix b/modules/HOME-MANAGER/COMMON/shell/ssh.nix
similarity index 100%
rename from modules/home-manager/shell/ssh.nix
rename to modules/HOME-MANAGER/COMMON/shell/ssh.nix
diff --git a/modules/home-manager/shell/starship.nix b/modules/HOME-MANAGER/COMMON/shell/starship.nix
similarity index 100%
rename from modules/home-manager/shell/starship.nix
rename to modules/HOME-MANAGER/COMMON/shell/starship.nix
diff --git a/modules/home-manager/shell/zoxide.nix b/modules/HOME-MANAGER/COMMON/shell/zoxide.nix
similarity index 100%
rename from modules/home-manager/shell/zoxide.nix
rename to modules/HOME-MANAGER/COMMON/shell/zoxide.nix
diff --git a/modules/home-manager/stylix.nix b/modules/HOME-MANAGER/COMMON/stylix.nix
similarity index 100%
rename from modules/home-manager/stylix.nix
rename to modules/HOME-MANAGER/COMMON/stylix.nix
diff --git a/modules/home-manager/tmux/default.nix b/modules/HOME-MANAGER/COMMON/tmux/default.nix
similarity index 100%
rename from modules/home-manager/tmux/default.nix
rename to modules/HOME-MANAGER/COMMON/tmux/default.nix
diff --git a/modules/home-manager/utils/default.nix b/modules/HOME-MANAGER/COMMON/utils/default.nix
similarity index 100%
rename from modules/home-manager/utils/default.nix
rename to modules/HOME-MANAGER/COMMON/utils/default.nix