diff --git a/machine-confs/helium.nix b/machine-confs/helium.nix
index a6a1363..0447e48 100644
--- a/machine-confs/helium.nix
+++ b/machine-confs/helium.nix
@@ -58,8 +58,8 @@
 
   imports = [
     ../base.nix
-    ../vili.nix
-    ../syncthing.nix
+    ../users/vili.nix
+    ../services/syncthing.nix
     ../desktop.nix
     ../development.nix
     ../misc/libinput.nix
diff --git a/machine-confs/nextcloud.nix b/machine-confs/nextcloud.nix
index 9987683..ac90358 100644
--- a/machine-confs/nextcloud.nix
+++ b/machine-confs/nextcloud.nix
@@ -4,7 +4,7 @@
 
   imports = [
     ../base.nix
-    ../nextcloud.nix
+    ../services/nextcloud.nix
   ];
 
   # HARDWARE SPECIFIC
diff --git a/machine-confs/nixos-cpu.nix b/machine-confs/nixos-cpu.nix
index aaa2c6a..5cc68b7 100644
--- a/machine-confs/nixos-cpu.nix
+++ b/machine-confs/nixos-cpu.nix
@@ -5,8 +5,8 @@
   imports = [
     ../base.nix
     ../development.nix
-    ../vili.nix
-    ../syncthing.nix
+    ../users/vili.nix
+    ../services/syncthing.nix
   ];
 
   # HARDWARE SPECIFIC
diff --git a/machine-confs/vaultwarden.nix b/machine-confs/vaultwarden.nix
index 040e456..ebbe10d 100644
--- a/machine-confs/vaultwarden.nix
+++ b/machine-confs/vaultwarden.nix
@@ -4,7 +4,7 @@
 
   imports = [
     ../base.nix
-    ../vaultwarden.nix
+    ../services/vaultwarden.nix
   ];
 
   # HARDWARE SPECIFIC
diff --git a/template-configuration.nix b/misc/template-configuration.nix
similarity index 100%
rename from template-configuration.nix
rename to misc/template-configuration.nix
diff --git a/nextcloud.nix b/services/nextcloud.nix
similarity index 100%
rename from nextcloud.nix
rename to services/nextcloud.nix
diff --git a/syncthing.nix b/services/syncthing.nix
similarity index 100%
rename from syncthing.nix
rename to services/syncthing.nix
diff --git a/vaultwarden.nix b/services/vaultwarden.nix
similarity index 100%
rename from vaultwarden.nix
rename to services/vaultwarden.nix
diff --git a/user-vili.nix b/users/vili.nix
similarity index 100%
rename from user-vili.nix
rename to users/vili.nix