diff --git a/asus/rog-strix/g733qs/default.nix b/asus/rog-strix/g733qs/default.nix
index 8e5fde1..b49a44c 100644
--- a/asus/rog-strix/g733qs/default.nix
+++ b/asus/rog-strix/g733qs/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../../../common/cpu/amd/pstate.nix
-    ../../../common/gpu/nvidia.nix
+    ../../../common/gpu/nvidia/prime.nix
     ../../../common/pc/laptop
     ../../../common/pc/ssd
     ../../battery.nix
diff --git a/asus/zephyrus/ga401/default.nix b/asus/zephyrus/ga401/default.nix
index 9148e1d..2130ca7 100644
--- a/asus/zephyrus/ga401/default.nix
+++ b/asus/zephyrus/ga401/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../../common/cpu/amd
-    ../../../common/gpu/nvidia.nix
+    ../../../common/gpu/nvidia/prime.nix
     ../../../common/pc/laptop
     ../../../common/pc/ssd
   ];
diff --git a/asus/zephyrus/ga503/default.nix b/asus/zephyrus/ga503/default.nix
index 5597c81..94e8684 100644
--- a/asus/zephyrus/ga503/default.nix
+++ b/asus/zephyrus/ga503/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../../common/cpu/amd
-    ../../../common/gpu/nvidia.nix
+    ../../../common/gpu/nvidia/prime.nix
     ../../../common/pc/laptop
     ../../../common/pc/ssd
   ];
diff --git a/dell/g3/3779/default.nix b/dell/g3/3779/default.nix
index 8c9b3d3..80deb29 100644
--- a/dell/g3/3779/default.nix
+++ b/dell/g3/3779/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../../common/cpu/intel
-    ../../../common/gpu/nvidia.nix
+    ../../../common/gpu/nvidia/prime.nix
     ../../../common/pc/laptop
     ../../../common/pc/laptop/ssd
   ];
diff --git a/dell/xps/15-9500/nvidia/default.nix b/dell/xps/15-9500/nvidia/default.nix
index 451b6eb..f2fa3ae 100644
--- a/dell/xps/15-9500/nvidia/default.nix
+++ b/dell/xps/15-9500/nvidia/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../default.nix
-    ../../../../common/gpu/nvidia.nix
+    ../../../../common/gpu/nvidia/prime.nix
   ];
 
   hardware.nvidia.prime = {
diff --git a/dell/xps/15-9550/default.nix b/dell/xps/15-9550/default.nix
index 0fdfeee..2150a98 100644
--- a/dell/xps/15-9550/default.nix
+++ b/dell/xps/15-9550/default.nix
@@ -5,7 +5,7 @@
     ../../../common/cpu/intel
     ../../../common/pc/laptop
     # To just use Intel integrated graphics with Intel's open source driver
-    # ../../../common/gpu/nvidia-disable
+    # ../../../common/gpu/nvidia/disable.nix
   ];
 
   # TODO: boot loader
diff --git a/dell/xps/15-9550/nvidia/default.nix b/dell/xps/15-9550/nvidia/default.nix
index 451b6eb..f2fa3ae 100644
--- a/dell/xps/15-9550/nvidia/default.nix
+++ b/dell/xps/15-9550/nvidia/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../default.nix
-    ../../../../common/gpu/nvidia.nix
+    ../../../../common/gpu/nvidia/prime.nix
   ];
 
   hardware.nvidia.prime = {
diff --git a/dell/xps/15-9560/intel/default.nix b/dell/xps/15-9560/intel/default.nix
index 7c8eadd..a453149 100644
--- a/dell/xps/15-9560/intel/default.nix
+++ b/dell/xps/15-9560/intel/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../../../../common/cpu/intel
     ../../../../common/pc/laptop
-    ../../../../common/gpu/nvidia-disable.nix
+    ../../../../common/gpu/nvidia/disable.nix
     ../xps-common.nix
   ];
 }
diff --git a/dell/xps/15-9560/nvidia/default.nix b/dell/xps/15-9560/nvidia/default.nix
index a7ba241..3e78eba 100644
--- a/dell/xps/15-9560/nvidia/default.nix
+++ b/dell/xps/15-9560/nvidia/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../../../common/cpu/intel
-    ../../../../common/gpu/nvidia.nix
+    ../../../../common/gpu/nvidia/prime.nix
     ../../../../common/pc/laptop
     ../xps-common.nix
   ];
diff --git a/dell/xps/17-9700/intel/default.nix b/dell/xps/17-9700/intel/default.nix
index 4a9a168..0176bfd 100644
--- a/dell/xps/17-9700/intel/default.nix
+++ b/dell/xps/17-9700/intel/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../../../../common/cpu/intel
     ../../../../common/pc/laptop
-    ../../../../common/gpu/nvidia-disable.nix
+    ../../../../common/gpu/nvidia/disable.nix
     ../common.nix
   ];
 }
diff --git a/dell/xps/17-9700/nvidia/default.nix b/dell/xps/17-9700/nvidia/default.nix
index 8002870..7e1e3e1 100644
--- a/dell/xps/17-9700/nvidia/default.nix
+++ b/dell/xps/17-9700/nvidia/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../../../../common/cpu/intel
     ../../../../common/pc/laptop
-    ../../../../common/gpu/nvidia.nix
+    ../../../../common/gpu/nvidia/prime.nix
     ../common.nix
   ];
 
