move all services to subfolder

configuration.nix

@@ -6,27 +6,26 @@ 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
+    ./generic/services/backup/restic.nix
+    ./generic/services/cloud/nextcloud.nix
+    ./generic/services/git/gitea.nix
+    ./generic/services/letsencrypt/acme.nix
+    ./generic/services/letsencrypt/resolve.nix
+    ./generic/services/mail/alps.nix
+    ./generic/services/mail/mailserver.nix
+    ./generic/services/passmgr/bitwarden.nix
+    ./generic/services/social/pleroma.nix
+    ./generic/services/videomeet/jitsi.nix
+    ./generic/services/vpn/ocserv.nix
+    ./generic/services/webserver/memcached.nix
+    ./generic/services/webserver/nginx.nix
   ];
 
   nixpkgs.overlays = [ (nix-overlay) ];