diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4463211e14..57cca299df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,7 @@ set(BRANCH_DIR_SUFFIX "/${BRANCH_TYPE}")
 list(APPEND BRANCH_DIR_LIST "/")
 if(NOT "${BRANCH_TYPE}" STREQUAL "")
   list(APPEND BRANCH_DIR_LIST "/${BRANCH_TYPE}/")
+  set(BRANCH_DIR_SUFFIX "${BRANCH_DIR_SUFFIX}/")
 endif()
 message(STATUS "branch dir list: ${BRANCH_DIR_LIST}")
 
@@ -333,7 +334,7 @@ if(NOT DEFINED SOURCE_LEVEL_DEBUGGER_HEADERS_DIR)
   message(STATUS "Source Level Debugger headers dir: ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR}")
 endif()
 
-get_filename_component(AUB_STREAM_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/aub_stream/headers" ABSOLUTE)
+get_filename_component(AUB_STREAM_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}aub_stream/headers" ABSOLUTE)
 if(IS_DIRECTORY ${AUB_STREAM_HEADERS_DIR})
   message(STATUS "Aub Stream Headers dir: ${AUB_STREAM_HEADERS_DIR}")
 else()
@@ -357,19 +358,19 @@ else()
 endif()
 
 # Metrics Library
-get_filename_component(METRICS_LIBRARY_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/metrics_library" ABSOLUTE)
+get_filename_component(METRICS_LIBRARY_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}metrics_library" ABSOLUTE)
 if(IS_DIRECTORY ${METRICS_LIBRARY_HEADERS_DIR})
   message(STATUS "Metrics Library dir: ${METRICS_LIBRARY_HEADERS_DIR}")
-  include_directories(${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/metrics_library)
+  include_directories(${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}metrics_library)
 else()
   message(FATAL_ERROR "Metrics Library headers not available!")
 endif()
 
 # Metrics Discovery
-get_filename_component(METRICS_DISCOVERY_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/metrics_discovery" ABSOLUTE)
+get_filename_component(METRICS_DISCOVERY_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}metrics_discovery" ABSOLUTE)
 if(IS_DIRECTORY ${METRICS_DISCOVERY_HEADERS_DIR})
   message(STATUS "Metrics Discovery dir: ${METRICS_DISCOVERY_HEADERS_DIR}")
-  include_directories(${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/metrics_discovery)
+  include_directories(${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}metrics_discovery)
 else()
   message(FATAL_ERROR "Metrics Discovery headers not available!")
 endif()
@@ -377,7 +378,7 @@ endif()
 if(SUPPORT_DG1 AND "${BRANCH_TYPE}" STREQUAL "")
   get_filename_component(I915_INCLUDES_DIR "${NEO_SOURCE_DIR}/third_party/uapi/dg1" ABSOLUTE)
 else()
-  get_filename_component(I915_INCLUDES_DIR "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/uapi" ABSOLUTE)
+  get_filename_component(I915_INCLUDES_DIR "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}uapi" ABSOLUTE)
 endif()
 message(STATUS "i915 includes dir: ${I915_INCLUDES_DIR}")
 
@@ -702,7 +703,7 @@ message(STATUS "AUB_STREAM_DIR = ${AUB_STREAM_DIR}")
 if(DEFINED AUB_STREAM_DIR)
   set(AUB_STREAM_PROJECT_NAME "aub_stream")
   add_subdirectory_unique(${AUB_STREAM_DIR} ${CMAKE_BINARY_DIR}/aub_stream EXCLUDE_FROM_ALL)
-  set(ENGINE_NODE_DIR ${AUB_STREAM_DIR}${BRANCH_DIR_SUFFIX}/headers)
+  set(ENGINE_NODE_DIR ${AUB_STREAM_DIR}${BRANCH_DIR_SUFFIX}headers)
 else()
   set(ENGINE_NODE_DIR ${AUB_STREAM_HEADERS_DIR})
 endif()
diff --git a/level_zero/CMakeLists.txt b/level_zero/CMakeLists.txt
index af63cbe6b8..e5e5c9ab76 100644
--- a/level_zero/CMakeLists.txt
+++ b/level_zero/CMakeLists.txt
@@ -205,7 +205,7 @@ if(BUILD_WITH_L0)
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
   include_directories(ddi${BRANCH_DIR_SUFFIX})
   include_directories(tools/source)
-  include_directories(experimental${BRANCH_DIR_SUFFIX}/source)
+  include_directories(experimental${BRANCH_DIR_SUFFIX}source)
   include_directories(experimental/source/tracing)
 
   # Create our shared library/DLL
@@ -260,8 +260,8 @@ if(BUILD_WITH_L0)
     target_sources(${TARGET_NAME_L0}
                    PRIVATE
                    ${NEO_SHARED_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
-                   ${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}/devices.inl
-                   ${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}/devices_additional.inl
+                   ${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}devices.inl
+                   ${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}devices_additional.inl
                    ${NEO_SHARED_DIRECTORY}/dll/devices/devices_base.inl
                    ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/allocator_helper.cpp
                    ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/options_linux.cpp
@@ -372,7 +372,7 @@ if(BUILD_WITH_L0)
     )
 
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/core/source "${NEO_BUILD_DIR}/${LIB_NAME}/core/source")
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/experimental${BRANCH_DIR_SUFFIX}/source "${NEO_BUILD_DIR}/${LIB_NAME}/experimental${BRANCH_DIR_SUFFIX}/source")
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/experimental${BRANCH_DIR_SUFFIX}source "${NEO_BUILD_DIR}/${LIB_NAME}/experimental${BRANCH_DIR_SUFFIX}source")
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/experimental/source/tracing "${NEO_BUILD_DIR}/${LIB_NAME}/experimental/tracing")
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools/source "${NEO_BUILD_DIR}/${LIB_NAME}tools/source")
 
diff --git a/level_zero/cmake/verify_l0_support.cmake b/level_zero/cmake/verify_l0_support.cmake
index 66b4368e40..46593d5d35 100644
--- a/level_zero/cmake/verify_l0_support.cmake
+++ b/level_zero/cmake/verify_l0_support.cmake
@@ -1,10 +1,10 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake${BRANCH_DIR_SUFFIX}/not_supported_platforms.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake${BRANCH_DIR_SUFFIX}not_supported_platforms.cmake)
 
 set(L0_SUPPORTED_PRODUCT_FAMILIES ${ALL_SUPPORTED_PRODUCT_FAMILY})
 # Remove unsupported products
diff --git a/level_zero/core/source/CMakeLists.txt b/level_zero/core/source/CMakeLists.txt
index a36fa5c88a..2532f5fd87 100644
--- a/level_zero/core/source/CMakeLists.txt
+++ b/level_zero/core/source/CMakeLists.txt
@@ -7,7 +7,7 @@
 set(L0_RUNTIME_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/get_extension_function_lookup_map.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_extension_function_lookup_map.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}get_extension_function_lookup_map.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/builtin/builtin_functions_lib.h
     ${CMAKE_CURRENT_SOURCE_DIR}/builtin/builtin_functions_lib_impl.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/builtin/builtin_functions_lib_impl.h
@@ -20,19 +20,19 @@ set(L0_RUNTIME_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_imp.h
     ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_hw_immediate.h
     ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_hw_immediate.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_extended${BRANCH_DIR_SUFFIX}/cmdlist_extended.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_extended${BRANCH_DIR_SUFFIX}cmdlist_extended.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue.h
     ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue_hw.h
     ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue_hw.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue_hw_base.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue_imp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue_extended${BRANCH_DIR_SUFFIX}/cmdqueue_extended.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue_extended${BRANCH_DIR_SUFFIX}cmdqueue_extended.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/context/context_imp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/context/context_imp.h
     ${CMAKE_CURRENT_SOURCE_DIR}/context/context.h
     ${CMAKE_CURRENT_SOURCE_DIR}/debugger/debug_manager.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/device${BRANCH_DIR_SUFFIX}/device_imp_helper.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/device${BRANCH_DIR_SUFFIX}device_imp_helper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/device/device.h
     ${CMAKE_CURRENT_SOURCE_DIR}/device/device_imp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/device/device_imp.h
@@ -76,7 +76,7 @@ set(L0_RUNTIME_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/module/module.h
     ${CMAKE_CURRENT_SOURCE_DIR}/module/module_build_log.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/module/module_build_log.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/module${BRANCH_DIR_SUFFIX}/module_extra_options.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/module${BRANCH_DIR_SUFFIX}module_extra_options.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/module/module_imp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/module/module_imp.h
     ${CMAKE_CURRENT_SOURCE_DIR}/printf_handler/printf_handler.cpp
diff --git a/level_zero/core/source/cache/linux/CMakeLists.txt b/level_zero/core/source/cache/linux/CMakeLists.txt
index 2095674dbb..6ee4bc953c 100644
--- a/level_zero/core/source/cache/linux/CMakeLists.txt
+++ b/level_zero/core/source/cache/linux/CMakeLists.txt
@@ -6,8 +6,8 @@
 
 set(L0_SRCS_CACHE_RESERVATION_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/cache_reservation_impl.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/cache_reservation_impl.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}cache_reservation_impl.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}cache_reservation_impl.h
 )
 
 if(UNIX)