diff --git a/lenovo/ideapad/15arh05/default.nix b/lenovo/ideapad/15arh05/default.nix
index 9914544..fda5cd0 100644
--- a/lenovo/ideapad/15arh05/default.nix
+++ b/lenovo/ideapad/15arh05/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../../common/cpu/amd
-    ../../../common/gpu/nvidia.nix
+    ../../../common/gpu/nvidia/prime.nix
     ../../../common/pc/laptop
     ../../../common/pc/laptop/acpi_call.nix
     ../../../common/pc/laptop/ssd
diff --git a/lenovo/legion/15ach6/default.nix b/lenovo/legion/15ach6/default.nix
index 0c71823..0cbc0f4 100644
--- a/lenovo/legion/15ach6/default.nix
+++ b/lenovo/legion/15ach6/default.nix
@@ -4,7 +4,7 @@ in {
   imports = [
     ../../../common/cpu/amd
     ../../../common/gpu/amd
-    ../../../common/gpu/nvidia.nix
+    ../../../common/gpu/nvidia/prime.nix
     ../../../common/pc/laptop
     ../../../common/pc/laptop/ssd
   ];
diff --git a/lenovo/legion/15arh05h/default.nix b/lenovo/legion/15arh05h/default.nix
index 1662748..603fd9e 100644
--- a/lenovo/legion/15arh05h/default.nix
+++ b/lenovo/legion/15arh05h/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../../common/cpu/amd
-    ../../../common/gpu/nvidia.nix
+    ../../../common/gpu/nvidia/prime.nix
     ../../../common/pc/laptop
     ../../../common/pc/laptop/ssd
   ];
diff --git a/lenovo/legion/16ithg6/default.nix b/lenovo/legion/16ithg6/default.nix
index e63c165..cf0244e 100644
--- a/lenovo/legion/16ithg6/default.nix
+++ b/lenovo/legion/16ithg6/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../../common/cpu/intel
-    ../../../common/gpu/nvidia.nix
+    ../../../common/gpu/nvidia/prime.nix
     ../../../common/pc/laptop
     ../../../common/pc/laptop/ssd
   ];
diff --git a/lenovo/thinkpad/e470/default.nix b/lenovo/thinkpad/e470/default.nix
index c9bf833..e9c5214 100644
--- a/lenovo/thinkpad/e470/default.nix
+++ b/lenovo/thinkpad/e470/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../.
     ../../../common/cpu/intel/kaby-lake
-    ../../../common/gpu/nvidia.nix
+    ../../../common/gpu/nvidia/prime.nix
   ];
 
   hardware.nvidia.prime = {
diff --git a/lenovo/thinkpad/p1/default.nix b/lenovo/thinkpad/p1/default.nix
index 3575693..4c68bdb 100644
--- a/lenovo/thinkpad/p1/default.nix
+++ b/lenovo/thinkpad/p1/default.nix
@@ -3,7 +3,7 @@
     ../../../common/cpu/intel
     # might need nvidia module but we don't know the PCI ids:
     # https://github.com/NixOS/nixos-hardware/pull/274#discussion_r650483740
-    #../../../common/gpu/nvidia.nix
+    #../../../common/gpu/nvidia/prime.nix
     ../../../common/pc/laptop/acpi_call.nix
     ../../../common/pc/laptop/ssd
   ];
diff --git a/lenovo/thinkpad/p50/default.nix b/lenovo/thinkpad/p50/default.nix
index 48cf605..3e77eb5 100644
--- a/lenovo/thinkpad/p50/default.nix
+++ b/lenovo/thinkpad/p50/default.nix
@@ -1,6 +1,6 @@
 { lib, config, ... }: {
   imports = [
-    ../../../common/gpu/nvidia.nix
+    ../../../common/gpu/nvidia/prime.nix
     ../../../common/cpu/intel
     ../../../common/pc/laptop/acpi_call.nix
     ../.
diff --git a/lenovo/thinkpad/p51/default.nix b/lenovo/thinkpad/p51/default.nix
index 5701c85..4c9be3c 100644
--- a/lenovo/thinkpad/p51/default.nix
+++ b/lenovo/thinkpad/p51/default.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }: {
   imports = [
-    ../../../common/gpu/nvidia.nix
+    ../../../common/gpu/nvidia/prime.nix
     ../../../common/cpu/intel
     ../../../common/cpu/intel/kaby-lake
     ../../../common/pc/laptop/acpi_call.nix
diff --git a/lenovo/thinkpad/p52/default.nix b/lenovo/thinkpad/p52/default.nix
index dc0d99b..31c9294 100644
--- a/lenovo/thinkpad/p52/default.nix
+++ b/lenovo/thinkpad/p52/default.nix
@@ -1,6 +1,6 @@
 { lib, config, ... }: {
   imports = [
-    ../../../common/gpu/nvidia.nix
+    ../../../common/gpu/nvidia/prime.nix
     ../../../common/cpu/intel
     ../../../common/pc/laptop/acpi_call.nix
     ../.
diff --git a/msi/gl62/default.nix b/msi/gl62/default.nix
index afba735..6f3f91c 100644
--- a/msi/gl62/default.nix
+++ b/msi/gl62/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ../../common/pc/laptop/ssd
     ../../common/cpu/intel
-    ../../common/gpu/nvidia.nix
+    ../../common/gpu/nvidia/prime.nix
     ../../common/pc/laptop
   ];
 
diff --git a/omen/en00015p/default.nix b/omen/en00015p/default.nix
index 8a97003..78e1c3d 100644
--- a/omen/en00015p/default.nix
+++ b/omen/en00015p/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../common/cpu/amd
-    ../../common/gpu/nvidia.nix
+    ../../common/gpu/nvidia/prime.nix
     ../../common/pc/laptop
     ../../common/pc/ssd
   ];