diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_execute.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_execute.cpp
index 0336353929..ee799e66e4 100644
--- a/projects/clr/opencl/api/opencl/amdocl/cl_execute.cpp
+++ b/projects/clr/opencl/api/opencl/amdocl/cl_execute.cpp
@@ -10,7 +10,7 @@
 #include "platform/program.hpp"
 #include "os/os.hpp"
 
-#include <icd/icd_dispatch.h>
+#include <icd/loader/icd_dispatch.h>
 
 /*! \addtogroup API
  *  @{
diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_icd.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_icd.cpp
index 71b886c40b..7e4e317a45 100644
--- a/projects/clr/opencl/api/opencl/amdocl/cl_icd.cpp
+++ b/projects/clr/opencl/api/opencl/amdocl/cl_icd.cpp
@@ -10,7 +10,7 @@
 #include "cl_d3d11_amd.hpp"
 #endif  //_WIN32
 
-#include <icd/icd_dispatch.h>
+#include <icd/loader/icd_dispatch.h>
 
 #include <mutex>
 
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd.c b/projects/clr/opencl/api/opencl/khronos/icd/loader/icd.c
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd.c
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/icd.c
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd.h b/projects/clr/opencl/api/opencl/khronos/icd/loader/icd.h
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd.h
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/icd.h
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_dispatch.c b/projects/clr/opencl/api/opencl/khronos/icd/loader/icd_dispatch.c
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_dispatch.c
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/icd_dispatch.c
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_dispatch.h b/projects/clr/opencl/api/opencl/khronos/icd/loader/icd_dispatch.h
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_dispatch.h
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/icd_dispatch.h
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_linux.c b/projects/clr/opencl/api/opencl/khronos/icd/loader/linux/icd_linux.c
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_linux.c
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/linux/icd_linux.c
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/OpenCL.rc b/projects/clr/opencl/api/opencl/khronos/icd/loader/windows/OpenCL.rc
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/OpenCL.rc
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/windows/OpenCL.rc
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_windows.c b/projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows.c
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_windows.c
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows.c
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_windows_dxgk.c b/projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_dxgk.c
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_windows_dxgk.c
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_dxgk.c
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_windows_dxgk.h b/projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_dxgk.h
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_windows_dxgk.h
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_dxgk.h
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_windows_hkr.c b/projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_hkr.c
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_windows_hkr.c
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_hkr.c
diff --git a/projects/clr/opencl/api/opencl/khronos/icd/icd_windows_hkr.h b/projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_hkr.h
similarity index 100%
rename from projects/clr/opencl/api/opencl/khronos/icd/icd_windows_hkr.h
rename to projects/clr/opencl/api/opencl/khronos/icd/loader/windows/icd_windows_hkr.h