diff --git a/level_zero/core/source/dll/linux/CMakeLists.txt b/level_zero/core/source/dll/linux/CMakeLists.txt
index 9106e69b4d..03c6cf6e97 100644
--- a/level_zero/core/source/dll/linux/CMakeLists.txt
+++ b/level_zero/core/source/dll/linux/CMakeLists.txt
@@ -7,7 +7,7 @@
 set(L0_SRCS_DLL_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/debugger_l0_linux.cpp
-    ${NEO_SOURCE_DIR}/level_zero/tools/source/debug${BRANCH_DIR_SUFFIX}/linux/debug_session_linux_helper.cpp
+    ${NEO_SOURCE_DIR}/level_zero/tools/source/debug${BRANCH_DIR_SUFFIX}linux/debug_session_linux_helper.cpp
 )
 
 set_property(GLOBAL PROPERTY L0_SRCS_DLL_LINUX ${L0_SRCS_DLL_LINUX})
diff --git a/level_zero/core/test/aub_tests/CMakeLists.txt b/level_zero/core/test/aub_tests/CMakeLists.txt
index b57e44298c..9145290d12 100644
--- a/level_zero/core/test/aub_tests/CMakeLists.txt
+++ b/level_zero/core/test/aub_tests/CMakeLists.txt
@@ -82,7 +82,7 @@ if(TARGET ${BUILTINS_SPIRV_LIB_NAME})
 endif()
 
 target_sources(${TARGET_NAME} PRIVATE
-               ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers${BRANCH_DIR_SUFFIX}/kernel_binary_helper_hash_value.cpp
+               ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers${BRANCH_DIR_SUFFIX}kernel_binary_helper_hash_value.cpp
                ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/create_command_stream.cpp
                ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/io_functions.cpp
                ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.cpp
diff --git a/level_zero/core/test/unit_tests/sources/cache/linux/CMakeLists.txt b/level_zero/core/test/unit_tests/sources/cache/linux/CMakeLists.txt
index 729219f58c..638abfe05d 100644
--- a/level_zero/core/test/unit_tests/sources/cache/linux/CMakeLists.txt
+++ b/level_zero/core/test/unit_tests/sources/cache/linux/CMakeLists.txt
@@ -7,6 +7,6 @@
 if(UNIX)
   target_sources(${TARGET_NAME} PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/test_cache_reservation_impl.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}test_cache_reservation_impl.cpp
   )
 endif()
diff --git a/level_zero/tools/source/debug/CMakeLists.txt b/level_zero/tools/source/debug/CMakeLists.txt
index 96bb531ad9..c495001d38 100644
--- a/level_zero/tools/source/debug/CMakeLists.txt
+++ b/level_zero/tools/source/debug/CMakeLists.txt
@@ -9,7 +9,7 @@ set(L0_SRCS_TOOLS_DEBUG
     ${CMAKE_CURRENT_SOURCE_DIR}/debug_session.h
     ${CMAKE_CURRENT_SOURCE_DIR}/debug_handlers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/eu_thread.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/debug_handlers.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}debug_handlers.cpp
 )
 
 add_subdirectories()
diff --git a/level_zero/tools/source/sysman/diagnostics/linux/CMakeLists.txt b/level_zero/tools/source/sysman/diagnostics/linux/CMakeLists.txt
index 7adb076ae3..94260811b8 100644
--- a/level_zero/tools/source/sysman/diagnostics/linux/CMakeLists.txt
+++ b/level_zero/tools/source/sysman/diagnostics/linux/CMakeLists.txt
@@ -8,7 +8,7 @@ set(L0_SRCS_TOOLS_SYSMAN_DIAGNOSTICS_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/os_diagnostics_imp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/os_diagnostics_imp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_diagnostics_helper.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_diagnostics_helper.cpp
 )
 
 if(UNIX)
diff --git a/level_zero/tools/source/sysman/engine/linux/CMakeLists.txt b/level_zero/tools/source/sysman/engine/linux/CMakeLists.txt
index 0ab8b9a954..73920a8d92 100755
--- a/level_zero/tools/source/sysman/engine/linux/CMakeLists.txt
+++ b/level_zero/tools/source/sysman/engine/linux/CMakeLists.txt
@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(L0_SRCS_TOOLS_SYSMAN_ENGINE_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_engine_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_engine_imp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp.h
 )
 
diff --git a/level_zero/tools/source/sysman/events/linux/CMakeLists.txt b/level_zero/tools/source/sysman/events/linux/CMakeLists.txt
index 90c5607446..867f3c0880 100644
--- a/level_zero/tools/source/sysman/events/linux/CMakeLists.txt
+++ b/level_zero/tools/source/sysman/events/linux/CMakeLists.txt
@@ -1,13 +1,13 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(L0_SRCS_TOOLS_SYSMAN_EVENTS_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_events_imp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_events_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_events_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_events_imp.h
 )
 
 if(UNIX)
diff --git a/level_zero/tools/source/sysman/fabric_port/linux/CMakeLists.txt b/level_zero/tools/source/sysman/fabric_port/linux/CMakeLists.txt
index e1529a54de..ccb5a8eacb 100644
--- a/level_zero/tools/source/sysman/fabric_port/linux/CMakeLists.txt
+++ b/level_zero/tools/source/sysman/fabric_port/linux/CMakeLists.txt
@@ -1,13 +1,13 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(L0_SRCS_TOOLS_SYSMAN_FABRICPORT_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_fabric_port_imp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_fabric_port_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_fabric_port_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_fabric_port_imp.h
 )
 
 add_subdirectories()
diff --git a/level_zero/tools/source/sysman/frequency/linux/CMakeLists.txt b/level_zero/tools/source/sysman/frequency/linux/CMakeLists.txt
index 2cf9cd725c..ac1d6ad9db 100644
--- a/level_zero/tools/source/sysman/frequency/linux/CMakeLists.txt
+++ b/level_zero/tools/source/sysman/frequency/linux/CMakeLists.txt
@@ -6,8 +6,8 @@
 
 set(L0_SRCS_TOOLS_SYSMAN_FREQUENCY_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_frequency_imp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_frequency_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_frequency_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_frequency_imp.h
 )
 
 if(UNIX)
diff --git a/level_zero/tools/source/sysman/global_operations/linux/CMakeLists.txt b/level_zero/tools/source/sysman/global_operations/linux/CMakeLists.txt
index 4b5aef15e2..08625bfe0e 100644
--- a/level_zero/tools/source/sysman/global_operations/linux/CMakeLists.txt
+++ b/level_zero/tools/source/sysman/global_operations/linux/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 set(L0_SRCS_TOOLS_GLOBAL_OPERATIONS_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_global_operations_helper.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_global_operations_helper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_imp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_imp.h
 )
diff --git a/level_zero/tools/source/sysman/linux/firmware_util/CMakeLists.txt b/level_zero/tools/source/sysman/linux/firmware_util/CMakeLists.txt
index 1209e4e9d8..7eef092689 100644
--- a/level_zero/tools/source/sysman/linux/firmware_util/CMakeLists.txt
+++ b/level_zero/tools/source/sysman/linux/firmware_util/CMakeLists.txt
@@ -18,7 +18,7 @@ if(libigsc_FOUND)
   else()
     message(STATUS "LIBIGSC version: ${libigsc_VERSION}")
     set(L0_SRCS_TOOLS_SYSMAN_LINUX_FIRMWARE_UTIL_HELPER
-        ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/firmware_util_imp_helper.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}firmware_util_imp_helper.cpp
     )
   endif()
 else()
diff --git a/level_zero/tools/source/sysman/linux/pmt/CMakeLists.txt b/level_zero/tools/source/sysman/linux/pmt/CMakeLists.txt
index 8506793fbb..217587f5e6 100644
--- a/level_zero/tools/source/sysman/linux/pmt/CMakeLists.txt
+++ b/level_zero/tools/source/sysman/linux/pmt/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 
 set(L0_SRCS_TOOLS_SYSMAN_LINUX_PMT
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/pmt_helper.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}pmt_helper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/pmt.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/pmt.h
 )
diff --git a/level_zero/tools/source/sysman/memory/linux/CMakeLists.txt b/level_zero/tools/source/sysman/memory/linux/CMakeLists.txt
index 6f404922d6..377c1f6133 100755
--- a/level_zero/tools/source/sysman/memory/linux/CMakeLists.txt
+++ b/level_zero/tools/source/sysman/memory/linux/CMakeLists.txt
@@ -15,8 +15,8 @@ if(SUPPORT_DG1 AND "${BRANCH_TYPE}" STREQUAL "")
   )
 else()
   list(APPEND L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX
-       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_memory_imp.h
-       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_memory_imp.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_memory_imp.h
+       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_memory_imp.cpp
   )
 endif()
 
diff --git a/level_zero/tools/source/sysman/performance/linux/CMakeLists.txt b/level_zero/tools/source/sysman/performance/linux/CMakeLists.txt
index c680baf115..cef02a52ae 100644
--- a/level_zero/tools/source/sysman/performance/linux/CMakeLists.txt
+++ b/level_zero/tools/source/sysman/performance/linux/CMakeLists.txt
@@ -6,8 +6,8 @@
 
 set(L0_SRCS_TOOLS_SYSMAN_PERFORMANCE_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_performance_imp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_performance_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_performance_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_performance_imp.h
 )
 
 if(UNIX)
diff --git a/level_zero/tools/source/sysman/ras/linux/CMakeLists.txt b/level_zero/tools/source/sysman/ras/linux/CMakeLists.txt
index cc4e80e085..297ae38153 100755
--- a/level_zero/tools/source/sysman/ras/linux/CMakeLists.txt
+++ b/level_zero/tools/source/sysman/ras/linux/CMakeLists.txt
@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(L0_SRCS_TOOLS_SYSMAN_RAS_LINUX
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_ras_imp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_ras_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_ras_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_ras_imp.h
 )
 
 if(UNIX)
