diff --git a/home/home.nix b/home/home.nix
index c6f2f07..a9fbf55 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -3,11 +3,11 @@
 {pkgs, inputs, outputs, ...}: {
   imports = [
     # Terminal apps
-    ./tuiapps/zsh.nix
-    ./tuiapps/fastfetch.nix
-    ./tuiapps/neovim.nix
-    ./tuiapps/ranger.nix
-    ./tuiapps/tmux.nix
+    ./utils/zsh.nix
+    ./utils/fastfetch.nix
+    ./utils/neovim.nix
+    ./utils/ranger.nix
+    ./utils/tmux.nix
 
     # Services
     ./services/reloadunits.nix
diff --git a/home/jimbo_desktop.nix b/home/jimbo_desktop.nix
index 20d71ff..59599ee 100644
--- a/home/jimbo_desktop.nix
+++ b/home/jimbo_desktop.nix
@@ -3,23 +3,23 @@
     # Common modules
     ./home.nix
     ./users/jimbo.nix
-    ./tuiapps/git.nix
+    ./utils/git.nix
 
     # GUI Apps
     ./misc/guifiles.nix
     ./sway/sway.nix
     ./sway/swaylock.nix
-    ./guiapps/gtk.nix
-    ./guiapps/foot.nix
-    ./guiapps/librewolf.nix
-    ./guiapps/mangohud.nix
-    ./guiapps/mpv.nix
-    ./guiapps/obs.nix
-    ./guiapps/pcmanfm-qt.nix
-    ./guiapps/rofi.nix
-    ./guiapps/swappy.nix
-    ./guiapps/easyeffects.nix
-    ./tuiapps/ncmpcpp.nix
+    ./programs/gtk.nix
+    ./programs/foot.nix
+    ./programs/librewolf.nix
+    ./programs/mangohud.nix
+    ./programs/mpv.nix
+    ./programs/obs.nix
+    ./programs/pcmanfm-qt.nix
+    ./programs/rofi.nix
+    ./programs/swappy.nix
+    ./programs/easyeffects.nix
+    ./utils/ncmpcpp.nix
 
     # Misc apps and tools
     ./misc/useful.nix
diff --git a/home/jimbo_lenovo.nix b/home/jimbo_lenovo.nix
index d90f830..118d6e7 100644
--- a/home/jimbo_lenovo.nix
+++ b/home/jimbo_lenovo.nix
@@ -3,23 +3,23 @@
     # Common modules
     ./home.nix
     ./users/jimbo.nix
-    ./tuiapps/git.nix
+    ./utils/git.nix
 
     # GUI Apps
     ./misc/guifiles.nix
     ./sway/sway.nix
     ./sway/swaylock.nix
-    ./guiapps/gtk.nix
-    ./guiapps/foot.nix
-    ./guiapps/librewolf.nix
-    ./guiapps/mangohud.nix
-    ./guiapps/mpv.nix
-    ./guiapps/obs.nix
-    ./guiapps/pcmanfm-qt.nix
-    ./guiapps/rofi.nix
-    ./guiapps/swappy.nix
-    ./guiapps/easyeffects.nix
-    ./tuiapps/ncmpcpp.nix
+    ./programs/gtk.nix
+    ./programs/foot.nix
+    ./programs/librewolf.nix
+    ./programs/mangohud.nix
+    ./programs/mpv.nix
+    ./programs/obs.nix
+    ./programs/pcmanfm-qt.nix
+    ./programs/rofi.nix
+    ./programs/swappy.nix
+    ./programs/easyeffects.nix
+    ./utils/ncmpcpp.nix
 
     # Misc apps and tools
     ./misc/useful.nix
diff --git a/home/jimbo_pinebook.nix b/home/jimbo_pinebook.nix
index 5d0e5df..9b4ad66 100644
--- a/home/jimbo_pinebook.nix
+++ b/home/jimbo_pinebook.nix
@@ -3,22 +3,22 @@
     # Common modules
     ./home.nix
     ./users/jimbo.nix
-    ./tuiapps/git.nix
+    ./utils/git.nix
 
     # GUI Apps
     ./misc/guifiles.nix
     ./sway/sway.nix
     ./sway/swaylock.nix
-    ./guiapps/gtk.nix
-    ./guiapps/foot.nix
-    ./guiapps/librewolf.nix
-    ./guiapps/mangohud.nix
-    ./guiapps/mpv.nix
-    ./guiapps/pcmanfm-qt.nix
-    ./guiapps/rofi.nix
-    ./guiapps/swappy.nix
-    ./guiapps/easyeffects.nix
-    ./tuiapps/ncmpcpp.nix
+    ./programs/gtk.nix
+    ./programs/foot.nix
+    ./programs/librewolf.nix
+    ./programs/mangohud.nix
+    ./programs/mpv.nix
+    ./programs/pcmanfm-qt.nix
+    ./programs/rofi.nix
+    ./programs/swappy.nix
+    ./programs/easyeffects.nix
+    ./utils/ncmpcpp.nix
 
     # Misc apps and tools
     ./misc/useful.nix
diff --git a/home/jimbo_server.nix b/home/jimbo_server.nix
index d31bb2e..80376cc 100644
--- a/home/jimbo_server.nix
+++ b/home/jimbo_server.nix
@@ -3,6 +3,6 @@
     # Common modules
     ./home.nix
     ./users/jimbo.nix
-    ./tuiapps/git.nix
+    ./utils/git.nix
   ];
 }
