diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
index 28823347e..07024bf5e 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
@@ -58,8 +58,8 @@
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include "control_message_factory.h"
-#include "fft_base_kernels.h"
-#include "fft_internal.h"
+#include "opencl/fft_base_kernels.h"
+#include "opencl/fft_internal.h"
 #include "GPS_L1_CA.h" //GPS_TWO_PI
 
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h
index 8d5a1fef0..a492e77dc 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h
@@ -57,11 +57,11 @@
 #include <gnuradio/block.h>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/fft/fft.h>
-#include "fft_internal.h"
+#include "opencl/fft_internal.h"
 #include "gnss_synchro.h"
 
 #ifdef __APPLE__
-   #include "cl.hpp"
+   #include "opencl/cl.hpp"
 #else
     #include <CL/cl.hpp>
 #endif
diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt
index ef0471f16..65e2c96b2 100644
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@@ -41,9 +41,9 @@ set(GNSS_SPLIBS_SOURCES
 
 if(OPENCL_FOUND)
     set(GNSS_SPLIBS_SOURCES ${GNSS_SPLIBS_SOURCES}
-         fft_execute.cc # Needs OpenCL
-         fft_setup.cc # Needs OpenCL
-         fft_kernelstring.cc # Needs OpenCL
+         opencl/fft_execute.cc # Needs OpenCL
+         opencl/fft_setup.cc # Needs OpenCL
+         opencl/fft_kernelstring.cc # Needs OpenCL
     )
 endif(OPENCL_FOUND)
 
diff --git a/src/algorithms/libs/cl.hpp b/src/algorithms/libs/opencl/cl.hpp
similarity index 100%
rename from src/algorithms/libs/cl.hpp
rename to src/algorithms/libs/opencl/cl.hpp
diff --git a/src/algorithms/libs/clFFT.h b/src/algorithms/libs/opencl/clFFT.h
similarity index 100%
rename from src/algorithms/libs/clFFT.h
rename to src/algorithms/libs/opencl/clFFT.h
diff --git a/src/algorithms/libs/fft_base_kernels.h b/src/algorithms/libs/opencl/fft_base_kernels.h
similarity index 100%
rename from src/algorithms/libs/fft_base_kernels.h
rename to src/algorithms/libs/opencl/fft_base_kernels.h
diff --git a/src/algorithms/libs/fft_execute.cc b/src/algorithms/libs/opencl/fft_execute.cc
similarity index 100%
rename from src/algorithms/libs/fft_execute.cc
rename to src/algorithms/libs/opencl/fft_execute.cc
diff --git a/src/algorithms/libs/fft_internal.h b/src/algorithms/libs/opencl/fft_internal.h
similarity index 100%
rename from src/algorithms/libs/fft_internal.h
rename to src/algorithms/libs/opencl/fft_internal.h
diff --git a/src/algorithms/libs/fft_kernelstring.cc b/src/algorithms/libs/opencl/fft_kernelstring.cc
similarity index 100%
rename from src/algorithms/libs/fft_kernelstring.cc
rename to src/algorithms/libs/opencl/fft_kernelstring.cc
diff --git a/src/algorithms/libs/fft_setup.cc b/src/algorithms/libs/opencl/fft_setup.cc
similarity index 100%
rename from src/algorithms/libs/fft_setup.cc
rename to src/algorithms/libs/opencl/fft_setup.cc