diff --git a/level_zero/tools/source/sysman/scheduler/linux/CMakeLists.txt b/level_zero/tools/source/sysman/scheduler/linux/CMakeLists.txt
index ca397ef494..22dd8ef6dc 100644
--- a/level_zero/tools/source/sysman/scheduler/linux/CMakeLists.txt
+++ b/level_zero/tools/source/sysman/scheduler/linux/CMakeLists.txt
@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(L0_SRCS_TOOLS_SYSMAN_SCHEDULER_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_scheduler_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_scheduler_imp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp.h
 )
 
diff --git a/level_zero/tools/source/sysman/temperature/linux/CMakeLists.txt b/level_zero/tools/source/sysman/temperature/linux/CMakeLists.txt
index 442f3c333b..678743dc92 100644
--- a/level_zero/tools/source/sysman/temperature/linux/CMakeLists.txt
+++ b/level_zero/tools/source/sysman/temperature/linux/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 
 set(L0_SRCS_TOOLS_SYSMAN_TEMPERATURE_LINUX
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_temperature_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}os_temperature_imp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature_imp.h
 )
 
diff --git a/level_zero/tools/test/unit_tests/CMakeLists.txt b/level_zero/tools/test/unit_tests/CMakeLists.txt
index c691aed596..2770c7f777 100644
--- a/level_zero/tools/test/unit_tests/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/CMakeLists.txt
@@ -37,7 +37,7 @@ target_sources(${TARGET_NAME} PRIVATE
 )
 
 target_sources(${TARGET_NAME} PRIVATE
-               ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/helpers${BRANCH_DIR_SUFFIX}/kernel_binary_helper_hash_value.cpp
+               ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/helpers${BRANCH_DIR_SUFFIX}kernel_binary_helper_hash_value.cpp
                ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/create_command_stream.cpp
                ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/io_functions.cpp
                ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.cpp
diff --git a/level_zero/tools/test/unit_tests/sources/debug/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/debug/CMakeLists.txt
index fda0d9ae75..5497842b44 100644
--- a/level_zero/tools/test/unit_tests/sources/debug/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/debug/CMakeLists.txt
@@ -9,7 +9,7 @@ target_sources(${TARGET_NAME} PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/debug_session_tests.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/eu_thread_tests.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/mock_debug_session.h
-               ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/test_debug_api.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}test_debug_api.cpp
 )
 
 add_subdirectories()
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/diagnostics/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/diagnostics/linux/CMakeLists.txt
index dbd7bb2457..58d362415e 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/diagnostics/linux/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/sysman/diagnostics/linux/CMakeLists.txt
@@ -9,6 +9,6 @@ if(UNIX)
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                  ${CMAKE_CURRENT_SOURCE_DIR}/mock_zes_sysman_diagnostics.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/test_zes_sysman_diagnostics.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}test_zes_sysman_diagnostics.cpp
   )
 endif()
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/CMakeLists.txt
index 88c6a3c4d0..f2a2aad4f9 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -8,8 +8,8 @@ if(UNIX)
   target_sources(${TARGET_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/test_zes_engine.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_engine.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}test_zes_engine.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}mock_engine.h
   )
 endif()
 
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/events/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/events/linux/CMakeLists.txt
index ea40aedf6e..21eb2e9693 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/events/linux/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/sysman/events/linux/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -8,7 +8,7 @@ if(UNIX)
   target_sources(${TARGET_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/test_zes_events.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_events.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}test_zes_events.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}mock_events.h
   )
 endif()
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/CMakeLists.txt
index 1e2c515f73..11aa9ea5d9 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/CMakeLists.txt
@@ -8,8 +8,8 @@ if(UNIX)
   target_sources(${TARGET_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/test_zes_fabric_port.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_fabric_device.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}test_zes_fabric_port.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}mock_fabric_device.h
   )
 
   add_subdirectories()
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/frequency/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/frequency/linux/CMakeLists.txt
index d8a4b30346..0e48954fc4 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/frequency/linux/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/sysman/frequency/linux/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -8,7 +8,7 @@ if(UNIX)
   target_sources(${TARGET_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/test_zes_frequency.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_sysfs_frequency.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}test_zes_frequency.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}mock_sysfs_frequency.h
   )
 endif()
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/global_operations/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/global_operations/linux/CMakeLists.txt
index afa10bfb4a..bd64a03d91 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/global_operations/linux/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/sysman/global_operations/linux/CMakeLists.txt
@@ -10,6 +10,6 @@ if(UNIX)
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                  ${CMAKE_CURRENT_SOURCE_DIR}/test_zes_global_operations.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/mock_global_operations.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/test_zes_global_operations_helper.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}test_zes_global_operations_helper.cpp
   )
 endif()
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/CMakeLists.txt
index 3ecc8734a7..eb2793dedd 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/CMakeLists.txt
@@ -15,8 +15,8 @@ if(SUPPORT_DG1 AND "${BRANCH_TYPE}" STREQUAL "")
   )
 else()
   list(APPEND L0_TESTS_TOOLS_SYSMAN_MEMORY_LINUX
-       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_memory.h
-       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/test_sysman_memory.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}mock_memory.h
+       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}test_sysman_memory.cpp
   )
 endif()
 
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/CMakeLists.txt
index 05d3152271..1837803e79 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/CMakeLists.txt
@@ -8,7 +8,7 @@ if(UNIX)
   target_sources(${TARGET_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/test_zes_performance.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_sysfs_performance.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}test_zes_performance.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}mock_sysfs_performance.h
   )
 endif()
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/ras/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/ras/linux/CMakeLists.txt
index ccac6aa6cf..4538671cf3 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/ras/linux/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/sysman/ras/linux/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -8,8 +8,8 @@ if(UNIX)
   target_sources(${TARGET_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/test_zes_ras.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_fs_ras.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}test_zes_ras.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}mock_fs_ras.h
   )
 endif()
 
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/CMakeLists.txt
index c0f51d1744..a515c87652 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -8,7 +8,7 @@ if(UNIX)
   target_sources(${TARGET_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/test_zes_scheduler.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_sysfs_scheduler.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}test_zes_scheduler.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}mock_sysfs_scheduler.h
   )
 endif()
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/CMakeLists.txt
index 3b8b859f96..57b1d6906f 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/CMakeLists.txt
@@ -8,7 +8,7 @@ if(UNIX)
   target_sources(${TARGET_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/test_zes_temperature.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}test_zes_temperature.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/mock_sysfs_temperature.h
   )
 endif()
diff --git a/opencl/source/api/CMakeLists.txt b/opencl/source/api/CMakeLists.txt
index d0374330f7..396dfcffbb 100644
--- a/opencl/source/api/CMakeLists.txt
+++ b/opencl/source/api/CMakeLists.txt
@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2018-2020 Intel Corporation
+# Copyright (C) 2018-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(RUNTIME_SRCS_API
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/additional_extensions.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}additional_extensions.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/additional_extensions.h
     ${CMAKE_CURRENT_SOURCE_DIR}/api.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/api.h
diff --git a/opencl/source/built_ins/CMakeLists.txt b/opencl/source/built_ins/CMakeLists.txt
index 8724440808..4cce1e7b79 100644
--- a/opencl/source/built_ins/CMakeLists.txt
+++ b/opencl/source/built_ins/CMakeLists.txt
@@ -11,7 +11,7 @@ set(RUNTIME_SRCS_BUILT_INS
     ${CMAKE_CURRENT_SOURCE_DIR}/builtins_dispatch_builder.h
     ${CMAKE_CURRENT_SOURCE_DIR}/built_in_ops_vme.h
     ${CMAKE_CURRENT_SOURCE_DIR}/built_ins.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/unknown_built_in_name.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}unknown_built_in_name.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/vme_builtin.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/vme_builtin.h
     ${CMAKE_CURRENT_SOURCE_DIR}/vme_dispatch_builder.h
diff --git a/opencl/source/command_stream/CMakeLists.txt b/opencl/source/command_stream/CMakeLists.txt
index 6f33cdf3a8..e9649602a9 100644
--- a/opencl/source/command_stream/CMakeLists.txt
+++ b/opencl/source/command_stream/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 set(RUNTIME_SRCS_COMMAND_STREAM
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/per_dss_backed_buffer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}per_dss_backed_buffer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_hw.h
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_hw_base.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_hw_bdw_and_later.inl
diff --git a/opencl/source/dll/CMakeLists.txt b/opencl/source/dll/CMakeLists.txt
index 8af83cc745..e342d41923 100644
--- a/opencl/source/dll/CMakeLists.txt
+++ b/opencl/source/dll/CMakeLists.txt
@@ -45,8 +45,8 @@ set(RUNTIME_SRCS_DLL_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/linux/drm_neo_create.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/linux/options_linux.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/linux/os_interface.cpp
-    ${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}/devices.inl
-    ${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}/devices_additional.inl
+    ${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}devices.inl
+    ${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}devices_additional.inl
     ${NEO_SHARED_DIRECTORY}/dll/devices/devices_base.inl
     ${NEO_SHARED_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
     ${NEO_SOURCE_DIR}/opencl/source/os_interface/linux/platform_teardown_linux.cpp
diff --git a/opencl/source/enable_gens.cmake b/opencl/source/enable_gens.cmake
index 8b85098953..183d2f8125 100644
--- a/opencl/source/enable_gens.cmake
+++ b/opencl/source/enable_gens.cmake
@@ -41,7 +41,7 @@ macro(macro_for_each_platform)
 
   foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
     set(PLATFORM_FILE "hw_info_setup_${PLATFORM_IT_LOWER}.inl")
-    set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX}/${PLATFORM_FILE})
+    set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX}${PLATFORM_FILE})
     if(EXISTS ${SRC_FILE})
       list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${SRC_FILE})
     endif()