diff --git a/home/guiapps/easyeffects.nix b/home/programs/easyeffects.nix
similarity index 100%
rename from home/guiapps/easyeffects.nix
rename to home/programs/easyeffects.nix
diff --git a/home/guiapps/foot.nix b/home/programs/foot.nix
similarity index 100%
rename from home/guiapps/foot.nix
rename to home/programs/foot.nix
diff --git a/home/guiapps/gtk.nix b/home/programs/gtk.nix
similarity index 100%
rename from home/guiapps/gtk.nix
rename to home/programs/gtk.nix
diff --git a/home/guiapps/librewolf.nix b/home/programs/librewolf.nix
similarity index 100%
rename from home/guiapps/librewolf.nix
rename to home/programs/librewolf.nix
diff --git a/home/guiapps/mangohud.nix b/home/programs/mangohud.nix
similarity index 100%
rename from home/guiapps/mangohud.nix
rename to home/programs/mangohud.nix
diff --git a/home/guiapps/mpv.nix b/home/programs/mpv.nix
similarity index 100%
rename from home/guiapps/mpv.nix
rename to home/programs/mpv.nix
diff --git a/home/guiapps/obs.nix b/home/programs/obs.nix
similarity index 100%
rename from home/guiapps/obs.nix
rename to home/programs/obs.nix
diff --git a/home/guiapps/pcmanfm-qt.nix b/home/programs/pcmanfm-qt.nix
similarity index 100%
rename from home/guiapps/pcmanfm-qt.nix
rename to home/programs/pcmanfm-qt.nix
diff --git a/home/guiapps/rofi.nix b/home/programs/rofi.nix
similarity index 100%
rename from home/guiapps/rofi.nix
rename to home/programs/rofi.nix
diff --git a/home/guiapps/swappy.nix b/home/programs/swappy.nix
similarity index 100%
rename from home/guiapps/swappy.nix
rename to home/programs/swappy.nix
diff --git a/home/tuiapps/fastfetch.nix b/home/utils/fastfetch.nix
similarity index 100%
rename from home/tuiapps/fastfetch.nix
rename to home/utils/fastfetch.nix
diff --git a/home/tuiapps/git.nix b/home/utils/git.nix
similarity index 100%
rename from home/tuiapps/git.nix
rename to home/utils/git.nix
diff --git a/home/tuiapps/ncmpcpp.nix b/home/utils/ncmpcpp.nix
similarity index 100%
rename from home/tuiapps/ncmpcpp.nix
rename to home/utils/ncmpcpp.nix
diff --git a/home/tuiapps/neovim.nix b/home/utils/neovim.nix
similarity index 100%
rename from home/tuiapps/neovim.nix
rename to home/utils/neovim.nix
diff --git a/home/tuiapps/ranger.nix b/home/utils/ranger.nix
similarity index 100%
rename from home/tuiapps/ranger.nix
rename to home/utils/ranger.nix
diff --git a/home/tuiapps/tmux.nix b/home/utils/tmux.nix
similarity index 100%
rename from home/tuiapps/tmux.nix
rename to home/utils/tmux.nix
diff --git a/home/tuiapps/zsh.nix b/home/utils/zsh.nix
similarity index 100%
rename from home/tuiapps/zsh.nix
rename to home/utils/zsh.nix