diff --git a/Makefile b/Makefile
index c724751..f9470e9 100644
--- a/Makefile
+++ b/Makefile
@@ -63,13 +63,13 @@ TEST_OBJS:=\
 	$(OBJ_DIR)/TestUtils.o
 
 CUDA_OBJS:=\
-	$(OBJ_DIR)/CudaUtils.o \
-	$(OBJ_DIR)/CudaState.o \
-	$(OBJ_DIR)/CudaHamiltonian.o \
-	$(OBJ_DIR)/CudaLanczos.o \
-	$(OBJ_DIR)/CudaDeviceUtils.o \
-	$(OBJ_DIR)/CudaMultiGpuHamiltonianNaive.o \
-	$(OBJ_DIR)/CudaMultiGpuHamiltonian.o
+	$(OBJ_DIR)/gpu/CudaUtils.o \
+	$(OBJ_DIR)/gpu/CudaState.o \
+	$(OBJ_DIR)/gpu/CudaHamiltonian.o \
+	$(OBJ_DIR)/gpu/CudaLanczos.o \
+	$(OBJ_DIR)/gpu/CudaDeviceUtils.o \
+	$(OBJ_DIR)/gpu/CudaMultiGpuHamiltonianNaive.o \
+	$(OBJ_DIR)/gpu/CudaMultiGpuHamiltonian.o
 
 BINS:=\
 	test-kitaev \
diff --git a/src/CudaDeviceUtils.cu b/src/gpu/CudaDeviceUtils.cu
similarity index 100%
rename from src/CudaDeviceUtils.cu
rename to src/gpu/CudaDeviceUtils.cu
diff --git a/src/CudaHamiltonian.cc b/src/gpu/CudaHamiltonian.cc
similarity index 100%
rename from src/CudaHamiltonian.cc
rename to src/gpu/CudaHamiltonian.cc
diff --git a/src/CudaHamiltonian.h b/src/gpu/CudaHamiltonian.h
similarity index 100%
rename from src/CudaHamiltonian.h
rename to src/gpu/CudaHamiltonian.h
diff --git a/src/CudaLanczos.cc b/src/gpu/CudaLanczos.cc
similarity index 100%
rename from src/CudaLanczos.cc
rename to src/gpu/CudaLanczos.cc
diff --git a/src/CudaLanczos.h b/src/gpu/CudaLanczos.h
similarity index 100%
rename from src/CudaLanczos.h
rename to src/gpu/CudaLanczos.h
diff --git a/src/CudaMultiGpuHamiltonian.cc b/src/gpu/CudaMultiGpuHamiltonian.cc
similarity index 100%
rename from src/CudaMultiGpuHamiltonian.cc
rename to src/gpu/CudaMultiGpuHamiltonian.cc
diff --git a/src/CudaMultiGpuHamiltonian.h b/src/gpu/CudaMultiGpuHamiltonian.h
similarity index 100%
rename from src/CudaMultiGpuHamiltonian.h
rename to src/gpu/CudaMultiGpuHamiltonian.h
diff --git a/src/CudaMultiGpuHamiltonianNaive.cc b/src/gpu/CudaMultiGpuHamiltonianNaive.cc
similarity index 100%
rename from src/CudaMultiGpuHamiltonianNaive.cc
rename to src/gpu/CudaMultiGpuHamiltonianNaive.cc
diff --git a/src/CudaMultiGpuHamiltonianNaive.h b/src/gpu/CudaMultiGpuHamiltonianNaive.h
similarity index 100%
rename from src/CudaMultiGpuHamiltonianNaive.h
rename to src/gpu/CudaMultiGpuHamiltonianNaive.h
diff --git a/src/CudaState.cc b/src/gpu/CudaState.cc
similarity index 100%
rename from src/CudaState.cc
rename to src/gpu/CudaState.cc
diff --git a/src/CudaState.h b/src/gpu/CudaState.h
similarity index 100%
rename from src/CudaState.h
rename to src/gpu/CudaState.h
diff --git a/src/CudaUtils.cc b/src/gpu/CudaUtils.cc
similarity index 100%
rename from src/CudaUtils.cc
rename to src/gpu/CudaUtils.cc
diff --git a/src/CudaUtils.h b/src/gpu/CudaUtils.h
similarity index 100%
rename from src/CudaUtils.h
rename to src/gpu/CudaUtils.h