diff --git a/opencl/source/gen12lp/additional_files_gen12lp.cmake b/opencl/source/gen12lp/additional_files_gen12lp.cmake
index dcdecbc0d1..7849c418e8 100644
--- a/opencl/source/gen12lp/additional_files_gen12lp.cmake
+++ b/opencl/source/gen12lp/additional_files_gen12lp.cmake
@@ -1,14 +1,14 @@
 #
-# Copyright (C) 2019-2020 Intel Corporation
+# Copyright (C) 2019-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(RUNTIME_SRCS_ADDITIONAL_FILES_GEN12LP
-    ${CMAKE_CURRENT_SOURCE_DIR}/gen12lp/definitions${BRANCH_DIR_SUFFIX}/command_queue_helpers_gen12lp.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/gen12lp/definitions${BRANCH_DIR_SUFFIX}/hardware_commands_helper_gen12lp.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/gen12lp/definitions${BRANCH_DIR_SUFFIX}command_queue_helpers_gen12lp.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/gen12lp/definitions${BRANCH_DIR_SUFFIX}hardware_commands_helper_gen12lp.inl
 )
-include_directories(${NEO_SOURCE_DIR}/opencl/source/gen12lp/definitions${BRANCH_DIR_SUFFIX}/)
+include_directories(${NEO_SOURCE_DIR}/opencl/source/gen12lp/definitions${BRANCH_DIR_SUFFIX})
 
 target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_ADDITIONAL_FILES_GEN12LP})
 set_property(GLOBAL PROPERTY RUNTIME_SRCS_ADDITIONAL_FILES_GEN12LP ${RUNTIME_SRCS_ADDITIONAL_FILES_GEN12LP})
diff --git a/opencl/source/helpers/CMakeLists.txt b/opencl/source/helpers/CMakeLists.txt
index 2a9ed17684..79af355226 100644
--- a/opencl/source/helpers/CMakeLists.txt
+++ b/opencl/source/helpers/CMakeLists.txt
@@ -9,7 +9,7 @@ set(RUNTIME_SRCS_HELPERS_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}/base_object.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/base_object.h
     ${CMAKE_CURRENT_SOURCE_DIR}/cl_blit_properties.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/cl_device_helpers.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}cl_device_helpers.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cl_device_helpers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/cl_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper.cpp
@@ -34,7 +34,7 @@ set(RUNTIME_SRCS_HELPERS_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}/hardware_context_controller.h
     ${CMAKE_CURRENT_SOURCE_DIR}/helper_options.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/implicit_scaling_ocl.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/memory_properties_helpers.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}memory_properties_helpers.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/memory_properties_helpers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/memory_properties_helpers_base.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/mipmap.cpp
diff --git a/opencl/source/kernel/CMakeLists.txt b/opencl/source/kernel/CMakeLists.txt
index ad9ca6f585..66c751602a 100644
--- a/opencl/source/kernel/CMakeLists.txt
+++ b/opencl/source/kernel/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 set(RUNTIME_SRCS_KERNEL
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_additional_kernel_info.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}get_additional_kernel_info.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/image_transformer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/image_transformer.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cpp
@@ -15,7 +15,7 @@ set(RUNTIME_SRCS_KERNEL
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_execution_type.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_info_cl.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_objects_for_aux_translation.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/kernel_extra.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}kernel_extra.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/multi_device_kernel.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/multi_device_kernel.h
 )
diff --git a/opencl/source/mem_obj/CMakeLists.txt b/opencl/source/mem_obj/CMakeLists.txt
index ba35442c28..aa6028da2b 100644
--- a/opencl/source/mem_obj/CMakeLists.txt
+++ b/opencl/source/mem_obj/CMakeLists.txt
@@ -19,13 +19,13 @@ set(RUNTIME_SRCS_MEM_OBJ
     ${CMAKE_CURRENT_SOURCE_DIR}/map_operations_handler.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mem_obj.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mem_obj.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mem_obj_helper.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}mem_obj_helper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mem_obj_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mem_obj_helper_common.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/pipe.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/pipe.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/buffer_ext.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/image_ext.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}buffer_ext.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}image_ext.inl
 )
 
 if(SUPPORT_XEHP_AND_LATER)
diff --git a/opencl/source/program/CMakeLists.txt b/opencl/source/program/CMakeLists.txt
index 53a5bf6134..022ebf6678 100644
--- a/opencl/source/program/CMakeLists.txt
+++ b/opencl/source/program/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 set(RUNTIME_SRCS_PROGRAM
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/additional_options.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}additional_options.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/block_kernel_manager.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/block_kernel_manager.h
     ${CMAKE_CURRENT_SOURCE_DIR}/build.cpp
@@ -15,7 +15,7 @@ set(RUNTIME_SRCS_PROGRAM
     ${CMAKE_CURRENT_SOURCE_DIR}/create.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/get_info.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/heap_info.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/internal_options.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}internal_options.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_info.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_info_from_patchtokens.cpp
diff --git a/opencl/source/sharings/va/CMakeLists.txt b/opencl/source/sharings/va/CMakeLists.txt
index cbc5444bb5..1e92b75e46 100644
--- a/opencl/source/sharings/va/CMakeLists.txt
+++ b/opencl/source/sharings/va/CMakeLists.txt
@@ -9,7 +9,7 @@ set(RUNTIME_SRCS_SHARINGS_VA
     ${CMAKE_CURRENT_SOURCE_DIR}/va_device.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/va_device.h
     ${CMAKE_CURRENT_SOURCE_DIR}/va_device_shared.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/${BRANCH_DIR_SUFFIX}/va_extension.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}va_extension.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cl_va_api.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cl_va_api.h
     ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing.cpp
diff --git a/opencl/test/unit_test/api/CMakeLists.txt b/opencl/test/unit_test/api/CMakeLists.txt
index 925832f433..694720050f 100644
--- a/opencl/test/unit_test/api/CMakeLists.txt
+++ b/opencl/test/unit_test/api/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 set(IGDRCL_SRCS_tests_api
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/additional_extensions_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}additional_extensions_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/api_tests_wrapper1.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/api_tests_wrapper2.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/api_tests_wrapper3.cpp
diff --git a/opencl/test/unit_test/built_ins/CMakeLists.txt b/opencl/test/unit_test/built_ins/CMakeLists.txt
index 812ca4400e..b5c3d89a6a 100644
--- a/opencl/test/unit_test/built_ins/CMakeLists.txt
+++ b/opencl/test/unit_test/built_ins/CMakeLists.txt
@@ -11,7 +11,7 @@ set(IGDRCL_SRCS_tests_built_in
     ${CMAKE_CURRENT_SOURCE_DIR}/built_in_kernels_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/built_in_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/built_in_tests_ocl.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_built_ins_file_names.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}get_built_ins_file_names.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/sip_tests.cpp
 )
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_built_in})
diff --git a/opencl/test/unit_test/command_stream/CMakeLists.txt b/opencl/test/unit_test/command_stream/CMakeLists.txt
index 09293d6a0b..87f335ccea 100644
--- a/opencl/test/unit_test/command_stream/CMakeLists.txt
+++ b/opencl/test/unit_test/command_stream/CMakeLists.txt
@@ -37,7 +37,7 @@ set(IGDRCL_SRCS_tests_command_stream
     ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_fixture.h
     ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tbx_stream_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/thread_arbitration_policy_helper.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}thread_arbitration_policy_helper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/thread_arbitration_policy_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests.h
 )
diff --git a/opencl/test/unit_test/gen12lp/CMakeLists.txt b/opencl/test/unit_test/gen12lp/CMakeLists.txt
index 56201418b4..a44645561d 100644
--- a/opencl/test/unit_test/gen12lp/CMakeLists.txt
+++ b/opencl/test/unit_test/gen12lp/CMakeLists.txt
@@ -29,7 +29,7 @@ if(TESTS_GEN12LP)
       ${CMAKE_CURRENT_SOURCE_DIR}/profiling_tests_gen12lp.inl
       ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests_gen12lp.inl
       ${CMAKE_CURRENT_SOURCE_DIR}/scheduler_source_tests_gen12lp.inl
-      ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/special_ult_helper_gen12lp.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}special_ult_helper_gen12lp.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/special_ult_helper_gen12lp.h
       ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver_tests_gen12lp.inl
       ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_gen12lp.inl
diff --git a/opencl/test/unit_test/gen12lp/adlp/linux/dll/CMakeLists.txt b/opencl/test/unit_test/gen12lp/adlp/linux/dll/CMakeLists.txt
index abd8f4f07b..bbf591fbf4 100644
--- a/opencl/test/unit_test/gen12lp/adlp/linux/dll/CMakeLists.txt
+++ b/opencl/test/unit_test/gen12lp/adlp/linux/dll/CMakeLists.txt
@@ -6,6 +6,6 @@
 
 set(IGDRCL_SRCS_linux_dll_tests_gen12_adlp
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/device_id_tests_adlp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}device_id_tests_adlp.cpp
 )
 target_sources(igdrcl_linux_dll_tests PRIVATE ${IGDRCL_SRCS_linux_dll_tests_gen12_adlp})
diff --git a/opencl/test/unit_test/gen_common/CMakeLists.txt b/opencl/test/unit_test/gen_common/CMakeLists.txt
index 5f11b75fdd..cc4f843790 100644
--- a/opencl/test/unit_test/gen_common/CMakeLists.txt
+++ b/opencl/test/unit_test/gen_common/CMakeLists.txt
@@ -9,7 +9,7 @@ set(IGDRCL_SRCS_tests_gen_common
     ${CMAKE_CURRENT_SOURCE_DIR}/exclude_tests/exclude_test_declare.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/exclude_tests/exclude_test_exclude.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/gen_commands_common_validation.h
-    ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}/test.h
+    ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}test.h
 )
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen_common})
 
