diff --git a/services/games.nix b/services/games.nix
deleted file mode 100644
index 30f3f18..0000000
--- a/services/games.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  inputs,
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-let
-  enium-pv = import ./games/minecraft.nix {
-    inherit
-      inputs
-      config
-      pkgs
-      lib
-      ;
-  };
-  cfg = config.service;
-in
-{
-  imports = [
-    enium-pv
-  ];
-
-  options.service.games = {
-    enium-pv = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      description = "Enable enium private minecraft server";
-    };
-  };
-}
diff --git a/services/server.nix b/services/server.nix
new file mode 100644
index 0000000..9737f5b
--- /dev/null
+++ b/services/server.nix
@@ -0,0 +1,45 @@
+{
+  inputs,
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  teamspeak = import ./server/teamspeak.nix {
+    inherit
+      inputs
+      config
+      pkgs
+      lib
+      ;
+  };
+  minecraft = import ./server/minecraft.nix {
+    inherit
+      inputs
+      config
+      pkgs
+      lib
+      ;
+  };
+in
+{
+  imports = [
+    minecraft
+    teamspeak
+  ];
+
+  options.service.server = {
+    teamspeak = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Enable the teamspeak";
+    };
+    minecraft = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Enable minecraft server";
+    };
+  };
+}