diff --git a/modules/default.nix b/modules/default.nix
index f3f6215..bd2cd6d 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,12 +1,8 @@
 _: {
   imports = [
-    ./docker.nix
-    ./pipewire.nix
-    ./nvidia.nix
-    ./gnome.nix
-    ./gaming.nix
-    ./wezterm.nix
-    ./stylix.nix
-    ./neovim.nix
+    ./gui
+    ./other
+    ./services
+    ./tui
   ];
 }
diff --git a/modules/gui/default.nix b/modules/gui/default.nix
new file mode 100644
index 0000000..2950c16
--- /dev/null
+++ b/modules/gui/default.nix
@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./gnome.nix
+    ./wezterm.nix
+  ];
+}
diff --git a/modules/gnome.nix b/modules/gui/gnome.nix
similarity index 100%
rename from modules/gnome.nix
rename to modules/gui/gnome.nix
diff --git a/modules/wezterm.nix b/modules/gui/wezterm.nix
similarity index 100%
rename from modules/wezterm.nix
rename to modules/gui/wezterm.nix
diff --git a/modules/other/default.nix b/modules/other/default.nix
new file mode 100644
index 0000000..70b3346
--- /dev/null
+++ b/modules/other/default.nix
@@ -0,0 +1,7 @@
+_: {
+  imports = [
+    ./gaming.nix
+    ./nvidia.nix
+    ./stylix.nix
+  ];
+}
diff --git a/modules/gaming.nix b/modules/other/gaming.nix
similarity index 100%
rename from modules/gaming.nix
rename to modules/other/gaming.nix
diff --git a/modules/nvidia.nix b/modules/other/nvidia.nix
similarity index 100%
rename from modules/nvidia.nix
rename to modules/other/nvidia.nix
diff --git a/modules/stylix.nix b/modules/other/stylix.nix
similarity index 92%
rename from modules/stylix.nix
rename to modules/other/stylix.nix
index c8ca771..72da748 100644
--- a/modules/stylix.nix
+++ b/modules/other/stylix.nix
@@ -48,7 +48,7 @@ in {
         gtk.enable = false;
         gnome.enable = false;
       };
-      image = lib.mkDefault ../wallpapers/nix-wallpaper-nineish-catppuccin-frappe-alt.svg;
+      image = lib.mkDefault ../../wallpapers/nix-wallpaper-nineish-catppuccin-frappe-alt.svg;
     };
   };
 }
diff --git a/modules/services/default.nix b/modules/services/default.nix
new file mode 100644
index 0000000..db377c3
--- /dev/null
+++ b/modules/services/default.nix
@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./docker.nix
+    ./pipewire.nix
+  ];
+}
diff --git a/modules/docker.nix b/modules/services/docker.nix
similarity index 100%
rename from modules/docker.nix
rename to modules/services/docker.nix
diff --git a/modules/pipewire.nix b/modules/services/pipewire.nix
similarity index 100%
rename from modules/pipewire.nix
rename to modules/services/pipewire.nix
diff --git a/modules/tui/default.nix b/modules/tui/default.nix
new file mode 100644
index 0000000..d5187eb
--- /dev/null
+++ b/modules/tui/default.nix
@@ -0,0 +1,5 @@
+_: {
+  imports = [
+    ./neovim.nix
+  ];
+}
diff --git a/modules/neovim.nix b/modules/tui/neovim.nix
similarity index 100%
rename from modules/neovim.nix
rename to modules/tui/neovim.nix