diff --git a/opencl/test/unit_test/libult/CMakeLists.txt b/opencl/test/unit_test/libult/CMakeLists.txt
index 5f8c2204fb..2d4eb98061 100644
--- a/opencl/test/unit_test/libult/CMakeLists.txt
+++ b/opencl/test/unit_test/libult/CMakeLists.txt
@@ -66,7 +66,7 @@ set(IGDRCL_SRCS_LIB_ULT_ENV
     ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/program_fixture.h
     ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/kernel_binary_helper.cpp
     ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/kernel_binary_helper.h
-    ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers${BRANCH_DIR_SUFFIX}/kernel_binary_helper_hash_value.cpp
+    ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers${BRANCH_DIR_SUFFIX}kernel_binary_helper_hash_value.cpp
     ${NEO_SOURCE_DIR}/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.cpp
     ${NEO_SOURCE_DIR}/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h
     ${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_config_listener.cpp
diff --git a/opencl/test/unit_test/linux/CMakeLists.txt b/opencl/test/unit_test/linux/CMakeLists.txt
index 317641048a..ce6b09c2a7 100644
--- a/opencl/test/unit_test/linux/CMakeLists.txt
+++ b/opencl/test/unit_test/linux/CMakeLists.txt
@@ -29,7 +29,7 @@ add_executable(igdrcl_${target_name}
                ${NEO_SOURCE_DIR}/opencl/source/dll/linux/os_interface.cpp
                ${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
                ${NEO_SOURCE_DIR}/opencl/source/os_interface/linux/platform_teardown_linux.cpp
-               ${NEO_SOURCE_DIR}/opencl/test/unit_test/linux${BRANCH_DIR_SUFFIX}/drm_other_requests.cpp
+               ${NEO_SOURCE_DIR}/opencl/test/unit_test/linux${BRANCH_DIR_SUFFIX}drm_other_requests.cpp
                ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp
                ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.cpp
 )
diff --git a/opencl/test/unit_test/mocks/CMakeLists.txt b/opencl/test/unit_test/mocks/CMakeLists.txt
index 1372f4ef97..cc68302707 100644
--- a/opencl/test/unit_test/mocks/CMakeLists.txt
+++ b/opencl/test/unit_test/mocks/CMakeLists.txt
@@ -56,8 +56,8 @@ set(IGDRCL_SRCS_tests_mocks
     ${CMAKE_CURRENT_SOURCE_DIR}/ult_cl_device_factory.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ult_cl_device_factory.h
     ${NEO_SHARED_DIRECTORY}/gmm_helper/page_table_mngr_impl.cpp
-    ${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_DIR_SUFFIX}/mock_gmm_client_context.cpp
-    ${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_DIR_SUFFIX}/mock_gmm_client_context.h
+    ${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_DIR_SUFFIX}mock_gmm_client_context.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_DIR_SUFFIX}mock_gmm_client_context.h
     ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_experimental_command_buffer.h
     ${NEO_CORE_tests_compiler_mocks}
 )
@@ -75,7 +75,7 @@ if(WIN32)
        ${CMAKE_CURRENT_SOURCE_DIR}/mock_ostime_win.h
        ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_memory_base.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_memory_base.h
-       ${CMAKE_CURRENT_SOURCE_DIR}/gmm_memory${BRANCH_DIR_SUFFIX}/mock_gmm_memory.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/gmm_memory${BRANCH_DIR_SUFFIX}mock_gmm_memory.h
        ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm_interface23.h
        ${NEO_SHARED_TEST_DIRECTORY}/unit_test/os_interface/windows/mock_gdi_interface.cpp
        ${IGDRCL_SRC_tests_mock_wddm}
diff --git a/opencl/test/unit_test/os_interface/linux/CMakeLists.txt b/opencl/test/unit_test/os_interface/linux/CMakeLists.txt
index 1a7b70e474..052f05db36 100644
--- a/opencl/test/unit_test/os_interface/linux/CMakeLists.txt
+++ b/opencl/test/unit_test/os_interface/linux/CMakeLists.txt
@@ -16,22 +16,22 @@ set(IGDRCL_SRCS_tests_os_interface_linux
     ${CMAKE_CURRENT_SOURCE_DIR}/device_os_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/driver_info_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_buffer_object_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_cache_info_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_cache_info_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream_mm_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream_tests_1.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream_tests_2.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_debug_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_debug_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_gem_close_worker_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_mapper_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_engine_info_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_mapper_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_engine_info_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager_tests.h
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_neo_create.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_os_memory_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_residency_handler_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_system_info_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_system_info_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_uuid_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_uuid_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/file_logger_linux_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_linux_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_linux_tests.h
@@ -52,8 +52,8 @@ if(SUPPORT_DG1 AND "${BRANCH_TYPE}" STREQUAL "")
   )
 else()
   list(APPEND IGDRCL_SRCS_tests_os_interface_linux
-       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_memory_info_tests.cpp
-       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_memory_manager_allocate_in_device_pool_tests.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_memory_info_tests.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_memory_manager_allocate_in_device_pool_tests.cpp
   )
 endif()
 if(NEO__LIBVA_FOUND)
diff --git a/opencl/test/unit_test/os_interface/windows/CMakeLists.txt b/opencl/test/unit_test/os_interface/windows/CMakeLists.txt
index b78b54ebbf..1c9a31c262 100644
--- a/opencl/test/unit_test/os_interface/windows/CMakeLists.txt
+++ b/opencl/test/unit_test/os_interface/windows/CMakeLists.txt
@@ -32,8 +32,8 @@ set(IGDRCL_SRCS_tests_os_interface_windows
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm_kmdaf_listener_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager_tests.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_mapper_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_memory_manager_allocate_in_device_pool_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}wddm_mapper_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}wddm_memory_manager_allocate_in_device_pool_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager_allocate_in_device_pool_tests.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_controller_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_handler_tests.cpp
diff --git a/opencl/test/unit_test/sku_info/CMakeLists.txt b/opencl/test/unit_test/sku_info/CMakeLists.txt
index 5603a3f4a1..670155270b 100644
--- a/opencl/test/unit_test/sku_info/CMakeLists.txt
+++ b/opencl/test/unit_test/sku_info/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2020 Intel Corporation
+# Copyright (C) 2018-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -7,12 +7,12 @@
 set(IGDRCL_SRCS_tests_sku_info
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/sku_info_base_reference.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/sku_info_transfer_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}sku_info_transfer_tests.cpp
 )
 
 if(WIN32)
   list(APPEND IGDRCL_SRCS_tests_sku_info
-       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/sku_info_receiver_tests.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}sku_info_receiver_tests.cpp
   )
 endif()
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_sku_info})
diff --git a/opencl/test/unit_test/utilities/CMakeLists.txt b/opencl/test/unit_test/utilities/CMakeLists.txt
index 5192b81dcb..76687f7279 100644
--- a/opencl/test/unit_test/utilities/CMakeLists.txt
+++ b/opencl/test/unit_test/utilities/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 set(IGDRCL_SRCS_tests_utilities
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/debug_file_reader_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}debug_file_reader_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/debug_file_reader_tests.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/file_logger_tests.cpp
diff --git a/opencl/test/unit_test/windows/CMakeLists.txt b/opencl/test/unit_test/windows/CMakeLists.txt
index 80e8e97727..e5ac749e5f 100644
--- a/opencl/test/unit_test/windows/CMakeLists.txt
+++ b/opencl/test/unit_test/windows/CMakeLists.txt
@@ -24,7 +24,7 @@ if(WIN32)
                  ${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
                  ${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp
                  ${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}get_devices_tests.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/wddm_create_tests.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
diff --git a/platforms.cmake b/platforms.cmake
index ff61487d36..da77f6b293 100644
--- a/platforms.cmake
+++ b/platforms.cmake
@@ -7,7 +7,7 @@
 set(MAX_GEN 64)
 
 set(ALL_GEN_TYPES "")
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake${BRANCH_DIR_SUFFIX}/fill_gens.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake${BRANCH_DIR_SUFFIX}fill_gens.cmake)
 
 set(ALL_GEN_TYPES_REVERSED ${ALL_GEN_TYPES})
 list(REVERSE ALL_GEN_TYPES_REVERSED)
@@ -205,7 +205,7 @@ INIT_LIST("PLATFORMS" "TESTED")
 INIT_PRODUCTS_LIST("TESTED")
 INIT_PRODUCTS_LIST("SUPPORTED")
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake${BRANCH_DIR_SUFFIX}/setup_platform_flags.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake${BRANCH_DIR_SUFFIX}setup_platform_flags.cmake)
 
 # Get platform lists, flag definition and set default platforms
 GET_AVAILABLE_PLATFORMS("SUPPORTED" "SUPPORT" ALL_AVAILABLE_SUPPORTED_PLATFORMS)
