diff --git a/modules/desktop/core.nix b/common/desktop/core.nix
similarity index 100%
rename from modules/desktop/core.nix
rename to common/desktop/core.nix
diff --git a/modules/desktop/sway.nix b/common/desktop/sway.nix
similarity index 100%
rename from modules/desktop/sway.nix
rename to common/desktop/sway.nix
diff --git a/modules/common/efi.nix b/common/efi.nix
similarity index 100%
rename from modules/common/efi.nix
rename to common/efi.nix
diff --git a/modules/common/nvidia.nix b/common/nvidia.nix
similarity index 97%
rename from modules/common/nvidia.nix
rename to common/nvidia.nix
index ed321e4..91e03db 100644
--- a/modules/common/nvidia.nix
+++ b/common/nvidia.nix
@@ -1,5 +1,7 @@
 { config, lib, pkgs, ... }:
 {
+  nixpkgs.config.allowUnfree = true;
+  
   # Enable OpenGL
   hardware.graphics = {
     enable = true;
diff --git a/modules/common/services.nix b/common/services.nix
similarity index 100%
rename from modules/common/services.nix
rename to common/services.nix
diff --git a/modules/common/system.nix b/common/system.nix
similarity index 71%
rename from modules/common/system.nix
rename to common/system.nix
index 269035d..a9e6917 100644
--- a/modules/common/system.nix
+++ b/common/system.nix
@@ -1,8 +1,6 @@
 { pkgs, config, ... }:
 {
-  nixpkgs.config.allowUnfree = true; #because im a gigachad 
-
-  # boot, networking, locale, stateVersion
+  # boot, networking, locale
   boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
diff --git a/modules/common/users.nix b/common/users.nix
similarity index 100%
rename from modules/common/users.nix
rename to common/users.nix
diff --git a/hosts/buer/default.nix b/hosts/buer/default.nix
index c8b2c97..3beb5d1 100644
--- a/hosts/buer/default.nix
+++ b/hosts/buer/default.nix
@@ -8,12 +8,10 @@
     ./secrets.nix
     
     # Common modules shared across hosts
-    ../../modules/common/system.nix
-    ../../modules/common/users.nix
-    ../../modules/common/services.nix
+    ../../common/system.nix
+    ../../common/users.nix
+    ../../common/services.nix
     
-    # Services specific to this host
-    #../../services/forgejo.nix
 
     # Common secrets
     ../../host-secrets.nix
diff --git a/hosts/focalor/default.nix b/hosts/focalor/default.nix
index e6a6ef4..869fce3 100644
--- a/hosts/focalor/default.nix
+++ b/hosts/focalor/default.nix
@@ -8,17 +8,17 @@
     ./secrets.nix
     
     # Common modules shared across hosts
-    ../../modules/common/system.nix
-    ../../modules/common/users.nix
-    ../../modules/common/services.nix
-    ../../modules/common/efi.nix
+    ../../common/system.nix
+    ../../common/users.nix
+    ../../common/services.nix
+    ../../common/efi.nix
 
     # Desktop modules
-    ../../modules/desktop/core.nix
-    ../../modules/desktop/sway.nix
+    ../../common/desktop/core.nix
+    ../../common/desktop/sway.nix
 
     # Nvidia
-    ../../modules/common/nvidia.nix
+    ../../common/nvidia.nix
     
     # Common secrets
     #../../host-secrets.nix
diff --git a/hosts/valefar/default.nix b/hosts/valefar/default.nix
index d11e5ed..fc70a20 100644
--- a/hosts/valefar/default.nix
+++ b/hosts/valefar/default.nix
@@ -6,13 +6,13 @@
     # Host-specific hardware
     ./hardware.nix
     ./secrets.nix
-    ../../modules/common/nvidia.nix
+    ../../common/nvidia.nix
     
     # Common modules shared across hosts
-    ../../modules/common/system.nix
-    ../../modules/common/users.nix
-    ../../modules/common/services.nix
-    ../../modules/common/efi.nix
+    ../../common/system.nix
+    ../../common/users.nix
+    ../../common/services.nix
+    ../../common/efi.nix
     
     # Common secrets
     ../../host-secrets.nix