diff --git a/modules/users/crow/configs/git/git.conf b/modules/users/crow/configs/git/git.conf
new file mode 100644
index 0000000..a39d816
--- /dev/null
+++ b/modules/users/crow/configs/git/git.conf
@@ -0,0 +1,3 @@
+[user[
+    email = "contact@wanderingcrow.net"
+    name = "TheWanderingCrow"
diff --git a/modules/users/crow/hypr/hyprland.conf b/modules/users/crow/configs/hypr/hyprland.conf
similarity index 100%
rename from modules/users/crow/hypr/hyprland.conf
rename to modules/users/crow/configs/hypr/hyprland.conf
diff --git a/modules/users/crow/hypr/hyprlock.conf b/modules/users/crow/configs/hypr/hyprlock.conf
similarity index 100%
rename from modules/users/crow/hypr/hyprlock.conf
rename to modules/users/crow/configs/hypr/hyprlock.conf
diff --git a/modules/users/crow/hypr/parzival-monitors.conf b/modules/users/crow/configs/hypr/parzival-monitors.conf
similarity index 100%
rename from modules/users/crow/hypr/parzival-monitors.conf
rename to modules/users/crow/configs/hypr/parzival-monitors.conf
diff --git a/modules/users/crow/hypr/parzival_mobile-monitors.conf b/modules/users/crow/configs/hypr/parzival_mobile-monitors.conf
similarity index 100%
rename from modules/users/crow/hypr/parzival_mobile-monitors.conf
rename to modules/users/crow/configs/hypr/parzival_mobile-monitors.conf
diff --git a/modules/users/crow/sway/parzival-monitors.conf b/modules/users/crow/configs/sway/parzival-monitors.conf
similarity index 100%
rename from modules/users/crow/sway/parzival-monitors.conf
rename to modules/users/crow/configs/sway/parzival-monitors.conf
diff --git a/modules/users/crow/sway/parzival_mobile-monitors.conf b/modules/users/crow/configs/sway/parzival_mobile-monitors.conf
similarity index 100%
rename from modules/users/crow/sway/parzival_mobile-monitors.conf
rename to modules/users/crow/configs/sway/parzival_mobile-monitors.conf
diff --git a/modules/users/crow/sway/sway.conf b/modules/users/crow/configs/sway/sway.conf
similarity index 100%
rename from modules/users/crow/sway/sway.conf
rename to modules/users/crow/configs/sway/sway.conf
diff --git a/modules/users/crow/configs/tmux/tmux.conf b/modules/users/crow/configs/tmux/tmux.conf
new file mode 100644
index 0000000..bf62a3b
--- /dev/null
+++ b/modules/users/crow/configs/tmux/tmux.conf
@@ -0,0 +1,11 @@
+# split panes using | and -
+bind | split-window -h
+bind - split-window -v
+unbind '"'
+unbind %
+
+# Alt-arrow pane nav
+bind -n M-Left select-pane -L
+bind -n M-Right select-pane -R
+bind -n M-Up select-pane -U
+bind -n M-Down select-pane -D
diff --git a/modules/users/crow/sway/cyber_defiance.jpg b/modules/users/crow/configs/wallpapers/cyber_defiance.jpg
similarity index 100%
rename from modules/users/crow/sway/cyber_defiance.jpg
rename to modules/users/crow/configs/wallpapers/cyber_defiance.jpg
diff --git a/modules/users/crow/sway/cyber_skyscrapers.jpg b/modules/users/crow/configs/wallpapers/cyber_skyscrapers.jpg
similarity index 100%
rename from modules/users/crow/sway/cyber_skyscrapers.jpg
rename to modules/users/crow/configs/wallpapers/cyber_skyscrapers.jpg
diff --git a/modules/users/crow/waybar/config.jsonc b/modules/users/crow/configs/waybar/config.jsonc
similarity index 100%
rename from modules/users/crow/waybar/config.jsonc
rename to modules/users/crow/configs/waybar/config.jsonc
diff --git a/modules/users/crow/waybar/style.css b/modules/users/crow/configs/waybar/style.css
similarity index 100%
rename from modules/users/crow/waybar/style.css
rename to modules/users/crow/configs/waybar/style.css
diff --git a/modules/users/crow/home.nix b/modules/users/crow/home.nix
index cb2dd2a..7e84579 100644
--- a/modules/users/crow/home.nix
+++ b/modules/users/crow/home.nix
@@ -1,10 +1,10 @@
 {osConfig, config, inputs, pkgs, lib, ...}: 
 let
-    hyprMonitorConfig = if osConfig.networking.hostName == "Parzival" then ./hypr/parzival-monitors.conf
-                    else if osConfig.networking.hostName == "Parzival-Mobile" then ./hypr/parzival_mobile-monitors.conf
+    hyprMonitorConfig = if osConfig.networking.hostName == "Parzival" then ./configs/hypr/parzival-monitors.conf
+                    else if osConfig.networking.hostName == "Parzival-Mobile" then ./configs/hypr/parzival_mobile-monitors.conf
                     else null;
-    swayMonitorConfig = if osConfig.networking.hostName == "Parzival" then ./sway/parzival-monitors.conf
-                        else if osConfig.networking.hostName == "Parzival-Mobile" then ./sway/parzival_mobile-monitors.conf
+    swayMonitorConfig = if osConfig.networking.hostName == "Parzival" then ./configs/sway/parzival-monitors.conf
+                        else if osConfig.networking.hostName == "Parzival-Mobile" then ./configs/sway/parzival_mobile-monitors.conf
                         else null;
 in                    
 {
@@ -12,14 +12,24 @@ in
         username = "crow";
         homeDirectory = "/home/crow";
         stateVersion = "24.05";
-#       file.".config/hypr/hyprland.conf".source = ./hypr/hyprland.conf;
-#       file.".config/hypr/monitors.conf".source = lib.mkIf (hyprMonitorConfig != null) hyprMonitorConfig;
-        file.".config/waybar/config.jsonc".source = ./waybar/config.jsonc;
-        file.".config/waybar/style.css".source = ./waybar/style.css;
-        file.".config/sway/config".source = ./sway/sway.conf;
+
+        # Tools
+        file.".config/tmux/tmux.conf".source = ./configs/tmux/tmux.conf;
+        file.".config/git/config".source = ./configs/git/git.conf;
+        
+        # Hyprland
+        file.".config/hypr/hyprland.conf".source = ./configs/hypr/hyprland.conf;
+        file.".config/hypr/monitors.conf".source = lib.mkIf (hyprMonitorConfig != null) hyprMonitorConfig;
+        
+        # Waybar
+        file.".config/waybar/config.jsonc".source = ./configs/waybar/config.jsonc;
+        file.".config/waybar/style.css".source = ./configs/waybar/style.css;
+        
+        # Sway
+        file.".config/sway/config".source = ./configs/sway/sway.conf;
         file.".config/sway/monitors.conf".source = lib.mkIf (swayMonitorConfig != null) swayMonitorConfig;
-        file.".config/sway/background-1".source = ./sway/cyber_defiance.jpg;
-        file.".config/sway/background-2".source = ./sway/cyber_skyscrapers.jpg;
+        file.".config/sway/background-1".source = ./configs/wallpapers/cyber_defiance.jpg;
+        file.".config/sway/background-2".source = ./configs/wallpapers/cyber_skyscrapers.jpg;
     };
 
     xdg = {
@@ -28,36 +38,6 @@ in
     };
     
     programs = {
-        waybar = {
-            enable = true;
-        };
-        git = {
-            enable = true;
-            userEmail = "contact@wanderingcrow.net";
-            userName = "TheWanderingCrow";
-        };
-        wofi = {
-            enable = true;
-        };
-        foot = {
-            enable = true;
-        };
-        tmux = {
-            enable = true;
-            extraConfig = ''
-            # split panes using | and -
-            bind | split-window -h
-            bind - split-window -v
-            unbind '"'
-            unbind %
-
-            # Alt-arrow pane nav
-            bind -n M-Left select-pane -L
-            bind -n M-Right select-pane -R
-            bind -n M-Up select-pane -U
-            bind -n M-Down select-pane -D
-            '';
-        };
         firefox = {
             enable = true;
             policies = {