diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0548f13435..d9b75bd4db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,6 +109,11 @@ set(NEO_RUNTIME_SOURCE_DIR "${NEO_SOURCE_DIR}/${NEO_RUNTIME_SUB_DIR}")
 set(NEO_RUNTIME_TESTS_SUB_DIR "opencl/test/unit_test")
 set(NEO_RUNTIME_TESTS_DIR "${NEO_SOURCE_DIR}/${NEO_RUNTIME_TESTS_SUB_DIR}")
 
+# Set the ocloc directory
+if(NOT DEFINED OCLOC_DIRECTORY)
+  set(OCLOC_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/shared/offline_compiler)
+endif()
+
 # Set the core source directory
 if(NOT DEFINED NEO_CORE_DIRECTORY)
   set(NEO_CORE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/shared/source)
@@ -820,7 +825,7 @@ if(MSVC)
     endif()
 endif()
 
-add_subdirectory_unique(offline_compiler ${NEO_BUILD_DIR}/offline_compiler)
+add_subdirectory_unique(${OCLOC_DIRECTORY} ${NEO_BUILD_DIR}/offline_compiler)
 target_compile_definitions(ocloc_lib PRIVATE MOCKABLE_VIRTUAL=)
 
 if(DONT_CARE_OF_VIRTUALS)
diff --git a/opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp
index 77676d9b53..9966ad9b21 100644
--- a/opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp
+++ b/opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp
@@ -191,4 +191,3 @@ INSTANTIATE_TEST_CASE_P(KernelArgInfoTests,
                             ::testing::ValuesIn(SourceFileNames),
                             ::testing::ValuesIn(BinaryForSourceFileNames),
                             ::testing::ValuesIn(KernelNames)));
