diff --git a/flake.nix b/flake.nix
index 55c7942..b000074 100755
--- a/flake.nix
+++ b/flake.nix
@@ -75,18 +75,15 @@
             ./modules/options.nix
             ./modules/base.nix
             ./modules/sops.nix
-            ./modules/kpp.nix
-            ./modules/ese-website.nix
 
             ./modules/ldap
             ./modules/sssd.nix
             ./modules/mail
-            ./modules/mailman.nix
+            ./modules/web
+
             ./modules/mysql.nix
             ./modules/nix-serve.nix
             ./modules/nginx.nix
-            # ./modules/hydra.nix
-            ./modules/userdir.nix
             ./modules/hedgedoc.nix
             ./modules/padlist.nix
             ./modules/postgres.nix
@@ -97,20 +94,14 @@
             ./modules/matrix.nix
             ./modules/mautrix-telegram.nix
             ./modules/vaultwarden.nix
-            ./modules/website.nix
             ./modules/zsh.nix
             ./modules/course-management.nix
             ./modules/courses-phil.nix
             ./modules/gitea.nix
             ./modules/fail2ban.nix
             ./modules/kanboard.nix
-            ./modules/infoscreen.nix
-            ./modules/manual.nix
-            ./modules/sharepic.nix
             ./modules/zammad.nix
             ./modules/initrd-ssh.nix
-            ./modules/fsrewsp.nix
-            ./modules/nightline.nix
             ./modules/decisions.nix
             ./modules/struktur-bot.nix
             {
diff --git a/modules/web/default.nix b/modules/web/default.nix
new file mode 100644
index 0000000..262ea0b
--- /dev/null
+++ b/modules/web/default.nix
@@ -0,0 +1,15 @@
+{ ... }:
+{
+  imports = [
+    ./ifsrde.nix
+    ./ese.nix
+    ./infoscreen.nix
+    ./kpp.nix
+    ./nightline.nix
+    ./fsrewsp.nix
+    ./manual.nix
+    ./sharepic.nix
+    ./userdir.nix
+    ./ftp.nix
+  ];
+}
diff --git a/modules/ese-website.nix b/modules/web/ese.nix
similarity index 100%
rename from modules/ese-website.nix
rename to modules/web/ese.nix
diff --git a/modules/fsrewsp.nix b/modules/web/fsrewsp.nix
similarity index 100%
rename from modules/fsrewsp.nix
rename to modules/web/fsrewsp.nix
diff --git a/modules/ftp.nix b/modules/web/ftp.nix
similarity index 100%
rename from modules/ftp.nix
rename to modules/web/ftp.nix
diff --git a/modules/website.nix b/modules/web/ifsrde.nix
similarity index 100%
rename from modules/website.nix
rename to modules/web/ifsrde.nix
diff --git a/modules/infoscreen.nix b/modules/web/infoscreen.nix
similarity index 100%
rename from modules/infoscreen.nix
rename to modules/web/infoscreen.nix
diff --git a/modules/kpp.nix b/modules/web/kpp.nix
similarity index 100%
rename from modules/kpp.nix
rename to modules/web/kpp.nix
diff --git a/modules/manual.nix b/modules/web/manual.nix
similarity index 100%
rename from modules/manual.nix
rename to modules/web/manual.nix
diff --git a/modules/nightline.nix b/modules/web/nightline.nix
similarity index 100%
rename from modules/nightline.nix
rename to modules/web/nightline.nix
diff --git a/modules/sharepic.nix b/modules/web/sharepic.nix
similarity index 100%
rename from modules/sharepic.nix
rename to modules/web/sharepic.nix
diff --git a/modules/userdir.nix b/modules/web/userdir.nix
similarity index 100%
rename from modules/userdir.nix
rename to modules/web/userdir.nix