diff --git a/scripts/lint/CMakeLists.txt b/scripts/lint/CMakeLists.txt
index 42bf2c3d04..bffc49a657 100644
--- a/scripts/lint/CMakeLists.txt
+++ b/scripts/lint/CMakeLists.txt
@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2018-2020 Intel Corporation
+# Copyright (C) 2018-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(IS_DIRECTORY ${NEO_SOURCE_DIR}/.git)
   add_custom_target(lint
-                    ${NEO_SOURCE_DIR}/scripts/lint${BRANCH_DIR_SUFFIX}/set_copyright.sh
+                    ${NEO_SOURCE_DIR}/scripts/lint${BRANCH_DIR_SUFFIX}set_copyright.sh
                     WORKING_DIRECTORY ${NEO_SOURCE_DIR}
   )
   set_target_properties(lint PROPERTIES
@@ -15,7 +15,7 @@ if(IS_DIRECTORY ${NEO_SOURCE_DIR}/.git)
                         FOLDER ${NEO_SCRIPT_PROJECTS_FOLDER}
   )
   add_custom_target(lint_head
-                    ${NEO_SOURCE_DIR}/scripts/lint${BRANCH_DIR_SUFFIX}/set_copyright.sh HEAD
+                    ${NEO_SOURCE_DIR}/scripts/lint${BRANCH_DIR_SUFFIX}set_copyright.sh HEAD
                     WORKING_DIRECTORY ${NEO_SOURCE_DIR}
   )
   set_target_properties(lint_head PROPERTIES
diff --git a/shared/offline_compiler/source/CMakeLists.txt b/shared/offline_compiler/source/CMakeLists.txt
index c6454d2f39..36c913568f 100644
--- a/shared/offline_compiler/source/CMakeLists.txt
+++ b/shared/offline_compiler/source/CMakeLists.txt
@@ -23,8 +23,8 @@ set(CLOC_LIB_SRCS_LIB
     ${NEO_SHARED_DIRECTORY}/device_binary_format/elf/elf_encoder.cpp
     ${NEO_SHARED_DIRECTORY}/device_binary_format/elf/elf_encoder.h
     ${NEO_SHARED_DIRECTORY}/device_binary_format/elf/ocl_elf.h
-    ${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}/devices.inl
-    ${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}/devices_additional.inl
+    ${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}devices.inl
+    ${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}devices_additional.inl
     ${NEO_SHARED_DIRECTORY}/dll/devices/devices_base.inl
     ${NEO_SHARED_DIRECTORY}/helpers/abort.cpp
     ${NEO_SHARED_DIRECTORY}/helpers/compiler_options_parser.cpp
@@ -33,9 +33,9 @@ set(CLOC_LIB_SRCS_LIB
     ${NEO_SHARED_DIRECTORY}/helpers/file_io.cpp
     ${NEO_SHARED_DIRECTORY}/helpers/hw_info.cpp
     ${NEO_SHARED_DIRECTORY}/helpers/hw_info.h
-    ${NEO_SHARED_DIRECTORY}/helpers${BRANCH_DIR_SUFFIX}/hw_info_extended.cpp
-    ${NEO_SHARED_DIRECTORY}/kernel${BRANCH_DIR_SUFFIX}/kernel_descriptor.cpp
-    ${NEO_SHARED_DIRECTORY}/kernel${BRANCH_DIR_SUFFIX}/kernel_descriptor.h
+    ${NEO_SHARED_DIRECTORY}/helpers${BRANCH_DIR_SUFFIX}hw_info_extended.cpp
+    ${NEO_SHARED_DIRECTORY}/kernel${BRANCH_DIR_SUFFIX}kernel_descriptor.cpp
+    ${NEO_SHARED_DIRECTORY}/kernel${BRANCH_DIR_SUFFIX}kernel_descriptor.h
     ${NEO_SHARED_DIRECTORY}/os_interface/os_library.h
     ${NEO_SOURCE_DIR}/opencl/source/platform/extensions.cpp
     ${NEO_SOURCE_DIR}/opencl/source/platform/extensions.h
@@ -47,7 +47,7 @@ set(CLOC_LIB_SRCS_LIB
     ${OCLOC_DIRECTORY}/source/decoder/helper.h
     ${OCLOC_DIRECTORY}/source/decoder/iga_wrapper.h
     ${OCLOC_DIRECTORY}/source/decoder/translate_platform_base.h
-    ${OCLOC_DIRECTORY}/source${BRANCH_DIR_SUFFIX}/extra_settings.cpp
+    ${OCLOC_DIRECTORY}/source${BRANCH_DIR_SUFFIX}extra_settings.cpp
     ${OCLOC_DIRECTORY}/source/multi_command.cpp
     ${OCLOC_DIRECTORY}/source/multi_command.h
     ${OCLOC_DIRECTORY}/source/ocloc_api.cpp
@@ -73,7 +73,7 @@ set(CLOC_LIB_SRCS_LIB
 if(${IGA_HEADERS_AVAILABLE})
   set(CLOC_LIB_SRCS_LIB ${CLOC_LIB_SRCS_LIB}
       ${OCLOC_DIRECTORY}/source/decoder/iga_wrapper.cpp
-      ${OCLOC_DIRECTORY}/source/decoder${BRANCH_DIR_SUFFIX}/translate_platform.cpp
+      ${OCLOC_DIRECTORY}/source/decoder${BRANCH_DIR_SUFFIX}translate_platform.cpp
   )
 else()
   set(CLOC_LIB_SRCS_LIB ${CLOC_LIB_SRCS_LIB}
diff --git a/shared/source/ail/CMakeLists.txt b/shared/source/ail/CMakeLists.txt
index 43fc8487a1..f1e10a19b8 100644
--- a/shared/source/ail/CMakeLists.txt
+++ b/shared/source/ail/CMakeLists.txt
@@ -7,7 +7,7 @@
 set(NEO_CORE_AIL
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/ail_configuration.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/${BRANCH_DIR_SUFFIX}/ail_configuration.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}ail_configuration.cpp
 )
 
 set_property(GLOBAL PROPERTY NEO_CORE_AIL ${NEO_CORE_AIL})
diff --git a/shared/source/aub/CMakeLists.txt b/shared/source/aub/CMakeLists.txt
index 2d65b7b571..a017434c2a 100644
--- a/shared/source/aub/CMakeLists.txt
+++ b/shared/source/aub/CMakeLists.txt
@@ -13,7 +13,7 @@ set(NEO_CORE_AUB
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_helper_add_mmio.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_helper_base.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_helper_bdw_and_later.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/aub_helper_extra.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}aub_helper_extra.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_mapper_base.h
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_stream_provider.h
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_subcapture.cpp
diff --git a/shared/source/aub_mem_dump/CMakeLists.txt b/shared/source/aub_mem_dump/CMakeLists.txt
index aae202535a..e9140ecad3 100644
--- a/shared/source/aub_mem_dump/CMakeLists.txt
+++ b/shared/source/aub_mem_dump/CMakeLists.txt
@@ -12,7 +12,7 @@ set(NEO_CORE_AUB_MEM_DUMP
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_header.h
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_mem_dump.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_mem_dump.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/context_flags.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}context_flags.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/page_table_entry_bits.h
 )
 
diff --git a/shared/source/built_ins/builtinops/CMakeLists.txt b/shared/source/built_ins/builtinops/CMakeLists.txt
index da835f921c..51c17e7296 100644
--- a/shared/source/built_ins/builtinops/CMakeLists.txt
+++ b/shared/source/built_ins/builtinops/CMakeLists.txt
@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(NEO_CORE_SRCS_BUILT_INS_OPS
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/built_in_ops.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}built_in_ops.h
 )
 add_subdirectories()
 
diff --git a/shared/source/command_stream/CMakeLists.txt b/shared/source/command_stream/CMakeLists.txt
index 6ca0fb23ba..8e291ca053 100644
--- a/shared/source/command_stream/CMakeLists.txt
+++ b/shared/source/command_stream/CMakeLists.txt
@@ -19,8 +19,8 @@ set(NEO_CORE_COMMAND_STREAM
     ${CMAKE_CURRENT_SOURCE_DIR}/csr_deps.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/csr_deps.h
     ${CMAKE_CURRENT_SOURCE_DIR}/csr_properties_flags.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/command_stream_receiver_hw_ext.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/stream_properties.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}command_stream_receiver_hw_ext.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}stream_properties.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.h
     ${CMAKE_CURRENT_SOURCE_DIR}/experimental_command_buffer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/experimental_command_buffer.h
@@ -35,7 +35,7 @@ set(NEO_CORE_COMMAND_STREAM
     ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controller.h
     ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controller_base.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controller_base.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/stream_properties.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}stream_properties.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/stream_properties.h
     ${CMAKE_CURRENT_SOURCE_DIR}/stream_property.h
     ${CMAKE_CURRENT_SOURCE_DIR}/submissions_aggregator.cpp
diff --git a/shared/source/compiler_interface/CMakeLists.txt b/shared/source/compiler_interface/CMakeLists.txt
index 823a937743..1245cd8cf9 100644
--- a/shared/source/compiler_interface/CMakeLists.txt
+++ b/shared/source/compiler_interface/CMakeLists.txt
@@ -13,14 +13,14 @@ set(NEO_COMPILER_INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/compiler_interface.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/create_main.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/default_cache_config.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/compiler_extra_settings.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}compiler_extra_settings.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/intermediate_representations.h
     ${CMAKE_CURRENT_SOURCE_DIR}/linker.h
     ${CMAKE_CURRENT_SOURCE_DIR}/linker.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/linker.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/compiler_options/compiler_options_base.h
     ${CMAKE_CURRENT_SOURCE_DIR}/compiler_options/compiler_options_base.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_options${BRANCH_DIR_SUFFIX}/compiler_options.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_options${BRANCH_DIR_SUFFIX}compiler_options.h
 )
 
 set_property(GLOBAL PROPERTY NEO_COMPILER_INTERFACE ${NEO_COMPILER_INTERFACE})
diff --git a/shared/source/debug_settings/CMakeLists.txt b/shared/source/debug_settings/CMakeLists.txt
index 056431a6ae..3fd6953fe1 100644
--- a/shared/source/debug_settings/CMakeLists.txt
+++ b/shared/source/debug_settings/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019-2020 Intel Corporation
+# Copyright (C) 2019-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -11,8 +11,8 @@ set(NEO_CORE_DEBUG_SETTINGS
     ${CMAKE_CURRENT_SOURCE_DIR}/debug_variables_base.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/debug_variables_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/release_variables.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/debug_variables.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/translate_debug_settings.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}debug_variables.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}translate_debug_settings.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/definitions/translate_debug_settings.h
 )
 
