diff --git a/home/default.nix b/home/default.nix
index 4191f07..ea9b98c 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -28,9 +28,9 @@ in
       ./misc.nix
       ./persistence.nix
       ./scripts.nix
-      ./sway
       ./terminal.nix
       ./virt-manager.nix
+      ./wm
     ];
 
     home.packages = with pkgs; [
diff --git a/home/wm/default.nix b/home/wm/default.nix
new file mode 100644
index 0000000..186e780
--- /dev/null
+++ b/home/wm/default.nix
@@ -0,0 +1,6 @@
+{ ... }: {
+  imports = [
+    ./sway
+    ./addon
+  ];
+}
diff --git a/home/sway/default.nix b/home/wm/sway/default.nix
similarity index 96%
rename from home/sway/default.nix
rename to home/wm/sway/default.nix
index 8b000fa..d1d4138 100644
--- a/home/sway/default.nix
+++ b/home/wm/sway/default.nix
@@ -1,18 +1,4 @@
-{ config
-, lib
-, pkgs
-, ...
-}: {
-  imports = [
-    ./gnome-keyring.nix
-    ./gtk.nix
-    ./kanshi.nix
-    ./dunst.nix
-    ./rofi
-    ./swayidle.nix
-    ./wallpapers.nix
-    ./waybar
-  ];
+{ config, lib, pkgs, ... }: {
 
   home.packages = with pkgs; [
     wl-clipboard