diff --git a/default.nix b/default.nix
index 244e072..4c7bc70 100644
--- a/default.nix
+++ b/default.nix
@@ -7,7 +7,7 @@
     ./desktop
     ./network.nix
     ./packages.nix
-    ./services.nix
+    ./services
     ./filesystems.nix
     ./security
     ./hardware
diff --git a/services/default.nix b/services/default.nix
index e9aca47..6699b3f 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -3,5 +3,6 @@
   imports = [
     ./jupyterhub.nix
     ./gnupg.nix
+    ./general.nix
   ];
 }
diff --git a/services.nix b/services/general.nix
similarity index 99%
rename from services.nix
rename to services/general.nix
index 8f5869c..d896b1c 100644
--- a/services.nix
+++ b/services/general.nix
@@ -24,10 +24,6 @@ let
   );
 in {
 
-  imports = [
-    ./services
-  ];
-
   options.aviallon.services = {
     enable = mkOption {
       default = true;