diff --git a/shared/source/gen12lp/CMakeLists.txt b/shared/source/gen12lp/CMakeLists.txt
index bef8095ced..60ec3f93ec 100644
--- a/shared/source/gen12lp/CMakeLists.txt
+++ b/shared/source/gen12lp/CMakeLists.txt
@@ -6,12 +6,12 @@
 
 if(SUPPORT_DG1)
   set(SHARED_SRCS_ADDITIONAL_FILES_GEN12LP
-      ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/helpers_gen12lp_dg1.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}helpers_gen12lp_dg1.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/helpers_gen12lp.h
   )
 else()
   set(SHARED_SRCS_ADDITIONAL_FILES_GEN12LP
-      ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/helpers_gen12lp.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}helpers_gen12lp.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/helpers_gen12lp.h
   )
 endif()
@@ -21,7 +21,7 @@ set_property(GLOBAL PROPERTY SHARED_SRCS_ADDITIONAL_FILES_GEN12LP ${SHARED_SRCS_
 if(SUPPORT_ADLP)
   set(HW_DEFINITIONS_ADLP
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-      ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/hw_cmds_adlp.inl
+      ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}hw_cmds_adlp.inl
   )
   set_property(GLOBAL APPEND PROPERTY CORE_SRCS_GENX_ALL_BASE ${HW_DEFINITIONS_ADLP})
 endif()
diff --git a/shared/source/gen_common/CMakeLists.txt b/shared/source/gen_common/CMakeLists.txt
index 580e829ad1..7cd271e46a 100644
--- a/shared/source/gen_common/CMakeLists.txt
+++ b/shared/source/gen_common/CMakeLists.txt
@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(NEO_CORE_GEN_COMMON
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/aub_mapper.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/reg_configs_common.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}aub_mapper.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}reg_configs_common.h
 )
 
 set_property(GLOBAL PROPERTY NEO_CORE_GEN_COMMON ${NEO_CORE_GEN_COMMON})
diff --git a/shared/source/gmm_helper/CMakeLists.txt b/shared/source/gmm_helper/CMakeLists.txt
index 5dbbb03bff..52aba1dc38 100644
--- a/shared/source/gmm_helper/CMakeLists.txt
+++ b/shared/source/gmm_helper/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 set(NEO_CORE_GMM_HELPER
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/resource_info_${DRIVER_MODEL}.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}resource_info_${DRIVER_MODEL}.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/client_context/gmm_client_context.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/client_context/gmm_client_context.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gmm.cpp
@@ -15,7 +15,7 @@ set(NEO_CORE_GMM_HELPER
     ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gmm_interface.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gmm_lib.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/gmm_utils.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}gmm_utils.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/page_table_mngr.h
     ${CMAKE_CURRENT_SOURCE_DIR}/page_table_mngr_impl.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/resource_info.h
@@ -23,7 +23,7 @@ set(NEO_CORE_GMM_HELPER
 )
 
 set(NEO_CORE_GMM_HELPER_WINDOWS
-    ${CMAKE_CURRENT_SOURCE_DIR}/windows/gmm_memory${BRANCH_DIR_SUFFIX}/gmm_memory.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/windows/gmm_memory${BRANCH_DIR_SUFFIX}gmm_memory.h
     ${CMAKE_CURRENT_SOURCE_DIR}/windows/gmm_memory_base.h
     ${CMAKE_CURRENT_SOURCE_DIR}/windows/gmm_memory_base.cpp
 )
diff --git a/shared/source/helpers/CMakeLists.txt b/shared/source/helpers/CMakeLists.txt
index c285df8ea7..f440235ed5 100644
--- a/shared/source/helpers/CMakeLists.txt
+++ b/shared/source/helpers/CMakeLists.txt
@@ -38,7 +38,7 @@ set(NEO_CORE_HELPERS
     ${CMAKE_CURRENT_SOURCE_DIR}/dirty_state_helpers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/engine_control.h
     ${CMAKE_CURRENT_SOURCE_DIR}/engine_node_helper.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/engine_node_helper_extra.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}engine_node_helper_extra.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/engine_node_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/extendable_enum.h
     ${CMAKE_CURRENT_SOURCE_DIR}/file_io.cpp
@@ -60,11 +60,11 @@ set(NEO_CORE_HELPERS
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_base.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_bdw_and_later.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_bdw_to_icllp.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/hw_helper_extended.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}hw_helper_extended.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tgllp_and_later.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_info.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_info.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/hw_info_extended.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}hw_info_extended.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/interlocked_max.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_helpers.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_helpers.h
@@ -87,7 +87,7 @@ set(NEO_CORE_HELPERS
     ${CMAKE_CURRENT_SOURCE_DIR}/preprocessor.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ptr_math.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ray_tracing_helper.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/ray_tracing_helper.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}ray_tracing_helper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/register_offsets.h
     ${CMAKE_CURRENT_SOURCE_DIR}/registered_method_dispatcher.h
     ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper.h
@@ -109,12 +109,12 @@ set(NEO_CORE_HELPERS
     ${CMAKE_CURRENT_SOURCE_DIR}/uint16_avx2.h
     ${CMAKE_CURRENT_SOURCE_DIR}/uint16_sse4.h
     ${CMAKE_CURRENT_SOURCE_DIR}/vec.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions/${BRANCH_DIR_SUFFIX}/hw_cmds.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions/${BRANCH_DIR_SUFFIX}/engine_group_types.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}hw_cmds.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}engine_group_types.h
     ${CMAKE_CURRENT_SOURCE_DIR}/definitions/mi_flush_args.h
     ${CMAKE_CURRENT_SOURCE_DIR}/definitions/pipe_control_args_base.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/pipe_control_args.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/${BRANCH_DIR_SUFFIX}/pipe_control_args.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}pipe_control_args.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}pipe_control_args.cpp
 )
 
 if(SUPPORT_XEHP_AND_LATER)
diff --git a/shared/source/kernel/CMakeLists.txt b/shared/source/kernel/CMakeLists.txt
index 9ac59f72c1..91d39bf65f 100644
--- a/shared/source/kernel/CMakeLists.txt
+++ b/shared/source/kernel/CMakeLists.txt
@@ -14,13 +14,13 @@ set(NEO_CORE_KERNEL
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_arg_descriptor_extended_device_side_enqueue.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_arg_descriptor_extended_vme.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_arg_metadata.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/kernel_descriptor.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}kernel_descriptor.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_descriptor.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_descriptor_from_patchtokens.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_descriptor_from_patchtokens.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_properties.h
     ${CMAKE_CURRENT_SOURCE_DIR}/read_extended_info.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/read_extended_info.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}read_extended_info.cpp
 )
 
 set_property(GLOBAL PROPERTY NEO_CORE_KERNEL ${NEO_CORE_KERNEL})
diff --git a/shared/source/memory_manager/CMakeLists.txt b/shared/source/memory_manager/CMakeLists.txt
index 1911ebded6..47411c157d 100644
--- a/shared/source/memory_manager/CMakeLists.txt
+++ b/shared/source/memory_manager/CMakeLists.txt
@@ -23,7 +23,7 @@ set(NEO_CORE_MEMORY_MANAGER
     ${CMAKE_CURRENT_SOURCE_DIR}/definitions/storage_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}/eviction_status.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gfx_partition.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/${BRANCH_DIR_SUFFIX}/gfx_partition_init_additional_range.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}gfx_partition_init_additional_range.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/gfx_partition.h
     ${CMAKE_CURRENT_SOURCE_DIR}/graphics_allocation.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/graphics_allocation.h
diff --git a/shared/source/memory_properties/CMakeLists.txt b/shared/source/memory_properties/CMakeLists.txt
index 8ea9f30c36..d85f392997 100644
--- a/shared/source/memory_properties/CMakeLists.txt
+++ b/shared/source/memory_properties/CMakeLists.txt
@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2019-2020 Intel Corporation
+# Copyright (C) 2019-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(NEO_CORE_MEMORY_PROPERTIES
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/memory_properties_flags.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}memory_properties_flags.h
     ${CMAKE_CURRENT_SOURCE_DIR}/memory_properties_flags_common.inl
 )
 
diff --git a/shared/source/os_interface/linux/CMakeLists.txt b/shared/source/os_interface/linux/CMakeLists.txt
index 5fd4357bc9..accb67666e 100644
--- a/shared/source/os_interface/linux/CMakeLists.txt
+++ b/shared/source/os_interface/linux/CMakeLists.txt
@@ -8,23 +8,23 @@ set(NEO_CORE_OS_INTERFACE_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/allocator_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/cache_info.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/cache_info_impl.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}cache_info_impl.h
     ${CMAKE_CURRENT_SOURCE_DIR}/device_time_drm.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/device_time_drm.h
     ${CMAKE_CURRENT_SOURCE_DIR}/driver_info_linux.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/driver_info_linux.h
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_allocation.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_allocation.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_allocation_extended.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_allocation_extended.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_buffer_object.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_buffer_object.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_buffer_object_extended.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_debug.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_buffer_object_extended.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_debug.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_gem_close_worker.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_gem_close_worker.h
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_engine_mapper.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_engine_mapper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_engine_mapper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_neo.h
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_neo.cpp
@@ -34,15 +34,15 @@ set(NEO_CORE_OS_INTERFACE_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_operations_handler_bind.h
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_operations_handler_default.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_operations_handler_default.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_memory_operations_handler_create.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_query_extended.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_memory_operations_handler_create.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_query_extended.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_drm.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_device_id.h
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_device_id_linux.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/linux_inc.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/engine_info.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/engine_info_impl.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/flags${BRANCH_DIR_SUFFIX}/drm_query_flags.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}engine_info_impl.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/flags${BRANCH_DIR_SUFFIX}drm_query_flags.h
     ${CMAKE_CURRENT_SOURCE_DIR}/memory_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}/os_context_linux.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/os_context_linux.h
