diff --git a/home-manager/i3.nix b/home-manager/i3/default.nix
similarity index 96%
rename from home-manager/i3.nix
rename to home-manager/i3/default.nix
index 0a4d646..d061f16 100644
--- a/home-manager/i3.nix
+++ b/home-manager/i3/default.nix
@@ -1,6 +1,10 @@
 { config, lib, pkgs, user, ... }:
 
 {
+  imports = [
+    ./i3status-rust.nix
+  ];
+
   xsession.windowManager.i3 = {
     enable = true;
     config = {
diff --git a/home-manager/i3status-rust.nix b/home-manager/i3/i3status-rust.nix
similarity index 100%
rename from home-manager/i3status-rust.nix
rename to home-manager/i3/i3status-rust.nix
diff --git a/home-mandlm.nix b/home-mandlm.nix
index a7f34b1..537b5d0 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -41,7 +41,6 @@
     home-manager/tmux.nix
     home-manager/zsh.nix
     home-manager/starship.nix
-    home-manager/i3.nix
-    home-manager/i3status-rust.nix
+    home-manager/i3
   ];
 }