diff --git a/config.nix b/config.nix
index e2a46692..82a1f440 100644
--- a/config.nix
+++ b/config.nix
@@ -7,12 +7,12 @@ let
       args = { pkgs = import <nixpkgs> {}; };
       modules =
         [ config
-          ./modules/system.nix
+          ./modules/system
           ./modules/system/activation-scripts.nix
           ./modules/system/etc.nix
-          ./modules/environment.nix
+          ./modules/environment
           ./modules/launchd
-          ./modules/tmux.nix
+          ./modules/programs/tmux.nix
         ];
     };
 
diff --git a/modules/environment.nix b/modules/environment/default.nix
similarity index 100%
rename from modules/environment.nix
rename to modules/environment/default.nix
diff --git a/modules/tmux.nix b/modules/programs/tmux.nix
similarity index 100%
rename from modules/tmux.nix
rename to modules/programs/tmux.nix
diff --git a/modules/system.nix b/modules/system/default.nix
similarity index 100%
rename from modules/system.nix
rename to modules/system/default.nix