-
diff --git a/opencl/test/unit_test/offline_compiler/CMakeLists.txt b/opencl/test/unit_test/offline_compiler/CMakeLists.txt
index ae026383b2..ea10a95644 100644
--- a/opencl/test/unit_test/offline_compiler/CMakeLists.txt
+++ b/opencl/test/unit_test/offline_compiler/CMakeLists.txt
@@ -8,10 +8,10 @@ project(ocloc_tests)
 
 
 set(IGDRCL_SRCS_cloc
-${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.cpp
-${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.cpp
-${NEO_SOURCE_DIR}/offline_compiler/offline_compiler.cpp
-${NEO_SOURCE_DIR}/offline_compiler/ocloc_fatbinary.cpp
+${OCLOC_DIRECTORY}/source/decoder/binary_decoder.cpp
+${OCLOC_DIRECTORY}/source/decoder/binary_encoder.cpp
+${OCLOC_DIRECTORY}/source/offline_compiler.cpp
+${OCLOC_DIRECTORY}/source/ocloc_fatbinary.cpp
 )
 
 set(IGDRCL_SRCS_offline_compiler_mock
@@ -24,23 +24,23 @@ ${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_argument_helper.h
 )
 
 set(CLOC_LIB_SRCS_UTILITIES
-  ${NEO_SOURCE_DIR}/offline_compiler/utilities/safety_caller.h
-  ${NEO_SOURCE_DIR}/offline_compiler/utilities//get_current_dir.h
+  ${OCLOC_DIRECTORY}/source/utilities/safety_caller.h
+  ${OCLOC_DIRECTORY}/source/utilities//get_current_dir.h
 )
 
 if(WIN32)
   list(APPEND CLOC_LIB_SRCS_UTILITIES
-    ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/safety_caller_windows.cpp
-    ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/safety_guard_windows.h
-    ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.cpp
-    ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.h
-    ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/get_current_dir_windows.cpp
+    ${OCLOC_DIRECTORY}/source/utilities/windows/safety_caller_windows.cpp
+    ${OCLOC_DIRECTORY}/source/utilities/windows/safety_guard_windows.h
+    ${OCLOC_DIRECTORY}/source/utilities/windows/seh_exception.cpp
+    ${OCLOC_DIRECTORY}/source/utilities/windows/seh_exception.h
+    ${OCLOC_DIRECTORY}/source/utilities/windows/get_current_dir_windows.cpp
   )
 else()
   list(APPEND CLOC_LIB_SRCS_UTILITIES
-    ${NEO_SOURCE_DIR}/offline_compiler/utilities/linux/safety_caller_linux.cpp
-    ${NEO_SOURCE_DIR}/offline_compiler/utilities/linux/safety_guard_linux.h
-    ${NEO_SOURCE_DIR}/offline_compiler/utilities/linux/get_current_dir_linux.cpp
+    ${OCLOC_DIRECTORY}/source/utilities/linux/safety_caller_linux.cpp
+    ${OCLOC_DIRECTORY}/source/utilities/linux/safety_guard_linux.h
+    ${OCLOC_DIRECTORY}/source/utilities/linux/get_current_dir_linux.cpp
   )
 endif()
 
diff --git a/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp b/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp
index 86c596a7bc..e93520268f 100644
--- a/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp
@@ -5,9 +5,9 @@
  *
  */
 
+#include "shared/offline_compiler/source/decoder/binary_decoder.h"
 #include "shared/source/helpers/array_count.h"
 
-#include "offline_compiler/decoder/binary_decoder.h"
 #include "opencl/test/unit_test/helpers/test_files.h"
 
 #include "gmock/gmock.h"
diff --git a/opencl/test/unit_test/offline_compiler/decoder/mock/mock_decoder.h b/opencl/test/unit_test/offline_compiler/decoder/mock/mock_decoder.h
index 249d187036..9361de9d1d 100644
--- a/opencl/test/unit_test/offline_compiler/decoder/mock/mock_decoder.h
+++ b/opencl/test/unit_test/offline_compiler/decoder/mock/mock_decoder.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "offline_compiler/decoder/binary_decoder.h"
+#include "shared/offline_compiler/source/decoder/binary_decoder.h"
 
 #include "mock_iga_wrapper.h"
 
diff --git a/opencl/test/unit_test/offline_compiler/decoder/mock/mock_encoder.h b/opencl/test/unit_test/offline_compiler/decoder/mock/mock_encoder.h
index 161ce17fb4..0ac4ae8f1d 100644
--- a/opencl/test/unit_test/offline_compiler/decoder/mock/mock_encoder.h
+++ b/opencl/test/unit_test/offline_compiler/decoder/mock/mock_encoder.h
@@ -6,9 +6,9 @@
  */
 
 #pragma once
+#include "shared/offline_compiler/source/decoder/binary_encoder.h"
 #include "shared/source/helpers/hash.h"
 
-#include "offline_compiler/decoder/binary_encoder.h"
 #include "opencl/test/unit_test/offline_compiler/mock/mock_argument_helper.h"
 
 #include "mock_iga_wrapper.h"
diff --git a/opencl/test/unit_test/offline_compiler/decoder/mock/mock_iga_wrapper.h b/opencl/test/unit_test/offline_compiler/decoder/mock/mock_iga_wrapper.h
index b2bc404cba..b1000804f7 100644
--- a/opencl/test/unit_test/offline_compiler/decoder/mock/mock_iga_wrapper.h
+++ b/opencl/test/unit_test/offline_compiler/decoder/mock/mock_iga_wrapper.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "offline_compiler/decoder/iga_wrapper.h"
+#include "shared/offline_compiler/source/decoder/iga_wrapper.h"
 
 #include <map>
 #include <string>
diff --git a/opencl/test/unit_test/offline_compiler/environment.h b/opencl/test/unit_test/offline_compiler/environment.h
index c70a753e49..1763f719ba 100644
--- a/opencl/test/unit_test/offline_compiler/environment.h
+++ b/opencl/test/unit_test/offline_compiler/environment.h
@@ -7,7 +7,8 @@
 
 #pragma once
 
-#include "offline_compiler/offline_compiler.h"
+#include "shared/offline_compiler/source/offline_compiler.h"
+
 #include "opencl/source/os_interface/os_inc_base.h"
 #include "opencl/test/unit_test/helpers/test_files.h"
 #include "opencl/test/unit_test/mocks/mock_compilers.h"
diff --git a/opencl/test/unit_test/offline_compiler/mock/mock_argument_helper.h b/opencl/test/unit_test/offline_compiler/mock/mock_argument_helper.h
index c61e80f173..fc2680352f 100644
--- a/opencl/test/unit_test/offline_compiler/mock/mock_argument_helper.h
+++ b/opencl/test/unit_test/offline_compiler/mock/mock_argument_helper.h
@@ -5,7 +5,7 @@
  *
  */
 
-#include "offline_compiler/ocloc_arg_helper.h"
+#include "shared/offline_compiler/source/ocloc_arg_helper.h"
 
 #include <map>
 #include <string>
diff --git a/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h b/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h
index 796fecc0bf..73a8b2712e 100644
--- a/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h
+++ b/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "offline_compiler/offline_compiler.h"
+#include "shared/offline_compiler/source/offline_compiler.h"
 
 #include <string>
 
diff --git a/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp b/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp
index 1385f8a20d..a82c723ece 100644
--- a/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp
@@ -5,10 +5,9 @@
  *
  */
 
+#include "shared/offline_compiler/source/ocloc_fatbinary.h"
 #include "shared/source/helpers/hw_helper.h"
 
-#include "offline_compiler/ocloc_fatbinary.h"
-
 #include "gtest/gtest.h"
 
 #include <unordered_set>
diff --git a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.h b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.h
index 935fc158b0..503f04f153 100644
--- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.h
+++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "offline_compiler/multi_command.h"
-#include "offline_compiler/offline_compiler.h"
+#include "shared/offline_compiler/source/multi_command.h"
+#include "shared/offline_compiler/source/offline_compiler.h"
 
 #include "gtest/gtest.h"
 #include <CL/cl.h>
diff --git a/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt b/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt
index d66a53e94c..eec1c8ed33 100644
--- a/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt
+++ b/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt
@@ -18,9 +18,9 @@ if(WIN32)
     ${CMAKE_CURRENT_SOURCE_DIR}/windows/safety_guard_caller_windows.cpp
     ${NEO_CORE_DIRECTORY}/os_interface/windows/os_library_win.cpp
     ${NEO_CORE_DIRECTORY}/os_interface/windows/os_library_win.h
-    ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/safety_guard_windows.h
-    ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.cpp
-    ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.h
+    ${OCLOC_DIRECTORY}/source/utilities/windows/safety_guard_windows.h
+    ${OCLOC_DIRECTORY}/source/utilities/windows/seh_exception.cpp
+    ${OCLOC_DIRECTORY}/source/utilities/windows/seh_exception.h
   )
 else()
   list(APPEND CLOC_SEGFAULT_TEST_SOURCES
diff --git a/opencl/test/unit_test/offline_compiler/segfault_test/linux/safety_guard_caller_linux.cpp b/opencl/test/unit_test/offline_compiler/segfault_test/linux/safety_guard_caller_linux.cpp
index 25ec652437..99392806ba 100644
--- a/opencl/test/unit_test/offline_compiler/segfault_test/linux/safety_guard_caller_linux.cpp
+++ b/opencl/test/unit_test/offline_compiler/segfault_test/linux/safety_guard_caller_linux.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "offline_compiler/utilities/linux/safety_guard_linux.h"
+#include "shared/offline_compiler/source/utilities/linux/safety_guard_linux.h"
 
 #include "../segfault_helper.h"
 
diff --git a/opencl/test/unit_test/offline_compiler/segfault_test/windows/safety_guard_caller_windows.cpp b/opencl/test/unit_test/offline_compiler/segfault_test/windows/safety_guard_caller_windows.cpp
index 94f44ff2e4..e570b3985e 100644
--- a/opencl/test/unit_test/offline_compiler/segfault_test/windows/safety_guard_caller_windows.cpp
+++ b/opencl/test/unit_test/offline_compiler/segfault_test/windows/safety_guard_caller_windows.cpp
@@ -5,7 +5,8 @@
  *
  */
 
-#include "offline_compiler/utilities/windows/safety_guard_windows.h"
+#include "shared/offline_compiler/source/utilities/windows/safety_guard_windows.h"
+
 #include "opencl/test/unit_test/offline_compiler/segfault_test/segfault_helper.h"
 
 void generateSegfaultWithSafetyGuard(SegfaultHelper *segfaultHelper) {
@@ -14,4 +15,4 @@ void generateSegfaultWithSafetyGuard(SegfaultHelper *segfaultHelper) {
     int retVal = 0;
 
     safetyGuard.call<int, SegfaultHelper, decltype(&SegfaultHelper::generateSegfault)>(segfaultHelper, &SegfaultHelper::generateSegfault, retVal);
-}
\ No newline at end of file
+}
diff --git a/shared/offline_compiler/CMakeLists.txt b/shared/offline_compiler/CMakeLists.txt
new file mode 100644
index 0000000000..d927ab3444
--- /dev/null
+++ b/shared/offline_compiler/CMakeLists.txt
@@ -0,0 +1,8 @@
+#
+# Copyright (C) 2017-2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+add_subdirectory(source)
+set(CLOC_LIB_SRCS_LIB ${CLOC_LIB_SRCS_LIB} PARENT_SCOPE)
diff --git a/offline_compiler/CMakeLists.txt b/shared/offline_compiler/source/CMakeLists.txt
similarity index 78%
rename from offline_compiler/CMakeLists.txt
rename to shared/offline_compiler/source/CMakeLists.txt
index d63d0fccf9..366d154213 100644
--- a/offline_compiler/CMakeLists.txt
+++ b/shared/offline_compiler/source/CMakeLists.txt
@@ -22,27 +22,27 @@ set(CLOC_LIB_SRCS_LIB
   ${NEO_CORE_DIRECTORY}/helpers/debug_helpers.cpp
   ${NEO_CORE_DIRECTORY}/helpers/file_io.cpp
   ${NEO_CORE_DIRECTORY}/os_interface/os_library.h
-  ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.cpp
-  ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.h
-  ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.cpp
-  ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.h
-  ${NEO_SOURCE_DIR}/offline_compiler/decoder/helper.cpp
-  ${NEO_SOURCE_DIR}/offline_compiler/decoder/helper.h
-  ${NEO_SOURCE_DIR}/offline_compiler/decoder/iga_wrapper.h
-  ${NEO_SOURCE_DIR}/offline_compiler/decoder/translate_platform_base.h
-  ${NEO_SOURCE_DIR}/offline_compiler/ocloc_api.cpp
-  ${NEO_SOURCE_DIR}/offline_compiler/ocloc_api.h
-  ${NEO_SOURCE_DIR}/offline_compiler/ocloc_arg_helper.h
-  ${NEO_SOURCE_DIR}/offline_compiler/ocloc_arg_helper.cpp
-  ${NEO_SOURCE_DIR}/offline_compiler/ocloc_fatbinary.cpp
-  ${NEO_SOURCE_DIR}/offline_compiler/ocloc_fatbinary.h
-  ${NEO_SOURCE_DIR}/offline_compiler/offline_compiler_helper.cpp
-  ${NEO_SOURCE_DIR}/offline_compiler/offline_compiler.cpp
-  ${NEO_SOURCE_DIR}/offline_compiler/offline_compiler.h
-  ${NEO_SOURCE_DIR}/offline_compiler/multi_command.cpp
-  ${NEO_SOURCE_DIR}/offline_compiler/multi_command.h
-  ${NEO_SOURCE_DIR}/offline_compiler/offline_compiler_options.cpp
-  ${NEO_SOURCE_DIR}/offline_compiler/${BRANCH_DIR_SUFFIX}/extra_settings.cpp
+  ${OCLOC_DIRECTORY}/source/decoder/binary_decoder.cpp
+  ${OCLOC_DIRECTORY}/source/decoder/binary_decoder.h
+  ${OCLOC_DIRECTORY}/source/decoder/binary_encoder.cpp
+  ${OCLOC_DIRECTORY}/source/decoder/binary_encoder.h
+  ${OCLOC_DIRECTORY}/source/decoder/helper.cpp
+  ${OCLOC_DIRECTORY}/source/decoder/helper.h
+  ${OCLOC_DIRECTORY}/source/decoder/iga_wrapper.h
+  ${OCLOC_DIRECTORY}/source/decoder/translate_platform_base.h
+  ${OCLOC_DIRECTORY}/source/ocloc_api.cpp
+  ${OCLOC_DIRECTORY}/source/ocloc_api.h
+  ${OCLOC_DIRECTORY}/source/ocloc_arg_helper.h
+  ${OCLOC_DIRECTORY}/source/ocloc_arg_helper.cpp
+  ${OCLOC_DIRECTORY}/source/ocloc_fatbinary.cpp
+  ${OCLOC_DIRECTORY}/source/ocloc_fatbinary.h
+  ${OCLOC_DIRECTORY}/source/offline_compiler_helper.cpp
+  ${OCLOC_DIRECTORY}/source/offline_compiler.cpp
+  ${OCLOC_DIRECTORY}/source/offline_compiler.h
+  ${OCLOC_DIRECTORY}/source/multi_command.cpp
+  ${OCLOC_DIRECTORY}/source/multi_command.h
+  ${OCLOC_DIRECTORY}/source/offline_compiler_options.cpp
+  ${OCLOC_DIRECTORY}/source/${BRANCH_DIR_SUFFIX}/extra_settings.cpp
   ${NEO_CORE_DIRECTORY}/compiler_interface/compiler_options/compiler_options_base.cpp
   ${NEO_CORE_DIRECTORY}/compiler_interface/create_main.cpp
   ${NEO_CORE_DIRECTORY}/helpers/hw_info.cpp
@@ -52,12 +52,12 @@ set(CLOC_LIB_SRCS_LIB
 
 if(${IGA_HEADERS_AVAILABLE})
   set(CLOC_LIB_SRCS_LIB ${CLOC_LIB_SRCS_LIB}
-    ${NEO_SOURCE_DIR}/offline_compiler/decoder/iga_wrapper.cpp
-    ${NEO_SOURCE_DIR}/offline_compiler/decoder${BRANCH_DIR_SUFFIX}/translate_platform.cpp
+    ${OCLOC_DIRECTORY}/source/decoder/iga_wrapper.cpp
+    ${OCLOC_DIRECTORY}/source/decoder${BRANCH_DIR_SUFFIX}/translate_platform.cpp
   )
 else()
   set(CLOC_LIB_SRCS_LIB ${CLOC_LIB_SRCS_LIB}
-    ${NEO_SOURCE_DIR}/offline_compiler/decoder/iga_stubs.cpp
+    ${OCLOC_DIRECTORY}/source/decoder/iga_stubs.cpp
   )
 endif()
 
@@ -112,26 +112,26 @@ add_library(ocloc_lib SHARED ${CLOC_LIB_SRCS})
 
 set(CLOC_SRCS
    ${NEO_CORE_DIRECTORY}/os_interface/os_library.h
-   ${NEO_SOURCE_DIR}/offline_compiler/ocloc_wrapper.h
-   ${NEO_SOURCE_DIR}/offline_compiler/ocloc_wrapper.cpp
-   ${NEO_SOURCE_DIR}/offline_compiler/utilities/get_path.h
+   ${OCLOC_DIRECTORY}/source/ocloc_wrapper.h
+   ${OCLOC_DIRECTORY}/source/ocloc_wrapper.cpp
+   ${OCLOC_DIRECTORY}/source/utilities/get_path.h
 )
 if(WIN32)
   list(APPEND CLOC_SRCS
     ${NEO_CORE_DIRECTORY}/os_interface/windows/os_library_win.cpp
     ${NEO_CORE_DIRECTORY}/os_interface/windows/os_library_win.h
-    ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/get_path.cpp
+    ${OCLOC_DIRECTORY}/source/utilities/windows/get_path.cpp
 
   )
 else()
   list(APPEND CLOC_SRCS
     ${NEO_CORE_DIRECTORY}/os_interface/linux/os_library_linux.cpp
     ${NEO_CORE_DIRECTORY}/os_interface/linux/os_library_linux.h
-    ${NEO_SOURCE_DIR}/offline_compiler/utilities/linux/get_path.cpp
+    ${OCLOC_DIRECTORY}/source/utilities/linux/get_path.cpp
   )
 endif()
 
-add_executable(ocloc ${CLOC_SRCS} ${NEO_SOURCE_DIR}/offline_compiler/main.cpp ${CLOC_LIB_SRCS})
+add_executable(ocloc ${CLOC_SRCS} ${OCLOC_DIRECTORY}/source/main.cpp ${CLOC_LIB_SRCS})
 
 add_subdirectories()
 
diff --git a/offline_compiler/api.cpp b/shared/offline_compiler/source/api.cpp
similarity index 100%
rename from offline_compiler/api.cpp
rename to shared/offline_compiler/source/api.cpp
diff --git a/offline_compiler/decoder/binary_decoder.cpp b/shared/offline_compiler/source/decoder/binary_decoder.cpp
similarity index 99%
rename from offline_compiler/decoder/binary_decoder.cpp
rename to shared/offline_compiler/source/decoder/binary_decoder.cpp
index b055d17136..e90ab51015 100644
--- a/offline_compiler/decoder/binary_decoder.cpp
+++ b/shared/offline_compiler/source/decoder/binary_decoder.cpp
@@ -5,17 +5,15 @@
  *
  */
 
-#include "binary_decoder.h"
+#include "shared/offline_compiler/source/decoder/binary_decoder.h"
 
+#include "shared/offline_compiler/source/decoder/helper.h"
+#include "shared/offline_compiler/source/offline_compiler.h"
 #include "shared/source/device_binary_format/elf/elf_decoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/helpers/file_io.h"
 #include "shared/source/helpers/ptr_math.h"
 
-#include "offline_compiler/offline_compiler.h"
-
-#include "helper.h"
-
 #include <cstring>
 #include <fstream>
 #include <sstream>
diff --git a/offline_compiler/decoder/binary_decoder.h b/shared/offline_compiler/source/decoder/binary_decoder.h
similarity index 92%
rename from offline_compiler/decoder/binary_decoder.h
rename to shared/offline_compiler/source/decoder/binary_decoder.h
index ad4b2116cd..0e0353bbc8 100644
--- a/offline_compiler/decoder/binary_decoder.h
+++ b/shared/offline_compiler/source/decoder/binary_decoder.h
@@ -6,9 +6,9 @@
  */
 
 #pragma once
-#include "offline_compiler/decoder/helper.h"
-#include "offline_compiler/decoder/iga_wrapper.h"
-#include "offline_compiler/ocloc_arg_helper.h"
+#include "shared/offline_compiler/source/decoder/helper.h"
+#include "shared/offline_compiler/source/decoder/iga_wrapper.h"
+#include "shared/offline_compiler/source/ocloc_arg_helper.h"
 
 #include <memory>
 #include <string>
diff --git a/offline_compiler/decoder/binary_encoder.cpp b/shared/offline_compiler/source/decoder/binary_encoder.cpp
similarity index 99%
rename from offline_compiler/decoder/binary_encoder.cpp
rename to shared/offline_compiler/source/decoder/binary_encoder.cpp
index eaf32713d8..6bde7c04f8 100644
--- a/offline_compiler/decoder/binary_encoder.cpp
+++ b/shared/offline_compiler/source/decoder/binary_encoder.cpp
@@ -7,14 +7,13 @@
 
 #include "binary_encoder.h"
 
+#include "shared/offline_compiler/source/offline_compiler.h"
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/file_io.h"
 #include "shared/source/helpers/hash.h"
 
-#include "offline_compiler/offline_compiler.h"
-
 #include "CL/cl.h"
 #include "helper.h"
 
diff --git a/offline_compiler/decoder/binary_encoder.h b/shared/offline_compiler/source/decoder/binary_encoder.h
similarity index 96%
rename from offline_compiler/decoder/binary_encoder.h
rename to shared/offline_compiler/source/decoder/binary_encoder.h
index 9c4d7c2c06..ae4a0546ef 100644
--- a/offline_compiler/decoder/binary_encoder.h
+++ b/shared/offline_compiler/source/decoder/binary_encoder.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "offline_compiler/ocloc_arg_helper.h"
+#include "shared/offline_compiler/source/ocloc_arg_helper.h"
 
 #include "helper.h"
 #include "iga_wrapper.h"
diff --git a/offline_compiler/decoder/helper.cpp b/shared/offline_compiler/source/decoder/helper.cpp
similarity index 100%
rename from offline_compiler/decoder/helper.cpp
rename to shared/offline_compiler/source/decoder/helper.cpp
diff --git a/offline_compiler/decoder/helper.h b/shared/offline_compiler/source/decoder/helper.h
similarity index 100%
rename from offline_compiler/decoder/helper.h
rename to shared/offline_compiler/source/decoder/helper.h
diff --git a/offline_compiler/decoder/iga_stubs.cpp b/shared/offline_compiler/source/decoder/iga_stubs.cpp
similarity index 100%
rename from offline_compiler/decoder/iga_stubs.cpp
rename to shared/offline_compiler/source/decoder/iga_stubs.cpp
diff --git a/offline_compiler/decoder/iga_wrapper.cpp b/shared/offline_compiler/source/decoder/iga_wrapper.cpp
similarity index 100%
rename from offline_compiler/decoder/iga_wrapper.cpp
rename to shared/offline_compiler/source/decoder/iga_wrapper.cpp
diff --git a/offline_compiler/decoder/iga_wrapper.h b/shared/offline_compiler/source/decoder/iga_wrapper.h
similarity index 100%
rename from offline_compiler/decoder/iga_wrapper.h
rename to shared/offline_compiler/source/decoder/iga_wrapper.h
diff --git a/offline_compiler/decoder/translate_platform.cpp b/shared/offline_compiler/source/decoder/translate_platform.cpp
similarity index 80%
rename from offline_compiler/decoder/translate_platform.cpp
rename to shared/offline_compiler/source/decoder/translate_platform.cpp
index 3fc298537f..6d92e29f61 100644
--- a/offline_compiler/decoder/translate_platform.cpp
+++ b/shared/offline_compiler/source/decoder/translate_platform.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "offline_compiler/decoder/translate_platform_base.h"
+#include "shared/offline_compiler/source/decoder/translate_platform_base.h"
 
 iga_gen_t translateToIgaGen(PRODUCT_FAMILY productFamily) {
     return translateToIgaGenBase(productFamily);
diff --git a/offline_compiler/decoder/translate_platform_base.h b/shared/offline_compiler/source/decoder/translate_platform_base.h
similarity index 100%
rename from offline_compiler/decoder/translate_platform_base.h
rename to shared/offline_compiler/source/decoder/translate_platform_base.h
diff --git a/offline_compiler/extra_settings.cpp b/shared/offline_compiler/source/extra_settings.cpp
similarity index 86%
rename from offline_compiler/extra_settings.cpp
rename to shared/offline_compiler/source/extra_settings.cpp
index 9063fcba5a..50dda69bb2 100644
--- a/offline_compiler/extra_settings.cpp
+++ b/shared/offline_compiler/source/extra_settings.cpp
@@ -5,10 +5,9 @@
  *
  */
 
+#include "shared/offline_compiler/source/offline_compiler.h"
 #include "shared/source/os_interface/os_library.h"
 
-#include "offline_compiler/offline_compiler.h"
-
 #include "compiler_options.h"
 
 namespace NEO {
diff --git a/offline_compiler/main.cpp b/shared/offline_compiler/source/main.cpp
similarity index 100%
rename from offline_compiler/main.cpp
rename to shared/offline_compiler/source/main.cpp
diff --git a/offline_compiler/multi_command.cpp b/shared/offline_compiler/source/multi_command.cpp
similarity index 99%
rename from offline_compiler/multi_command.cpp
rename to shared/offline_compiler/source/multi_command.cpp
index ba23222cbf..da49740353 100644
--- a/offline_compiler/multi_command.cpp
+++ b/shared/offline_compiler/source/multi_command.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "offline_compiler/multi_command.h"
+#include "shared/offline_compiler/source/multi_command.h"
 
 namespace NEO {
 int MultiCommand::singleBuild(size_t numArgs, const std::vector<std::string> &allArgs) {
diff --git a/offline_compiler/multi_command.h b/shared/offline_compiler/source/multi_command.h
similarity index 79%
rename from offline_compiler/multi_command.h
rename to shared/offline_compiler/source/multi_command.h
index 4fd10341f6..47a93d8783 100644
--- a/offline_compiler/multi_command.h
+++ b/shared/offline_compiler/source/multi_command.h
@@ -5,14 +5,13 @@
  *
  */
 
+#include "shared/offline_compiler/source/decoder/binary_decoder.h"
+#include "shared/offline_compiler/source/decoder/binary_encoder.h"
+#include "shared/offline_compiler/source/offline_compiler.h"
+#include "shared/offline_compiler/source/utilities/get_current_dir.h"
+#include "shared/offline_compiler/source/utilities/safety_caller.h"
 #include "shared/source/os_interface/os_library.h"
 
-#include "offline_compiler/offline_compiler.h"
-#include "offline_compiler/utilities/get_current_dir.h"
-#include "offline_compiler/utilities/safety_caller.h"
-
-#include "decoder/binary_decoder.h"
-#include "decoder/binary_encoder.h"
 #include <CL/cl.h>
 
 #include <fstream>
diff --git a/offline_compiler/ocloc_api.cpp b/shared/offline_compiler/source/ocloc_api.cpp
similarity index 100%
rename from offline_compiler/ocloc_api.cpp
rename to shared/offline_compiler/source/ocloc_api.cpp
diff --git a/offline_compiler/ocloc_api.h b/shared/offline_compiler/source/ocloc_api.h
similarity index 76%
rename from offline_compiler/ocloc_api.h
rename to shared/offline_compiler/source/ocloc_api.h
index 4ec64850d9..e8f6b45888 100644
--- a/offline_compiler/ocloc_api.h
+++ b/shared/offline_compiler/source/ocloc_api.h
@@ -5,11 +5,10 @@
  *
  */
 
-#include "offline_compiler/multi_command.h"
-#include "offline_compiler/offline_compiler.h"
-
-#include "decoder/binary_decoder.h"
-#include "decoder/binary_encoder.h"
+#include "shared/offline_compiler/source/decoder/binary_decoder.h"
+#include "shared/offline_compiler/source/decoder/binary_encoder.h"
+#include "shared/offline_compiler/source/multi_command.h"
+#include "shared/offline_compiler/source/offline_compiler.h"
 
 using namespace NEO;
 
diff --git a/offline_compiler/ocloc_arg_helper.cpp b/shared/offline_compiler/source/ocloc_arg_helper.cpp
similarity index 100%
rename from offline_compiler/ocloc_arg_helper.cpp
rename to shared/offline_compiler/source/ocloc_arg_helper.cpp
diff --git a/offline_compiler/ocloc_arg_helper.h b/shared/offline_compiler/source/ocloc_arg_helper.h
similarity index 100%
rename from offline_compiler/ocloc_arg_helper.h
rename to shared/offline_compiler/source/ocloc_arg_helper.h
diff --git a/offline_compiler/ocloc_fatbinary.cpp b/shared/offline_compiler/source/ocloc_fatbinary.cpp
similarity index 98%
rename from offline_compiler/ocloc_fatbinary.cpp
rename to shared/offline_compiler/source/ocloc_fatbinary.cpp
index f558cafff0..33850dbf6d 100644
--- a/offline_compiler/ocloc_fatbinary.cpp
+++ b/shared/offline_compiler/source/ocloc_fatbinary.cpp
@@ -5,15 +5,14 @@
  *
  */
 
-#include "offline_compiler/ocloc_fatbinary.h"
+#include "shared/offline_compiler/source/ocloc_fatbinary.h"
 
+#include "shared/offline_compiler/source/offline_compiler.h"
+#include "shared/offline_compiler/source/utilities/safety_caller.h"
 #include "shared/source/device_binary_format/ar/ar_encoder.h"
 #include "shared/source/helpers/file_io.h"
 #include "shared/source/helpers/hw_info.h"
 
-#include "offline_compiler/offline_compiler.h"
-#include "offline_compiler/utilities/safety_caller.h"
-
 #include "compiler_options.h"
 #include "igfxfmid.h"
 
diff --git a/offline_compiler/ocloc_fatbinary.h b/shared/offline_compiler/source/ocloc_fatbinary.h
similarity index 100%
rename from offline_compiler/ocloc_fatbinary.h
rename to shared/offline_compiler/source/ocloc_fatbinary.h
diff --git a/offline_compiler/ocloc_wrapper.cpp b/shared/offline_compiler/source/ocloc_wrapper.cpp
similarity index 100%
rename from offline_compiler/ocloc_wrapper.cpp
rename to shared/offline_compiler/source/ocloc_wrapper.cpp
diff --git a/offline_compiler/ocloc_wrapper.h b/shared/offline_compiler/source/ocloc_wrapper.h
similarity index 100%
rename from offline_compiler/ocloc_wrapper.h
rename to shared/offline_compiler/source/ocloc_wrapper.h
diff --git a/offline_compiler/offline_compiler.cpp b/shared/offline_compiler/source/offline_compiler.cpp
similarity index 100%
rename from offline_compiler/offline_compiler.cpp
rename to shared/offline_compiler/source/offline_compiler.cpp
diff --git a/offline_compiler/offline_compiler.h b/shared/offline_compiler/source/offline_compiler.h
similarity index 98%
rename from offline_compiler/offline_compiler.h
rename to shared/offline_compiler/source/offline_compiler.h
index 774ab373b6..928d74a724 100644
--- a/offline_compiler/offline_compiler.h
+++ b/shared/offline_compiler/source/offline_compiler.h
@@ -7,12 +7,11 @@
 
 #pragma once
 
+#include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/source/os_interface/os_library.h"
 #include "shared/source/utilities/arrayref.h"
 #include "shared/source/utilities/const_stringref.h"
 
-#include "offline_compiler/ocloc_arg_helper.h"
-
 #include "cif/common/cif_main.h"
 #include "ocl_igc_interface/fcl_ocl_device_ctx.h"
 #include "ocl_igc_interface/igc_ocl_device_ctx.h"
diff --git a/offline_compiler/offline_compiler_helper.cpp b/shared/offline_compiler/source/offline_compiler_helper.cpp
similarity index 100%
rename from offline_compiler/offline_compiler_helper.cpp
rename to shared/offline_compiler/source/offline_compiler_helper.cpp
diff --git a/offline_compiler/offline_compiler_options.cpp b/shared/offline_compiler/source/offline_compiler_options.cpp
similarity index 100%
rename from offline_compiler/offline_compiler_options.cpp
rename to shared/offline_compiler/source/offline_compiler_options.cpp
diff --git a/offline_compiler/utilities/CMakeLists.txt b/shared/offline_compiler/source/utilities/CMakeLists.txt
similarity index 100%
rename from offline_compiler/utilities/CMakeLists.txt
rename to shared/offline_compiler/source/utilities/CMakeLists.txt
diff --git a/offline_compiler/utilities/get_current_dir.h b/shared/offline_compiler/source/utilities/get_current_dir.h
similarity index 100%
rename from offline_compiler/utilities/get_current_dir.h
rename to shared/offline_compiler/source/utilities/get_current_dir.h
diff --git a/offline_compiler/utilities/get_path.h b/shared/offline_compiler/source/utilities/get_path.h
similarity index 100%
rename from offline_compiler/utilities/get_path.h
rename to shared/offline_compiler/source/utilities/get_path.h
diff --git a/offline_compiler/utilities/linux/get_current_dir_linux.cpp b/shared/offline_compiler/source/utilities/linux/get_current_dir_linux.cpp
similarity index 100%
rename from offline_compiler/utilities/linux/get_current_dir_linux.cpp
rename to shared/offline_compiler/source/utilities/linux/get_current_dir_linux.cpp
diff --git a/offline_compiler/utilities/linux/get_path.cpp b/shared/offline_compiler/source/utilities/linux/get_path.cpp
similarity index 100%
rename from offline_compiler/utilities/linux/get_path.cpp
rename to shared/offline_compiler/source/utilities/linux/get_path.cpp
diff --git a/offline_compiler/utilities/linux/safety_caller_linux.cpp b/shared/offline_compiler/source/utilities/linux/safety_caller_linux.cpp
similarity index 74%
rename from offline_compiler/utilities/linux/safety_caller_linux.cpp
rename to shared/offline_compiler/source/utilities/linux/safety_caller_linux.cpp
index fd7b13a665..5cfb2d1ce9 100644
--- a/offline_compiler/utilities/linux/safety_caller_linux.cpp
+++ b/shared/offline_compiler/source/utilities/linux/safety_caller_linux.cpp
@@ -5,11 +5,10 @@
  *
  */
 
+#include "shared/offline_compiler/source/offline_compiler.h"
+#include "shared/offline_compiler/source/utilities/linux/safety_guard_linux.h"
 #include "shared/source/os_interface/os_library.h"
 
-#include "offline_compiler/offline_compiler.h"
-#include "offline_compiler/utilities/linux/safety_guard_linux.h"
-
 using namespace NEO;
 
 int buildWithSafetyGuard(OfflineCompiler *compiler) {
diff --git a/offline_compiler/utilities/linux/safety_guard_linux.h b/shared/offline_compiler/source/utilities/linux/safety_guard_linux.h
similarity index 100%
rename from offline_compiler/utilities/linux/safety_guard_linux.h
rename to shared/offline_compiler/source/utilities/linux/safety_guard_linux.h
diff --git a/offline_compiler/utilities/safety_caller.h b/shared/offline_compiler/source/utilities/safety_caller.h
similarity index 100%
rename from offline_compiler/utilities/safety_caller.h
rename to shared/offline_compiler/source/utilities/safety_caller.h
diff --git a/offline_compiler/utilities/windows/get_current_dir_windows.cpp b/shared/offline_compiler/source/utilities/windows/get_current_dir_windows.cpp
similarity index 100%
rename from offline_compiler/utilities/windows/get_current_dir_windows.cpp
rename to shared/offline_compiler/source/utilities/windows/get_current_dir_windows.cpp
diff --git a/offline_compiler/utilities/windows/get_path.cpp b/shared/offline_compiler/source/utilities/windows/get_path.cpp
similarity index 100%
rename from offline_compiler/utilities/windows/get_path.cpp
rename to shared/offline_compiler/source/utilities/windows/get_path.cpp
diff --git a/offline_compiler/utilities/windows/safety_caller_windows.cpp b/shared/offline_compiler/source/utilities/windows/safety_caller_windows.cpp
similarity index 71%
rename from offline_compiler/utilities/windows/safety_caller_windows.cpp
rename to shared/offline_compiler/source/utilities/windows/safety_caller_windows.cpp
index d05f8e5463..26f227cba3 100644
--- a/offline_compiler/utilities/windows/safety_caller_windows.cpp
+++ b/shared/offline_compiler/source/utilities/windows/safety_caller_windows.cpp
@@ -5,8 +5,8 @@
  *
  */
 
-#include "offline_compiler/offline_compiler.h"
-#include "offline_compiler/utilities/windows/safety_guard_windows.h"
+#include "shared/offline_compiler/source/offline_compiler.h"
+#include "shared/offline_compiler/source/utilities/windows/safety_guard_windows.h"
 
 using namespace NEO;
 
diff --git a/offline_compiler/utilities/windows/safety_guard_windows.h b/shared/offline_compiler/source/utilities/windows/safety_guard_windows.h
similarity index 92%
rename from offline_compiler/utilities/windows/safety_guard_windows.h
rename to shared/offline_compiler/source/utilities/windows/safety_guard_windows.h
index 833b1ef224..199d904797 100644
--- a/offline_compiler/utilities/windows/safety_guard_windows.h
+++ b/shared/offline_compiler/source/utilities/windows/safety_guard_windows.h
@@ -6,10 +6,9 @@
  */
 
 #pragma once
+#include "shared/offline_compiler/source/utilities/windows/seh_exception.h"
 #include "shared/source/helpers/abort.h"
 
-#include "offline_compiler/utilities/windows/seh_exception.h"
-
 #include <setjmp.h>
 
 static jmp_buf jmpbuf;
diff --git a/offline_compiler/utilities/windows/seh_exception.cpp b/shared/offline_compiler/source/utilities/windows/seh_exception.cpp
similarity index 100%
rename from offline_compiler/utilities/windows/seh_exception.cpp
rename to shared/offline_compiler/source/utilities/windows/seh_exception.cpp
diff --git a/offline_compiler/utilities/windows/seh_exception.h b/shared/offline_compiler/source/utilities/windows/seh_exception.h
similarity index 100%
rename from offline_compiler/utilities/windows/seh_exception.h
rename to shared/offline_compiler/source/utilities/windows/seh_exception.h
diff --git a/shared/test/unit_test/encoders/test_encode_math.cpp b/shared/test/unit_test/encoders/test_encode_math.cpp
index 8cce7d8451..81790f7439 100644
--- a/shared/test/unit_test/encoders/test_encode_math.cpp
+++ b/shared/test/unit_test/encoders/test_encode_math.cpp
@@ -159,7 +159,6 @@ HWTEST_F(CommandEncoderMathTest, appendsAGreaterThanPredicate) {
     EXPECT_EQ(cmdIMM->getRegisterOffset(), CS_GPR_R1);
     EXPECT_EQ(cmdIMM->getDataDword(), 17u);
 
-
     itor = find<MI_MATH *>(itor, commands.end());
     ASSERT_NE(itor, commands.end());