diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 531cd9e3f2caa74f0c7f3825565941c20a3e65d3..f51543548a44f8697f4d312ece578ff0158f9d2f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,6 +23,7 @@ include_directories("libaevol/rng")
 include_directories("libaevol/world")
 include_directories("libaevol/population")
 include_directories("libaevol/stats")
+include_directories("libaevol/cuda")
 
 # ============================================================================
 # Add targets add their dependencies
diff --git a/src/libaevol/CMakeLists.txt b/src/libaevol/CMakeLists.txt
index 002798277487236f301b78b0344dccef34aa3bb1..f27a3c092dea2d38433bc3712d3816552d353276 100644
--- a/src/libaevol/CMakeLists.txt
+++ b/src/libaevol/CMakeLists.txt
@@ -20,6 +20,7 @@ include_directories("./rng")
 include_directories("./world")
 include_directories("./population")
 include_directories("./stats")
+include_directories("./cuda")
 # ============================================================================
 # Add targets add their dependencies
 # ============================================================================
diff --git a/src/libaevol/BitSet_SIMD.cpp b/src/libaevol/cuda/BitSet_SIMD.cpp
similarity index 100%
rename from src/libaevol/BitSet_SIMD.cpp
rename to src/libaevol/cuda/BitSet_SIMD.cpp
diff --git a/src/libaevol/BitSet_SIMD.h b/src/libaevol/cuda/BitSet_SIMD.h
similarity index 100%
rename from src/libaevol/BitSet_SIMD.h
rename to src/libaevol/cuda/BitSet_SIMD.h
diff --git a/src/libaevol/algorithm_cuda.cpp b/src/libaevol/cuda/algorithm_cuda.cpp
similarity index 100%
rename from src/libaevol/algorithm_cuda.cpp
rename to src/libaevol/cuda/algorithm_cuda.cpp
diff --git a/src/libaevol/algorithm_cuda.h b/src/libaevol/cuda/algorithm_cuda.h
similarity index 100%
rename from src/libaevol/algorithm_cuda.h
rename to src/libaevol/cuda/algorithm_cuda.h
diff --git a/src/post_treatments/CMakeLists.txt b/src/post_treatments/CMakeLists.txt
index 8676040c1d363245236e9d0a5d7636686a3b537d..148f813b0ce90d09bf619d752e44f35b172ae370 100644
--- a/src/post_treatments/CMakeLists.txt
+++ b/src/post_treatments/CMakeLists.txt
@@ -21,6 +21,7 @@ include_directories("../libaevol/rng")
 include_directories("../libaevol/world")
 include_directories("../libaevol/population")
 include_directories("../libaevol/stats")
+include_directories("../libaevol/cuda")
 
 # ============================================================================
 # Add targets add their dependencies