@@ -66,7 +66,7 @@ set(NEO_CORE_OS_INTERFACE_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/settings_reader_create.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/sys_calls.h
     ${CMAKE_CURRENT_SOURCE_DIR}/system_info.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/system_info_impl.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}system_info_impl.h
 )
 
 if(DISABLE_WDDM_LINUX)
@@ -88,9 +88,9 @@ if(SUPPORT_DG1 AND "${BRANCH_TYPE}" STREQUAL "")
   )
 else()
   list(APPEND NEO_CORE_OS_INTERFACE_LINUX
-       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_memory_manager_allocate_in_device_pool.cpp
-       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_memory_manager_create_multi_host_allocation.cpp
-       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_query.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_memory_manager_allocate_in_device_pool.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_memory_manager_create_multi_host_allocation.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_query.cpp
   )
 endif()
 
diff --git a/shared/source/os_interface/windows/CMakeLists.txt b/shared/source/os_interface/windows/CMakeLists.txt
index fbe4f2d995..06659428f3 100644
--- a/shared/source/os_interface/windows/CMakeLists.txt
+++ b/shared/source/os_interface/windows/CMakeLists.txt
@@ -41,10 +41,10 @@ set(NEO_CORE_OS_INTERFACE_WINDOWS
 
 set(NEO_CORE_OS_INTERFACE_WDDM
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_additional_context_flags.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_allocation.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_apply_additional_map_gpu_va_fields.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_engine_mapper.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}wddm_additional_context_flags.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}wddm_allocation.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}wddm_apply_additional_map_gpu_va_fields.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}wddm_engine_mapper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/d3dkmthk_wrapper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/dxgi_wrapper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion_win.cpp
@@ -85,7 +85,7 @@ set(NEO_CORE_OS_INTERFACE_WDDM
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm_residency_logger.h
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_memory_manager_allocate_in_device_pool.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}wddm_memory_manager_allocate_in_device_pool.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm/um_km_data_translator.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm/um_km_data_translator.h
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm/create_um_km_data_translator.cpp
diff --git a/shared/source/sku_info/CMakeLists.txt b/shared/source/sku_info/CMakeLists.txt
index f89a4bbccb..33864b56c6 100644
--- a/shared/source/sku_info/CMakeLists.txt
+++ b/shared/source/sku_info/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019-2020 Intel Corporation
+# Copyright (C) 2019-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -8,13 +8,13 @@ set(NEO_CORE_SKU_INFO_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/sku_info_base.h
     ${CMAKE_CURRENT_SOURCE_DIR}/operations/sku_info_transfer.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/sku_info.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/operations${BRANCH_DIR_SUFFIX}/sku_info_transfer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}sku_info.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/operations${BRANCH_DIR_SUFFIX}sku_info_transfer.cpp
 )
 
 set(NEO_CORE_SKU_INFO_WINDOWS
     ${CMAKE_CURRENT_SOURCE_DIR}/operations/windows/sku_info_receiver.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/operations/windows${BRANCH_DIR_SUFFIX}/sku_info_receiver.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/operations/windows${BRANCH_DIR_SUFFIX}sku_info_receiver.cpp
 )
 
 set_property(GLOBAL PROPERTY NEO_CORE_SKU_INFO_BASE ${NEO_CORE_SKU_INFO_BASE})
diff --git a/shared/source/xe_hp_core/CMakeLists.txt b/shared/source/xe_hp_core/CMakeLists.txt
index 410d8ac24c..6523f6a7ca 100644
--- a/shared/source/xe_hp_core/CMakeLists.txt
+++ b/shared/source/xe_hp_core/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 set(HW_DEFINITIONS_XE_HP_CORE
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/hw_cmds_xehp.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}hw_cmds_xehp.inl
 )
 set_property(GLOBAL APPEND PROPERTY CORE_SRCS_GENX_ALL_BASE ${HW_DEFINITIONS_XE_HP_CORE})
 
diff --git a/shared/test/common/helpers/CMakeLists.txt b/shared/test/common/helpers/CMakeLists.txt
index 8e800c2c0c..b8ea7e1ab2 100644
--- a/shared/test/common/helpers/CMakeLists.txt
+++ b/shared/test/common/helpers/CMakeLists.txt
@@ -18,7 +18,7 @@ set(NEO_CORE_HELPERS_TESTS
     ${CMAKE_CURRENT_SOURCE_DIR}/engine_descriptor_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/engine_node_helper_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/file_io_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/hw_helper_extended_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}hw_helper_extended_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/hash_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_helpers_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/memory_leak_listener.h
@@ -27,7 +27,7 @@ set(NEO_CORE_HELPERS_TESTS
     ${CMAKE_CURRENT_SOURCE_DIR}/string_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/string_to_hash_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_traits.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/includes${BRANCH_DIR_SUFFIX}/test_traits_common.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes${BRANCH_DIR_SUFFIX}test_traits_common.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ult_hw_config.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ult_hw_config.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/ult_hw_helper.h
diff --git a/shared/test/common/mocks/CMakeLists.txt b/shared/test/common/mocks/CMakeLists.txt
index dfc536fc3b..c2a8cf1d03 100644
--- a/shared/test/common/mocks/CMakeLists.txt
+++ b/shared/test/common/mocks/CMakeLists.txt
@@ -59,8 +59,8 @@ set(NEO_CORE_tests_mocks
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_stream.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ult_device_factory.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ult_device_factory.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_gmm_client_context.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_gmm_client_context.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}mock_gmm_client_context.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}mock_gmm_client_context.h
 )
 
 if(WIN32)
diff --git a/shared/test/common/test_macros/CMakeLists.txt b/shared/test/common/test_macros/CMakeLists.txt
index 19ca80eaa6..5f9c50db60 100644
--- a/shared/test/common/test_macros/CMakeLists.txt
+++ b/shared/test/common/test_macros/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 set(NEO_CORE_test_macros
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/header${BRANCH_DIR_SUFFIX}/test.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/header${BRANCH_DIR_SUFFIX}test.h
     ${CMAKE_CURRENT_SOURCE_DIR}/matchers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/test_checks_shared.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_checks_shared.h
diff --git a/shared/test/unit_test/command_stream/CMakeLists.txt b/shared/test/unit_test/command_stream/CMakeLists.txt
index 21d1531196..fb7d58e41d 100644
--- a/shared/test/unit_test/command_stream/CMakeLists.txt
+++ b/shared/test/unit_test/command_stream/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 target_sources(${TARGET_NAME} PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/stream_properties_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}stream_properties_tests.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/stream_properties_tests_common.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/stream_properties_tests_common.h
 )
diff --git a/shared/test/unit_test/memory_manager/CMakeLists.txt b/shared/test/unit_test/memory_manager/CMakeLists.txt
index 4149690859..a9ec5a16bc 100644
--- a/shared/test/unit_test/memory_manager/CMakeLists.txt
+++ b/shared/test/unit_test/memory_manager/CMakeLists.txt
@@ -10,7 +10,7 @@ target_sources(${TARGET_NAME} PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/alignment_selector_tests.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_allocation_deletion_tests.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_mt_tests.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/${BRANCH_DIR_SUFFIX}/gfx_partition_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}gfx_partition_tests.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/gfx_partition_tests.inl
                ${CMAKE_CURRENT_SOURCE_DIR}/graphics_allocation_tests.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/local_memory_usage_tests.cpp
diff --git a/shared/test/unit_test/os_interface/linux/CMakeLists.txt b/shared/test/unit_test/os_interface/linux/CMakeLists.txt
index 866ebf07dc..2780963429 100644
--- a/shared/test/unit_test/os_interface/linux/CMakeLists.txt
+++ b/shared/test/unit_test/os_interface/linux/CMakeLists.txt
@@ -7,7 +7,7 @@
 set(NEO_CORE_OS_INTERFACE_TESTS_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/app_resource_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_query_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_query_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_special_heap_test.cpp
 )
 
diff --git a/target_unit_tests/gen12lp/adlp/CMakeLists.txt b/target_unit_tests/gen12lp/adlp/CMakeLists.txt
index e9bec2fb95..85c5d1f85e 100644
--- a/target_unit_tests/gen12lp/adlp/CMakeLists.txt
+++ b/target_unit_tests/gen12lp/adlp/CMakeLists.txt
@@ -5,6 +5,6 @@
 #
 
 if(TESTS_ADLP)
-  include(${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/enable_adlp_testing.cmake)
+  include(${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}enable_adlp_testing.cmake)
 endif()
 
diff --git a/target_unit_tests/xe_hp_core/xe_hp_sdv/CMakeLists.txt b/target_unit_tests/xe_hp_core/xe_hp_sdv/CMakeLists.txt
index a8a6b5a3d5..8b8c4b91c8 100644
--- a/target_unit_tests/xe_hp_core/xe_hp_sdv/CMakeLists.txt
+++ b/target_unit_tests/xe_hp_core/xe_hp_sdv/CMakeLists.txt
@@ -5,5 +5,5 @@
 #
 
 if(TESTS_XE_HP_SDV)
-  include(${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/enable_xe_hp_sdv_testing.cmake)
+  include(${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}enable_xe_hp_sdv_testing.cmake)
 endif()