diff --git a/flake.lock b/flake.lock
index e91d882..029aa84 100644
--- a/flake.lock
+++ b/flake.lock
@@ -952,11 +952,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728706579,
-        "narHash": "sha256-uMa7cC1F2m7DHGOT5yQ1ZoUFVWxsnZDBi9VXwOgnhqw=",
+        "lastModified": 1728792969,
+        "narHash": "sha256-TwQNBUFNmvr7rSOH5onI2Rj6FoJ6wWzdnMH6P4mwyps=",
         "owner": "gerg-l",
         "repo": "spicetify-nix",
-        "rev": "59aa525938e501bdacad3753034e864a426b66f5",
+        "rev": "1f3c6931100c64f6747d47f8a7b8d7a75fc5844e",
         "type": "github"
       },
       "original": {
diff --git a/glasshouse-desktop/home/default.nix b/glasshouse-desktop/home/default.nix
index d5ea85c..d334110 100644
--- a/glasshouse-desktop/home/default.nix
+++ b/glasshouse-desktop/home/default.nix
@@ -1,22 +1,25 @@
 { nur, self, inputs, username, system, ... }:
 
+
+
+
 {
 	imports = 
-		[ (import ./btop.nix) 	         ]
-	 ++ [ (import ./bat.nix) 	         ]
-	 ++ [ (import ./firefox/firefox.nix) ]
-	 ++ [ (import ./cava.nix) 	         ]
-	 ++ [ (import ./fuzzel.nix)          ]
-	 ++ [ (import ./gtk.nix) 	         ]
-	 ++ [ (import ./hyprland)            ]
-	 ++ [ (import ./kitty.nix)           ]
-	 ++ [ (import ./spicetify.nix)       ]
-	 ++ [ (import ./starship.nix)        ]
-	 ++ [ (import ./scripts)     	     ]
-	 ++ [ (import ./yazi.nix)            ]
-	 ++ [ (import ./swaync/swaync.nix)   ]
-	 ++ [ (import ./userpkgs.nix)        ]
-	 ++ [ (import ./waybar) 	         ]
-	 ++ [ (import ./eza.nix) 	         ]
-	 ++ [ (import ./zshell.nix)          ];
+		[ (import ./programs/btop.nix) 	       ]
+	 ++ [ (import ./programs/yazi.nix)         ]
+	 ++ [ (import ./programs/kitty.nix)        ]
+	 ++ [ (import ./programs/fuzzel.nix)       ]
+	 ++ [ (import ./programs/eza.nix) 	       ]
+	 ++ [ (import ./programs/cava.nix) 	       ]
+	 ++ [ (import ./programs/bat.nix) 	       ]
+	 ++ [ (import ./environment/gtk.nix) 	   ]
+	 ++ [ (import ./environment/spicetify.nix) ]
+	 ++ [ (import ./environment/starship.nix)  ]
+	 ++ [ (import ./environment/userpkgs.nix)  ]
+	 ++ [ (import ./environment/zshell.nix)    ]
+	 ++ [ (import ./firefox/firefox.nix)       ]
+	 ++ [ (import ./hyprland)                  ]
+	 ++ [ (import ./scripts)     	           ]
+	 ++ [ (import ./swaync/swaync.nix)         ]
+	 ++ [ (import ./waybar) 	               ];
 }
diff --git a/glasshouse-desktop/home/gtk.nix b/glasshouse-desktop/home/environment/gtk.nix
similarity index 100%
rename from glasshouse-desktop/home/gtk.nix
rename to glasshouse-desktop/home/environment/gtk.nix
diff --git a/glasshouse-desktop/home/spicetify.nix b/glasshouse-desktop/home/environment/spicetify.nix
similarity index 100%
rename from glasshouse-desktop/home/spicetify.nix
rename to glasshouse-desktop/home/environment/spicetify.nix
diff --git a/glasshouse-desktop/home/starship.nix b/glasshouse-desktop/home/environment/starship.nix
similarity index 100%
rename from glasshouse-desktop/home/starship.nix
rename to glasshouse-desktop/home/environment/starship.nix
diff --git a/glasshouse-desktop/home/userpkgs.nix b/glasshouse-desktop/home/environment/userpkgs.nix
similarity index 100%
rename from glasshouse-desktop/home/userpkgs.nix
rename to glasshouse-desktop/home/environment/userpkgs.nix
diff --git a/glasshouse-desktop/home/zshell.nix b/glasshouse-desktop/home/environment/zshell.nix
similarity index 100%
rename from glasshouse-desktop/home/zshell.nix
rename to glasshouse-desktop/home/environment/zshell.nix
diff --git a/glasshouse-desktop/home/firefox/index.html b/glasshouse-desktop/home/firefox/index.html
deleted file mode 100644
index 44ef0ed..0000000
--- a/glasshouse-desktop/home/firefox/index.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>My Homepage</title>
-    <style>
-        html, body {
-            height: 100%; /* Ensures the background covers the entire viewport */
-            margin: 0;
-            padding: 0;
-        }
-        body {
-            font-family: Arial, sans-serif;
-            display: flex;
-            justify-content: left; /* Align content to the right */
-            align-items: center; /* Vertically center content */
-            background-image: url('../../../media/wallpapers/catppuccin/nixos-catppuccin.png'); /* Path to your local image */
-            background-size: cover;
-            background-position: right; /* Adjust the background image to stay aligned to the left */
-            background-attachment: fixed;
-            background-repeat: no-repeat;
-            min-height: 100vh; /* Ensure it covers at least the full viewport */
-            padding-left: 140px; /* Add space between the content and the right edge */
-        }
-        .content {
-            text-align: center; /* Align text and links to the right */
-        }
-        .links {
-            margin-bottom: 20px;
-        }
-        a {
-            color: white;
-            text-decoration: none;
-            font-size: 1.2em;
-            margin-left: 10px;
-            margin-right: 10px;
-        }
-        a:hover {
-            text-decoration: underline;
-        }
-        .search {
-            margin-top: 20px;
-        }
-        input[type="text"] {
-            padding: 10px;
-            font-size: 1.5em;
-            width: 50%;
-            border: none;
-            border-radius: 5px;
-        }
-    </style>
-</head>
-<body>
-    <div class="content">
-        <div class="links">
-            <a href="https://github.com" target="_blank">GitHub</a>
-            <a href="https://www.youtube.com" target="_blank">YouTube</a>
-            <a href="https://chat.openai.com" target="_blank">ChatGPT</a>
-            <a href="https://app.dataannotation.tech/users/sign_in" target="_blank">Data Annotation</a>
-        </div>
-        
-        <div class="search">
-            <input type="text" id="search" placeholder="Search the web..." onkeydown="search(event)">
-        </div>
-    </div>
-
-    <script>
-        function search(event) {
-            if (event.key === "Enter") {
-                const query = document.getElementById("search").value;
-                window.location.href = `https://www.google.com/search?q=${query}`;
-            }
-        }
-    </script>
-</body>
-</html>
diff --git a/glasshouse-desktop/home/bat.nix b/glasshouse-desktop/home/programs/bat.nix
similarity index 100%
rename from glasshouse-desktop/home/bat.nix
rename to glasshouse-desktop/home/programs/bat.nix
diff --git a/glasshouse-desktop/home/btop.nix b/glasshouse-desktop/home/programs/btop.nix
similarity index 100%
rename from glasshouse-desktop/home/btop.nix
rename to glasshouse-desktop/home/programs/btop.nix
diff --git a/glasshouse-desktop/home/cava.nix b/glasshouse-desktop/home/programs/cava.nix
similarity index 100%
rename from glasshouse-desktop/home/cava.nix
rename to glasshouse-desktop/home/programs/cava.nix
diff --git a/glasshouse-desktop/home/eza.nix b/glasshouse-desktop/home/programs/eza.nix
similarity index 100%
rename from glasshouse-desktop/home/eza.nix
rename to glasshouse-desktop/home/programs/eza.nix
diff --git a/glasshouse-desktop/home/fuzzel.nix b/glasshouse-desktop/home/programs/fuzzel.nix
similarity index 100%
rename from glasshouse-desktop/home/fuzzel.nix
rename to glasshouse-desktop/home/programs/fuzzel.nix
diff --git a/glasshouse-desktop/home/kitty.nix b/glasshouse-desktop/home/programs/kitty.nix
similarity index 100%
rename from glasshouse-desktop/home/kitty.nix
rename to glasshouse-desktop/home/programs/kitty.nix
diff --git a/glasshouse-desktop/home/yazi.nix b/glasshouse-desktop/home/programs/yazi.nix
similarity index 100%
rename from glasshouse-desktop/home/yazi.nix
rename to glasshouse-desktop/home/programs/yazi.nix
