diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51aec17b1..1ebedc774 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -694,17 +694,17 @@ SET (PBRT_UTIL_SOURCE_HEADERS
 
 if (PBRT_CUDA_ENABLED)
   set (PBRT_GPU_SOURCE
-    src/pbrt/gpu/aggregate.cpp
-    src/pbrt/gpu/denoiser.cpp
+    src/pbrt/gpu/optix/aggregate.cpp
+    src/pbrt/gpu/optix/denoiser.cpp
     src/pbrt/gpu/memory.cpp
     src/pbrt/gpu/util.cpp
   )
   set (PBRT_GPU_SOURCE_HEADERS
-    src/pbrt/gpu/aggregate.h
+    src/pbrt/gpu/optix/aggregate.h
     src/pbrt/gpu/cudagl.h
-    src/pbrt/gpu/denoiser.h
+    src/pbrt/gpu/optix/denoiser.h
     src/pbrt/gpu/memory.h
-    src/pbrt/gpu/optix.h
+    src/pbrt/gpu/optix/optix.h
     src/pbrt/gpu/util.h
   )
 
@@ -770,7 +770,7 @@ if (PBRT_CUDA_ENABLED)
     PROPERTIES LANGUAGE CUDA
   )
 
-  cuda_compile_and_embed (PBRT_EMBEDDED_PTX src/pbrt/gpu/optix.cu optix.cu)
+  cuda_compile_and_embed (PBRT_EMBEDDED_PTX src/pbrt/gpu/optix/optix.cu optix.cu)
 endif ()
 
 source_group ("Source Files" FILES ${PBRT_SOURCE})
diff --git a/src/pbrt/gpu/aggregate.cpp b/src/pbrt/gpu/optix/aggregate.cpp
similarity index 99%
rename from src/pbrt/gpu/aggregate.cpp
rename to src/pbrt/gpu/optix/aggregate.cpp
index 0c6ee6ce3..9f6c8853d 100644
--- a/src/pbrt/gpu/aggregate.cpp
+++ b/src/pbrt/gpu/optix/aggregate.cpp
@@ -2,9 +2,9 @@
 // The pbrt source code is licensed under the Apache License, Version 2.0.
 // SPDX: Apache-2.0
 
-#include <pbrt/gpu/aggregate.h>
+#include <pbrt/gpu/optix/aggregate.h>
 
-#include <pbrt/gpu/optix.h>
+#include <pbrt/gpu/optix/optix.h>
 #include <pbrt/gpu/util.h>
 #include <pbrt/lights.h>
 #include <pbrt/materials.h>
diff --git a/src/pbrt/gpu/aggregate.h b/src/pbrt/gpu/optix/aggregate.h
similarity index 98%
rename from src/pbrt/gpu/aggregate.h
rename to src/pbrt/gpu/optix/aggregate.h
index 17162d22b..30788c3f0 100644
--- a/src/pbrt/gpu/aggregate.h
+++ b/src/pbrt/gpu/optix/aggregate.h
@@ -2,8 +2,8 @@
 // The pbrt source code is licensed under the Apache License, Version 2.0.
 // SPDX: Apache-2.0
 
-#ifndef PBRT_GPU_AGGREGATE_H
-#define PBRT_GPU_AGGREGATE_H
+#ifndef PBRT_GPU_OPTIX_AGGREGATE_H
+#define PBRT_GPU_OPTIX_AGGREGATE_H
 
 #include <pbrt/pbrt.h>
 
diff --git a/src/pbrt/gpu/denoiser.cpp b/src/pbrt/gpu/optix/denoiser.cpp
similarity index 99%
rename from src/pbrt/gpu/denoiser.cpp
rename to src/pbrt/gpu/optix/denoiser.cpp
index 021d61d64..11a221b58 100644
--- a/src/pbrt/gpu/denoiser.cpp
+++ b/src/pbrt/gpu/optix/denoiser.cpp
@@ -2,7 +2,7 @@
 // The pbrt source code is licensed under the Apache License, Version 2.0.
 // SPDX: Apache-2.0
 
-#include <pbrt/gpu/denoiser.h>
+#include <pbrt/gpu/optix/denoiser.h>
 
 #include <pbrt/gpu/memory.h>
 #include <pbrt/gpu/util.h>
diff --git a/src/pbrt/gpu/denoiser.h b/src/pbrt/gpu/optix/denoiser.h
similarity index 100%
rename from src/pbrt/gpu/denoiser.h
rename to src/pbrt/gpu/optix/denoiser.h
diff --git a/src/pbrt/gpu/optix.cu b/src/pbrt/gpu/optix/optix.cu
similarity index 100%
rename from src/pbrt/gpu/optix.cu
rename to src/pbrt/gpu/optix/optix.cu
diff --git a/src/pbrt/gpu/optix.h b/src/pbrt/gpu/optix/optix.h
similarity index 94%
rename from src/pbrt/gpu/optix.h
rename to src/pbrt/gpu/optix/optix.h
index ef76a37ff..57214e75e 100644
--- a/src/pbrt/gpu/optix.h
+++ b/src/pbrt/gpu/optix/optix.h
@@ -2,8 +2,8 @@
 // The pbrt source code is licensed under the Apache License, Version 2.0.
 // SPDX: Apache-2.0
 
-#ifndef PBRT_GPU_OPTIX_H
-#define PBRT_GPU_OPTIX_H
+#ifndef PBRT_GPU_OPTIX_OPTIX_H
+#define PBRT_GPU_OPTIX_OPTIX_H
 
 #include <pbrt/pbrt.h>
 
@@ -69,4 +69,4 @@ struct RayIntersectParameters {
 
 }  // namespace pbrt
 
-#endif  // PBRT_GPU_OPTIX_H
+#endif  // PBRT_GPU_OPTIX_OPTIX_H