diff --git a/src/collection.rs b/src/collection.rs
index 7d88cf9e..ed6c6392 100644
--- a/src/collection.rs
+++ b/src/collection.rs
@@ -2,11 +2,10 @@
 //!
 //! TODO: Rename this to intake? Collection?
 
-#[cfg(feature = "nvidia")]
-pub mod nvidia;
-
-#[cfg(all(target_os = "linux", feature = "gpu"))]
-pub mod amd;
+#[cfg(feature = "gpu")]
+pub mod gpu;
+#[cfg(feature = "gpu")]
+pub use gpu::*;
 
 #[cfg(target_os = "linux")]
 mod linux {
diff --git a/src/collection/gpu.rs b/src/collection/gpu.rs
new file mode 100644
index 00000000..5690fc9b
--- /dev/null
+++ b/src/collection/gpu.rs
@@ -0,0 +1,5 @@
+#[cfg(feature = "nvidia")]
+pub mod nvidia;
+
+#[cfg(all(target_os = "linux", feature = "gpu"))]
+pub mod amd;
diff --git a/src/collection/amd.rs b/src/collection/gpu/amd.rs
similarity index 100%
rename from src/collection/amd.rs
rename to src/collection/gpu/amd.rs
diff --git a/src/collection/amd/amd_gpu_marketing.rs b/src/collection/gpu/amd/amd_gpu_marketing.rs
similarity index 100%
rename from src/collection/amd/amd_gpu_marketing.rs
rename to src/collection/gpu/amd/amd_gpu_marketing.rs
diff --git a/src/collection/nvidia.rs b/src/collection/gpu/nvidia.rs
similarity index 100%
rename from src/collection/nvidia.rs
rename to src/collection/gpu/nvidia.rs