diff --git a/hosts/nixos-test/configuration.nix b/hosts/nixos-test/configuration.nix
index af183ff..700c8ab 100644
--- a/hosts/nixos-test/configuration.nix
+++ b/hosts/nixos-test/configuration.nix
@@ -49,7 +49,7 @@
   };
 
   modules.system = {
-    server = {
+    services = {
       docker.enable = true;
       openssh.enable = true;
     };
diff --git a/hosts/perso-desktop/configuration.nix b/hosts/perso-desktop/configuration.nix
index 8d2f1d2..0c726c9 100644
--- a/hosts/perso-desktop/configuration.nix
+++ b/hosts/perso-desktop/configuration.nix
@@ -58,7 +58,7 @@
       waydroid.enable = true;
     };
 
-    server = {
+    services = {
       distrobox.enable = true;
     };
   };
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 7931944..91d849e 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -5,7 +5,7 @@
     ./apps
     ./desktop
     ./hardware
-    ./server
+    ./services
 
     # Common configuration
     ./common.nix
diff --git a/modules/system/server/default.nix b/modules/system/services/default.nix
similarity index 100%
rename from modules/system/server/default.nix
rename to modules/system/services/default.nix
diff --git a/modules/system/server/distrobox/default.nix b/modules/system/services/distrobox/default.nix
similarity index 61%
rename from modules/system/server/distrobox/default.nix
rename to modules/system/services/distrobox/default.nix
index fec6131..c631ae4 100644
--- a/modules/system/server/distrobox/default.nix
+++ b/modules/system/services/distrobox/default.nix
@@ -2,16 +2,16 @@
 
 with lib;
 let
-  cfg = config.modules.system.server.distrobox;
+  cfg = config.modules.system.services.distrobox;
 in
 {
-  options.modules.system.server.distrobox = {
+  options.modules.system.services.distrobox = {
     enable = mkEnableOption ''
       Enable distrobox with my custom configurations
     '';
   };
   config = mkIf cfg.enable {
-    modules.system.server.docker.enable = true;
+    modules.system.services.docker.enable = true;
     environment.systemPackages = with pkgs; [ distrobox ];
   };
 }
\ No newline at end of file
diff --git a/modules/system/server/docker/default.nix b/modules/system/services/docker/default.nix
similarity index 78%
rename from modules/system/server/docker/default.nix
rename to modules/system/services/docker/default.nix
index 275703d..25d87de 100644
--- a/modules/system/server/docker/default.nix
+++ b/modules/system/services/docker/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.system.server.docker;
+  cfg = config.modules.system.services.docker;
 in
 {
-  options.modules.system.server.docker = {
+  options.modules.system.services.docker = {
     enable = mkEnableOption ''
       Enable docker with my custom configurations
     '';
diff --git a/modules/system/server/ollama/default.nix b/modules/system/services/ollama/default.nix
similarity index 79%
rename from modules/system/server/ollama/default.nix
rename to modules/system/services/ollama/default.nix
index 375537b..fc5fc65 100644
--- a/modules/system/server/ollama/default.nix
+++ b/modules/system/services/ollama/default.nix
@@ -2,11 +2,11 @@
 
 with lib;
 let
-  cfg = config.modules.system.server.ollama;
+  cfg = config.modules.system.services.ollama;
   nvidiaEnabled = config.modules.system.hardware.nvidia.enable;
 in
 {
-  options.modules.system.server.ollama = {
+  options.modules.system.services.ollama = {
     enable = mkEnableOption ''
       Enable ollama with my custom configurations
     '';
diff --git a/modules/system/server/openssh/default.nix b/modules/system/services/openssh/default.nix
similarity index 75%
rename from modules/system/server/openssh/default.nix
rename to modules/system/services/openssh/default.nix
index ddfac0e..4ab5b8f 100644
--- a/modules/system/server/openssh/default.nix
+++ b/modules/system/services/openssh/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.system.server.openssh;
+  cfg = config.modules.system.services.openssh;
 in
 {
-  options.modules.system.server.openssh = {
+  options.modules.system.services.openssh = {
     enable = mkEnableOption ''
       Enable openssh with my custom configurations
     '';