diff --git a/configuration.nix b/configuration.nix
index e33f4e8..63fcddb 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -6,27 +6,27 @@ in
 {
   imports = [
     ./hardware-configuration.nix
-
     ./variables-module.nix
     ./variables.nix
     ./files.nix
     ./users.nix
-    ./mailserver/system/mailserver.nix
-    ./mailserver/system/alps.nix
-    ./vpn/ocserv.nix
     ./api/api.nix
     ./api/api-module.nix
-    ./social/pleroma.nix
-    ./letsencrypt/acme.nix
-    ./letsencrypt/resolve.nix
-    ./backup/restic.nix
-    ./passmgr/bitwarden.nix
-    ./webserver/nginx.nix
-    ./webserver/memcached.nix
-    ./nextcloud/nextcloud.nix
     ./resources/limits.nix
-    ./videomeet/jitsi.nix
-    ./git/gitea.nix
+    ./local/services/backup/restic.nix
+    ./local/services/git/gitea.nix
+    ./local/services/letsencrypt/acme.nix
+    ./local/services/letsencrypt/resolve.nix
+    ./local/services/mailserver/alps.nix
+    ./local/services/mailserver/mailserver.nix
+    ./local/services/nextcloud/nextcloud.nix
+    ./local/services/passmgr/bitwarden.nix
+    ./local/services/passmgr/bitwarden.nix
+    ./local/services/social/pleroma.nix
+    ./local/services/videomeet/jitsi.nix
+    ./local/services/vpn/ocserv.nix
+    ./local/services/webserver/memcached.nix
+    ./local/services/webserver/nginx.nix
   ];
 
   nixpkgs.overlays = [ (nix-overlay) ];
diff --git a/backup/restic.nix b/local/services/backup/restic.nix
similarity index 100%
rename from backup/restic.nix
rename to local/services/backup/restic.nix
diff --git a/git/gitea.nix b/local/services/git/gitea.nix
similarity index 100%
rename from git/gitea.nix
rename to local/services/git/gitea.nix
diff --git a/letsencrypt/acme.nix b/local/services/letsencrypt/acme.nix
similarity index 100%
rename from letsencrypt/acme.nix
rename to local/services/letsencrypt/acme.nix
diff --git a/letsencrypt/resolve.nix b/local/services/letsencrypt/resolve.nix
similarity index 100%
rename from letsencrypt/resolve.nix
rename to local/services/letsencrypt/resolve.nix
diff --git a/mailserver/system/alps-package.nix b/local/services/mailserver/alps-package.nix
similarity index 100%
rename from mailserver/system/alps-package.nix
rename to local/services/mailserver/alps-package.nix
diff --git a/mailserver/system/alps.nix b/local/services/mailserver/alps.nix
similarity index 100%
rename from mailserver/system/alps.nix
rename to local/services/mailserver/alps.nix
diff --git a/mailserver/system/mailserver.nix b/local/services/mailserver/mailserver.nix
similarity index 100%
rename from mailserver/system/mailserver.nix
rename to local/services/mailserver/mailserver.nix
diff --git a/nextcloud/nextcloud.nix b/local/services/nextcloud/nextcloud.nix
similarity index 100%
rename from nextcloud/nextcloud.nix
rename to local/services/nextcloud/nextcloud.nix
diff --git a/passmgr/bitwarden.nix b/local/services/passmgr/bitwarden.nix
similarity index 100%
rename from passmgr/bitwarden.nix
rename to local/services/passmgr/bitwarden.nix
diff --git a/social/config.exs b/local/services/social/config.exs
similarity index 100%
rename from social/config.exs
rename to local/services/social/config.exs
diff --git a/social/pleroma-module.nix b/local/services/social/pleroma-module.nix
similarity index 100%
rename from social/pleroma-module.nix
rename to local/services/social/pleroma-module.nix
diff --git a/social/pleroma-package.nix b/local/services/social/pleroma-package.nix
similarity index 100%
rename from social/pleroma-package.nix
rename to local/services/social/pleroma-package.nix
diff --git a/social/pleroma.nix b/local/services/social/pleroma.nix
similarity index 100%
rename from social/pleroma.nix
rename to local/services/social/pleroma.nix
diff --git a/videomeet/jitsi.nix b/local/services/videomeet/jitsi.nix
similarity index 100%
rename from videomeet/jitsi.nix
rename to local/services/videomeet/jitsi.nix
diff --git a/vpn/ocserv.nix b/local/services/vpn/ocserv.nix
similarity index 100%
rename from vpn/ocserv.nix
rename to local/services/vpn/ocserv.nix
diff --git a/webserver/memcached.nix b/local/services/webserver/memcached.nix
similarity index 100%
rename from webserver/memcached.nix
rename to local/services/webserver/memcached.nix
diff --git a/webserver/nginx.nix b/local/services/webserver/nginx.nix
similarity index 100%
rename from webserver/nginx.nix
rename to local/services/webserver/nginx.nix