diff --git a/apple/macbook-air/4/default.nix b/apple/macbook-air/4/default.nix
index 181a09979..850ad8def 100644
--- a/apple/macbook-air/4/default.nix
+++ b/apple/macbook-air/4/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../.
-    ../../../common/cpu/intel/sandy-bridge
+    ../../../common/gpu/intel/sandy-bridge
   ];
 
   boot.kernelParams = [
diff --git a/apple/macbook-pro/14-1/default.nix b/apple/macbook-pro/14-1/default.nix
index 54a6e84d9..c2b61f9e6 100644
--- a/apple/macbook-pro/14-1/default.nix
+++ b/apple/macbook-pro/14-1/default.nix
@@ -5,7 +5,7 @@
   ...
 }: {
   imports = [
-    ../../../common/cpu/intel/kaby-lake
+    ../../../common/gpu/intel/kaby-lake
     ../../../common/gpu/intel
     ../../../common/hidpi.nix
     ../../../common/pc/laptop
diff --git a/asus/zenbook/ux371/default.nix b/asus/zenbook/ux371/default.nix
index 8601e2b26..4fcfb28d0 100644
--- a/asus/zenbook/ux371/default.nix
+++ b/asus/zenbook/ux371/default.nix
@@ -7,7 +7,7 @@
 }:
 {
   imports = [
-    ../../../common/cpu/intel/tiger-lake
+    ../../../common/gpu/intel/tiger-lake
     ../../../common/pc/laptop
     ../../../common/pc/laptop/ssd
     ../../battery.nix
diff --git a/common/cpu/intel/comet-lake/default.nix b/common/gpu/intel/comet-lake/default.nix
similarity index 100%
rename from common/cpu/intel/comet-lake/default.nix
rename to common/gpu/intel/comet-lake/default.nix
diff --git a/common/cpu/intel/elkhart-lake/default.nix b/common/gpu/intel/elkhart-lake/default.nix
similarity index 100%
rename from common/cpu/intel/elkhart-lake/default.nix
rename to common/gpu/intel/elkhart-lake/default.nix
diff --git a/common/cpu/intel/jasper-lake/default.nix b/common/gpu/intel/jasper-lake/default.nix
similarity index 100%
rename from common/cpu/intel/jasper-lake/default.nix
rename to common/gpu/intel/jasper-lake/default.nix
diff --git a/common/cpu/intel/kaby-lake/default.nix b/common/gpu/intel/kaby-lake/default.nix
similarity index 100%
rename from common/cpu/intel/kaby-lake/default.nix
rename to common/gpu/intel/kaby-lake/default.nix
diff --git a/common/cpu/intel/sandy-bridge/default.nix b/common/gpu/intel/sandy-bridge/default.nix
similarity index 100%
rename from common/cpu/intel/sandy-bridge/default.nix
rename to common/gpu/intel/sandy-bridge/default.nix
diff --git a/common/cpu/intel/tiger-lake/default.nix b/common/gpu/intel/tiger-lake/default.nix
similarity index 100%
rename from common/cpu/intel/tiger-lake/default.nix
rename to common/gpu/intel/tiger-lake/default.nix
diff --git a/dell/inspiron/5509/default.nix b/dell/inspiron/5509/default.nix
index e77c9fd1e..b199e92b6 100644
--- a/dell/inspiron/5509/default.nix
+++ b/dell/inspiron/5509/default.nix
@@ -1,7 +1,7 @@
 { lib, ... }:
 {
   imports = [
-    ../../../common/cpu/intel/tiger-lake
+    ../../../common/gpu/intel/tiger-lake
     ../../../common/pc/laptop
     ../../../common/pc/ssd
   ];
diff --git a/dell/precision/7520/default.nix b/dell/precision/7520/default.nix
index 59fa95e64..09f859270 100644
--- a/dell/precision/7520/default.nix
+++ b/dell/precision/7520/default.nix
@@ -4,7 +4,7 @@
   ...
 }: {
   imports = [
-    ../../../common/cpu/intel/kaby-lake
+    ../../../common/gpu/intel/kaby-lake
     ../../../common/pc/laptop
     ../../../common/pc/laptop/ssd
     ../../../common/gpu/nvidia
diff --git a/dell/xps/13-9360/default.nix b/dell/xps/13-9360/default.nix
index f1ea37873..5c73b8bb2 100644
--- a/dell/xps/13-9360/default.nix
+++ b/dell/xps/13-9360/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ../../../common/cpu/intel/kaby-lake
+    ../../../common/gpu/intel/kaby-lake
     ../../../common/pc/laptop
   ];
 
diff --git a/dell/xps/13-9370/default.nix b/dell/xps/13-9370/default.nix
index 10362b3b8..62dddc55a 100644
--- a/dell/xps/13-9370/default.nix
+++ b/dell/xps/13-9370/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../../../common/cpu/intel/kaby-lake
+    ../../../common/gpu/intel/kaby-lake
     ../../../common/pc/laptop
     ../../../common/pc/laptop/acpi_call.nix
   ];
diff --git a/dell/xps/15-9560/default.nix b/dell/xps/15-9560/default.nix
index 49e36b16b..aee5665f8 100644
--- a/dell/xps/15-9560/default.nix
+++ b/dell/xps/15-9560/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ../../../common/cpu/intel
-    ../../../common/cpu/intel/kaby-lake
+    ../../../common/gpu/intel/kaby-lake
     ../../../common/pc/laptop
     ./xps-common.nix
 
diff --git a/dell/xps/15-9560/intel/default.nix b/dell/xps/15-9560/intel/default.nix
index 22de3bc85..a77cb82d5 100644
--- a/dell/xps/15-9560/intel/default.nix
+++ b/dell/xps/15-9560/intel/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ../../../../common/cpu/intel
-    ../../../../common/cpu/intel/kaby-lake
+    ../../../../common/gpu/intel/kaby-lake
     ../../../../common/pc/laptop
     ../../../../common/gpu/nvidia/disable.nix
     ../xps-common.nix
diff --git a/dell/xps/15-9570/default.nix b/dell/xps/15-9570/default.nix
index 200dc0934..9ef1a8980 100644
--- a/dell/xps/15-9570/default.nix
+++ b/dell/xps/15-9570/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../../../common/cpu/intel
-    ../../../common/cpu/intel/kaby-lake
+    ../../../common/gpu/intel/kaby-lake
     ../../../common/pc/laptop
     ./xps-common.nix
   ];
diff --git a/flake.nix b/flake.nix
index 112e00e14..6c1a3008c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,9 @@
   description = "nixos-hardware";
 
   outputs = _: {
-    nixosModules = {
+    nixosModules = let
+      deprecated = issue: name: value: builtins.trace "warning: ${name} flake output is deprecated and will be removed. See https://github.com/NixOS/nixos-hardware/issues/${issue} for more information" value;
+    in {
       acer-aspire-4810t = import ./acer/aspire/4810t;
       airis-n990 = import ./airis/n990;
       apple-macbook-air-3 = import ./apple/macbook-air/3;
@@ -266,10 +268,10 @@
       common-cpu-amd-zenpower = import ./common/cpu/amd/zenpower.nix;
       common-cpu-amd-raphael-igpu = import ./common/cpu/amd/raphael/igpu.nix;
       common-cpu-intel = import ./common/cpu/intel;
-      common-cpu-intel-comet-lake = import ./common/cpu/intel/comet-lake;
+      common-gpu-intel-comet-lake = deprecated "992" "common-gpu-intel-comet-lake" (import ./common/gpu/intel/comet-lake);
       common-cpu-intel-cpu-only = import ./common/cpu/intel/cpu-only.nix;
-      common-cpu-intel-kaby-lake = import ./common/cpu/intel/kaby-lake;
-      common-cpu-intel-sandy-bridge = import ./common/cpu/intel/sandy-bridge;
+      common-gpu-intel-kaby-lake = deprecated "992" "common-gpu-intel-kaby-lake" (import ./common/gpu/intel/kaby-lake);
+      common-gpu-intel-sandy-bridge = deprecated "992" "common-gpu-intel-sandy-bridge" (import ./common/gpu/intel/sandy-bridge);
       common-gpu-amd = import ./common/gpu/amd;
       common-gpu-amd-sea-islands = import ./common/gpu/amd/sea-islands;
       common-gpu-amd-southern-islands = import ./common/gpu/amd/southern-islands;
diff --git a/google/pixelbook/default.nix b/google/pixelbook/default.nix
index 1ea4c7afd..0de52ed38 100644
--- a/google/pixelbook/default.nix
+++ b/google/pixelbook/default.nix
@@ -4,6 +4,6 @@
   imports = [
     ../../common/pc/laptop
     ../../common/pc/laptop/ssd
-    ../../common/cpu/intel/kaby-lake
+    ../../common/gpu/intel/kaby-lake
   ];
 }
diff --git a/gpd/p2-max/default.nix b/gpd/p2-max/default.nix
index f31186447..2c02e178d 100644
--- a/gpd/p2-max/default.nix
+++ b/gpd/p2-max/default.nix
@@ -3,7 +3,7 @@
     ../../common/pc/laptop
     ../../common/pc/laptop/ssd
     ../../common/cpu/intel
-    ../../common/cpu/intel/kaby-lake
+    ../../common/gpu/intel/kaby-lake
     ../../common/hidpi.nix
   ];
 }
diff --git a/hardkernel/odroid-h3/default.nix b/hardkernel/odroid-h3/default.nix
index e52d3a02b..52d58195f 100644
--- a/hardkernel/odroid-h3/default.nix
+++ b/hardkernel/odroid-h3/default.nix
@@ -1,5 +1,5 @@
 {
   imports = [
-    ../../common/cpu/intel/jasper-lake
+    ../../common/gpu/intel/jasper-lake
   ];
 }
diff --git a/hp/elitebook/2560p/default.nix b/hp/elitebook/2560p/default.nix
index 3802337d1..ddcc6c342 100644
--- a/hp/elitebook/2560p/default.nix
+++ b/hp/elitebook/2560p/default.nix
@@ -3,7 +3,7 @@ with lib;
 {
   imports = [
     ../../../common/cpu/intel
-    ../../../common/cpu/intel/sandy-bridge
+    ../../../common/gpu/intel/sandy-bridge
     ../../../common/pc
     ../../../common/pc/laptop
     ../../../common/pc/laptop/hdd
diff --git a/hp/notebook/14-df0023/default.nix b/hp/notebook/14-df0023/default.nix
index ca6e30d49..b3cbfaeb7 100644
--- a/hp/notebook/14-df0023/default.nix
+++ b/hp/notebook/14-df0023/default.nix
@@ -3,7 +3,7 @@ with lib;
 {
   imports = [
     ../../../common/cpu/intel
-    ../../../common/cpu/intel/sandy-bridge
+    ../../../common/gpu/intel/sandy-bridge
     ../../../common/pc
     ../../../common/pc/laptop
     ../../../common/pc/laptop/hdd
diff --git a/huawei/machc-wa/default.nix b/huawei/machc-wa/default.nix
index e2bc0a8ac..d92a6a17f 100644
--- a/huawei/machc-wa/default.nix
+++ b/huawei/machc-wa/default.nix
@@ -6,7 +6,7 @@
 }: {
   imports = [
     ../../common/cpu/intel
-    ../../common/cpu/intel/comet-lake
+    ../../common/gpu/intel/comet-lake
     ../../common/gpu/nvidia
     ../../common/gpu/nvidia/prime.nix
     ../../common/hidpi.nix
diff --git a/lenovo/thinkpad/e470/default.nix b/lenovo/thinkpad/e470/default.nix
index 320073218..55aa595a8 100644
--- a/lenovo/thinkpad/e470/default.nix
+++ b/lenovo/thinkpad/e470/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../.
-    ../../../common/cpu/intel/kaby-lake
+    ../../../common/gpu/intel/kaby-lake
     ../../../common/gpu/nvidia/prime.nix
   ];
 
diff --git a/lenovo/thinkpad/l480/default.nix b/lenovo/thinkpad/l480/default.nix
index d000320d8..2211c0621 100644
--- a/lenovo/thinkpad/l480/default.nix
+++ b/lenovo/thinkpad/l480/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../.
-    ../../../common/cpu/intel/kaby-lake
+    ../../../common/gpu/intel/kaby-lake
     ../../../common/pc/laptop/ssd
   ];
 
diff --git a/lenovo/thinkpad/p51/default.nix b/lenovo/thinkpad/p51/default.nix
index 912897015..6bd162dbc 100644
--- a/lenovo/thinkpad/p51/default.nix
+++ b/lenovo/thinkpad/p51/default.nix
@@ -3,7 +3,7 @@
     ../../../common/gpu/24.05-compat.nix
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/cpu/intel
-    ../../../common/cpu/intel/kaby-lake
+    ../../../common/gpu/intel/kaby-lake
     ../../../common/pc/laptop/acpi_call.nix
     ../.
   ];
diff --git a/lenovo/thinkpad/t420/default.nix b/lenovo/thinkpad/t420/default.nix
index a3c7db40e..09f5d3fd7 100644
--- a/lenovo/thinkpad/t420/default.nix
+++ b/lenovo/thinkpad/t420/default.nix
@@ -2,7 +2,7 @@
   imports = [
     ../.
     ../tp-smapi.nix
-    ../../../common/cpu/intel/sandy-bridge
+    ../../../common/gpu/intel/sandy-bridge
     ../../../common/pc/laptop/acpi_call.nix
   ];
 }
diff --git a/lenovo/thinkpad/t520/default.nix b/lenovo/thinkpad/t520/default.nix
index a3c7db40e..09f5d3fd7 100644
--- a/lenovo/thinkpad/t520/default.nix
+++ b/lenovo/thinkpad/t520/default.nix
@@ -2,7 +2,7 @@
   imports = [
     ../.
     ../tp-smapi.nix
-    ../../../common/cpu/intel/sandy-bridge
+    ../../../common/gpu/intel/sandy-bridge
     ../../../common/pc/laptop/acpi_call.nix
   ];
 }
diff --git a/lenovo/thinkpad/w520/default.nix b/lenovo/thinkpad/w520/default.nix
index a3c7db40e..09f5d3fd7 100644
--- a/lenovo/thinkpad/w520/default.nix
+++ b/lenovo/thinkpad/w520/default.nix
@@ -2,7 +2,7 @@
   imports = [
     ../.
     ../tp-smapi.nix
-    ../../../common/cpu/intel/sandy-bridge
+    ../../../common/gpu/intel/sandy-bridge
     ../../../common/pc/laptop/acpi_call.nix
   ];
 }
diff --git a/lenovo/thinkpad/x220/default.nix b/lenovo/thinkpad/x220/default.nix
index ec8b45c94..c63333b23 100644
--- a/lenovo/thinkpad/x220/default.nix
+++ b/lenovo/thinkpad/x220/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ../.
-    ../../../common/cpu/intel/sandy-bridge
+    ../../../common/gpu/intel/sandy-bridge
     ../../../common/pc/laptop/hdd # TODO: reverse compat
     ../tp-smapi.nix
   ];
diff --git a/microsoft/surface/surface-go/default.nix b/microsoft/surface/surface-go/default.nix
index fdd13f6c9..017cd7185 100644
--- a/microsoft/surface/surface-go/default.nix
+++ b/microsoft/surface/surface-go/default.nix
@@ -14,7 +14,7 @@ in {
     ../../../common/pc/ssd
     # The Intel CPU module auto-includes Intel's GPU:
     ../../../common/cpu/intel
-    ../../../common/cpu/intel/kaby-lake
+    ../../../common/gpu/intel/kaby-lake
   ];
 
   boot.kernelParams = [
diff --git a/protectli/vp4670/default.nix b/protectli/vp4670/default.nix
index fdaac8577..14dcf4ce8 100644
--- a/protectli/vp4670/default.nix
+++ b/protectli/vp4670/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ../../common/cpu/intel/comet-lake
+    ../../common/gpu/intel/comet-lake
   ];
 
   boot.initrd.kernelModules = [