diff --git a/hosts/default.nix b/hosts/default.nix
index 3700506..d245d82 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -6,8 +6,9 @@
     specialArgs = { inherit user inputs; };
     modules = [ 
       ../nixos/wayland.nix
-      ../nixos/gaming.nix
-      ../nixos/office.nix
+      ../nixos/collections/dev.nix
+      ../nixos/collections/gaming.nix
+      ../nixos/collections/office.nix
       ./buckwheat/configuration.nix
       home-manager.nixosModules.home-manager {
         home-manager.useGlobalPkgs = true;
diff --git a/nixos/cli.nix b/nixos/cli.nix
index 8423489..9fea4f7 100644
--- a/nixos/cli.nix
+++ b/nixos/cli.nix
@@ -7,7 +7,6 @@
   environment = {
     localBinInPath = true;
     variables = {
-      GOPROXY = "direct";
       #MAILRC="$XDG_CONFIG_HOME/mail/mailrc"
       #allowing environmental variable is needed for a mosh connection
       LC_CTYPE = "en_US.UTF-8";
diff --git a/nixos/collections/dev.nix b/nixos/collections/dev.nix
new file mode 100644
index 0000000..30ed925
--- /dev/null
+++ b/nixos/collections/dev.nix
@@ -0,0 +1,15 @@
+# Software Development Packages
+{ config, lib, pkgs, user, ... }:
+{
+  environment = {
+    variables = {
+      GOPROXY = "direct";
+    };
+  };
+  users.users.${user.name}.packages = with pkgs; [
+    cargo
+    go
+    just
+    rust
+  ];
+}
diff --git a/nixos/gaming.nix b/nixos/collections/gaming.nix
similarity index 100%
rename from nixos/gaming.nix
rename to nixos/collections/gaming.nix
diff --git a/nixos/office.nix b/nixos/collections/office.nix
similarity index 100%
rename from nixos/office.nix
rename to nixos/collections/office.nix
diff --git a/nixos/pentest.nix b/nixos/collections/pentest.nix
similarity index 100%
rename from nixos/pentest.nix
rename to nixos/collections/pentest.nix
diff --git a/nixos/server_defense.nix b/nixos/collections/server_defense.nix
similarity index 100%
rename from nixos/server_defense.nix
rename to nixos/collections/server_defense.nix