diff --git a/flake.nix b/flake.nix
index a4126cb..2cbb189 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,6 +61,7 @@
     let
       aspectsModule = import-tree ./aspects;
       packagesModule = import-tree ./packages;
+      shellsModule = import-tree ./shells;
     in
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
@@ -72,9 +73,9 @@
         flake-parts.flakeModules.modules
       ] ++ aspectsModule.imports
         ++ packagesModule.imports
+        ++ shellsModule.imports
         ++ [
           ./deploy.nix
-          ./devShells.nix
           ./terranixConfigurations.nix
         ];
     };
diff --git a/devShells.nix b/shells/default.nix
similarity index 100%
rename from devShells.nix
rename to shells/default.nix