Reorganize Level Zero Core API files

Change-Id: I95750b90748dd65310fa72b030ea3ab2f72d3f24
Signed-off: Jaime Arteaga <jaime.a.arteaga.molina@intel.com>

level_zero/core/source/CMakeLists.txt

@@ -7,68 +7,68 @@
 set(L0_RUNTIME_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/additional_kernel_properties.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/builtin_functions_lib.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/builtin_functions_lib_impl.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/builtin_functions_lib_impl.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_hw.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_hw.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_hw_base.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_imp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_imp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_hw.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_hw_immediate.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_hw_immediate.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_hw.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_hw_base.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_imp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_memory_manager.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/debug_manager.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/debugger.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/device.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/driver_handle.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/device_imp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/driver_handle_imp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/device_imp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/driver_handle_imp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/driver.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/driver_imp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/event.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/event.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/fence.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/fence.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/kernel.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/kernel_hw.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/kernel_imp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/kernel_imp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/image.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/image_hw.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/image_hw.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/image_imp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/image_imp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/memory.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/memory_operations_helper.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/module.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/module_build_log.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/module_build_log.h
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/module_extra_options.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/module_imp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/module_imp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/printf_handler.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/printf_handler.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/sampler.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/sampler_hw.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/sampler_hw.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/sampler_imp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/sampler_imp.h
+    ${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
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_hw.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_hw.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_hw_base.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_imp.cpp
+    ${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}/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}/debugger/debug_manager.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/debugger/debugger.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/device/device.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/device/device_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/device/device_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/driver/driver_handle.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/driver/driver_handle_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/driver/driver_handle_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/driver/driver.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/driver/driver.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/driver/driver_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/event/event.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/event/event.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/fence/fence.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/fence/fence.h
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_helpers${BRANCH_DIR_SUFFIX}/hw_helpers.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_extended${BRANCH_DIR_SUFFIX}/cmdlist_extended.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_extended${BRANCH_DIR_SUFFIX}/cmdqueue_extended.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/kernel/kernel.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/kernel/kernel.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/kernel/kernel_hw.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/kernel/kernel_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/kernel/kernel_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/image/image.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/image/image_hw.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/image/image_hw.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/image/image_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/image/image_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/memory/memory.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/memory/memory_operations_helper.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/memory/cpu_page_fault_memory_manager.cpp
+    ${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/module_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/module/module_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/printf_handler/printf_handler.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/printf_handler/printf_handler.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/sampler/sampler.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/sampler/sampler_hw.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/sampler/sampler_hw.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/sampler/sampler_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/sampler/sampler_imp.h
 )
 
 target_include_directories(${L0_STATIC_LIB_NAME}
@@ -104,7 +104,7 @@ if(NOT DEFINED L0_DRIVER_VERSION)
   set(L0_DRIVER_VERSION 1)
 endif()
 
-configure_file(driver_version.h.in ${CMAKE_BINARY_DIR}/driver_version_l0.h) # Put Driver version into define
+configure_file(driver/driver_version.h.in ${CMAKE_BINARY_DIR}/driver_version_l0.h) # Put Driver version into define
 
 # Make our source files visible to parent
 set_property(GLOBAL PROPERTY L0_RUNTIME_SOURCES ${L0_RUNTIME_SOURCES})

level_zero/core/source/additional_kernel_properties.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/device_imp.h"
+#include "level_zero/core/source/device/device_imp.h"
 
 namespace L0 {
 

level_zero/core/source/builtin/builtin_functions_lib_impl.cpp

@@ -5,12 +5,12 @@
  *
  */
 
-#include "level_zero/core/source/builtin_functions_lib_impl.h"
+#include "level_zero/core/source/builtin/builtin_functions_lib_impl.h"
 
 #include "shared/source/built_ins/built_ins.h"
 
-#include "level_zero/core/source/device.h"
-#include "level_zero/core/source/module.h"
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/module/module.h"
 
 namespace L0 {
 

level_zero/core/source/builtin/builtin_functions_lib_impl.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/core/source/builtin_functions_lib.h"
+#include "level_zero/core/source/builtin/builtin_functions_lib.h"
 
 namespace NEO {
 namespace EBuiltInOps {

level_zero/core/source/cmdlist/cmdlist.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/cmdlist.h"
+#include "level_zero/core/source/cmdlist/cmdlist.h"
 
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/device/device_info.h"

level_zero/core/source/cmdlist/cmdlist.h

@@ -10,9 +10,9 @@
 #include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_stream/preemption_mode.h"
 
-#include "level_zero/core/source/cmdqueue.h"
-#include "level_zero/core/source/device.h"
-#include "level_zero/core/source/kernel.h"
+#include "level_zero/core/source/cmdqueue/cmdqueue.h"
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/kernel/kernel.h"
 #include <level_zero/ze_api.h>
 #include <level_zero/zet_api.h>
 

level_zero/core/source/cmdlist/cmdlist_extended/cmdlist_extended.inl

@@ -9,7 +9,7 @@
 
 #include "shared/source/command_stream/linear_stream.h"
 
-#include "level_zero/core/source/cmdlist_hw.h"
+#include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 
 namespace L0 {
 

level_zero/core/source/cmdlist/cmdlist_hw.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "level_zero/core/source/builtin_functions_lib.h"
-#include "level_zero/core/source/cmdlist_imp.h"
+#include "level_zero/core/source/builtin/builtin_functions_lib.h"
+#include "level_zero/core/source/cmdlist/cmdlist_imp.h"
 
 #include "igfxfmid.h"
 

level_zero/core/source/cmdlist/cmdlist_hw.inl

@@ -21,11 +21,11 @@
 
 #include "opencl/source/helpers/hardware_commands_helper.h"
 
-#include "level_zero/core/source/cmdlist_hw.h"
-#include "level_zero/core/source/device_imp.h"
-#include "level_zero/core/source/event.h"
-#include "level_zero/core/source/image.h"
-#include "level_zero/core/source/module.h"
+#include "level_zero/core/source/cmdlist/cmdlist_hw.h"
+#include "level_zero/core/source/device/device_imp.h"
+#include "level_zero/core/source/event/event.h"
+#include "level_zero/core/source/image/image.h"
+#include "level_zero/core/source/module/module.h"
 
 #include <algorithm>
 

level_zero/core/source/cmdlist/cmdlist_hw_immediate.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/core/source/cmdlist_hw.h"
+#include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 
 namespace L0 {
 

level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/core/source/cmdlist_hw_immediate.h"
+#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
 
 namespace L0 {
 template <GFXCORE_FAMILY gfxCoreFamily>

level_zero/core/source/cmdlist/cmdlist_imp.cpp

@@ -5,15 +5,15 @@
  *
  */
 
-#include "level_zero/core/source/cmdlist_imp.h"
+#include "level_zero/core/source/cmdlist/cmdlist_imp.h"
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/device/device.h"
 #include "shared/source/indirect_heap/indirect_heap.h"
 
-#include "level_zero/core/source/device.h"
-#include "level_zero/core/source/device_imp.h"
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/tools/source/metrics/metric.h"
 
 #include "igfxfmid.h"

level_zero/core/source/cmdlist/cmdlist_imp.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "level_zero/core/source/cmdlist.h"
-#include "level_zero/core/source/device.h"
+#include "level_zero/core/source/cmdlist/cmdlist.h"
+#include "level_zero/core/source/device/device.h"
 
 namespace L0 {
 

level_zero/core/source/cmdqueue/cmdqueue.cpp

@@ -11,10 +11,10 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/memory_manager/memory_manager.h"
 
-#include "level_zero/core/source/cmdlist_hw.h"
-#include "level_zero/core/source/cmdqueue_imp.h"
-#include "level_zero/core/source/device.h"
-#include "level_zero/core/source/device_imp.h"
+#include "level_zero/core/source/cmdlist/cmdlist_hw.h"
+#include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/device/device_imp.h"
 
 #include "hw_helpers.h"
 #include "igfxfmid.h"

level_zero/core/source/cmdqueue/cmdqueue.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/core/source/device.h"
+#include "level_zero/core/source/device/device.h"
 #include <level_zero/ze_common.h>
 #include <level_zero/ze_fence.h>
 

level_zero/core/source/cmdqueue/cmdqueue_extended/cmdqueue_extended.inl

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/core/source/cmdqueue_hw.h"
+#include "level_zero/core/source/cmdqueue/cmdqueue_hw.h"
 
 namespace L0 {
 template <GFXCORE_FAMILY gfxCoreFamily>

level_zero/core/source/cmdqueue/cmdqueue_hw.h

@@ -13,7 +13,7 @@
 #include "shared/source/memory_manager/memory_constants.h"
 #include "shared/source/memory_manager/residency_container.h"
 
-#include "level_zero/core/source/cmdqueue_imp.h"
+#include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
 
 #include "igfxfmid.h"
 

level_zero/core/source/cmdqueue/cmdqueue_hw.inl

@@ -21,11 +21,11 @@
 #include "shared/source/os_interface/os_context.h"
 #include "shared/source/page_fault_manager/cpu_page_fault_manager.h"
 
-#include "level_zero/core/source/cmdlist.h"
-#include "level_zero/core/source/cmdlist_hw.h"
-#include "level_zero/core/source/cmdqueue_hw.h"
-#include "level_zero/core/source/device.h"
-#include "level_zero/core/source/fence.h"
+#include "level_zero/core/source/cmdlist/cmdlist.h"
+#include "level_zero/core/source/cmdlist/cmdlist_hw.h"
+#include "level_zero/core/source/cmdqueue/cmdqueue_hw.h"
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/fence/fence.h"
 #include "level_zero/tools/source/metrics/metric.h"
 
 #include <limits>

level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl

@@ -16,10 +16,10 @@
 #include "shared/source/helpers/state_base_address.h"
 #include "shared/source/os_interface/os_context.h"
 
-#include "level_zero/core/source/cmdlist.h"
-#include "level_zero/core/source/cmdqueue_hw.h"
-#include "level_zero/core/source/device.h"
-#include "level_zero/core/source/fence.h"
+#include "level_zero/core/source/cmdlist/cmdlist.h"
+#include "level_zero/core/source/cmdqueue/cmdqueue_hw.h"
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/fence/fence.h"
 #include "level_zero/tools/source/metrics/metric.h"
 
 #include <limits>

level_zero/core/source/cmdqueue/cmdqueue_imp.h

@@ -11,7 +11,7 @@
 #include "shared/source/command_stream/submissions_aggregator.h"
 #include "shared/source/memory_manager/memory_constants.h"
 
-#include "level_zero/core/source/cmdqueue.h"
+#include "level_zero/core/source/cmdqueue/cmdqueue.h"
 
 #include <vector>
 

level_zero/core/source/device/device.h

@@ -13,8 +13,8 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/os_interface.h"
 
-#include "level_zero/core/source/driver.h"
-#include "level_zero/core/source/driver_handle.h"
+#include "level_zero/core/source/driver/driver.h"
+#include "level_zero/core/source/driver/driver_handle.h"
 #include <level_zero/ze_api.h>
 #include <level_zero/zet_api.h>
 

level_zero/core/source/device/device_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/device_imp.h"
+#include "level_zero/core/source/device/device_imp.h"
 
 #include "shared/source/built_ins/sip.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
@@ -27,16 +27,16 @@
 #include "opencl/source/mem_obj/mem_obj.h"
 #include "opencl/source/program/program.h"
 
-#include "level_zero/core/source/builtin_functions_lib.h"
-#include "level_zero/core/source/cmdlist.h"
-#include "level_zero/core/source/cmdqueue.h"
-#include "level_zero/core/source/driver_handle_imp.h"
-#include "level_zero/core/source/event.h"
-#include "level_zero/core/source/image.h"
-#include "level_zero/core/source/memory_operations_helper.h"
-#include "level_zero/core/source/module.h"
-#include "level_zero/core/source/printf_handler.h"
-#include "level_zero/core/source/sampler.h"
+#include "level_zero/core/source/builtin/builtin_functions_lib.h"
+#include "level_zero/core/source/cmdlist/cmdlist.h"
+#include "level_zero/core/source/cmdqueue/cmdqueue.h"
+#include "level_zero/core/source/driver/driver_handle_imp.h"
+#include "level_zero/core/source/event/event.h"
+#include "level_zero/core/source/image/image.h"
+#include "level_zero/core/source/memory/memory_operations_helper.h"
+#include "level_zero/core/source/module/module.h"
+#include "level_zero/core/source/printf_handler/printf_handler.h"
+#include "level_zero/core/source/sampler/sampler.h"
 #include "level_zero/tools/source/metrics/metric.h"
 
 #include "hw_helpers.h"

level_zero/core/source/device/device_imp.h

@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include "level_zero/core/source/builtin_functions_lib.h"
-#include "level_zero/core/source/cmdlist.h"
-#include "level_zero/core/source/device.h"
-#include "level_zero/core/source/driver_handle.h"
+#include "level_zero/core/source/builtin/builtin_functions_lib.h"
+#include "level_zero/core/source/cmdlist/cmdlist.h"
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/tools/source/metrics/metric.h"
 #include "level_zero/tools/source/tracing/tracing.h"
 

level_zero/core/source/driver/driver.cpp

@@ -5,15 +5,15 @@
  *
  */
 
-#include "level_zero/core/source/driver.h"
+#include "level_zero/core/source/driver/driver.h"
 
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/os_interface/device_factory.h"
 
-#include "level_zero/core/source/device.h"
-#include "level_zero/core/source/driver_handle.h"
-#include "level_zero/core/source/driver_imp.h"
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/driver/driver_handle.h"
+#include "level_zero/core/source/driver/driver_imp.h"
 
 #include <memory>
 #include <thread>

level_zero/core/source/driver/driver_handle.h

@@ -9,7 +9,7 @@
 
 #include "shared/source/memory_manager/unified_memory_manager.h"
 
-#include "level_zero/core/source/device.h"
+#include "level_zero/core/source/device/device.h"
 #include <level_zero/ze_api.h>
 
 struct _ze_driver_handle_t {

level_zero/core/source/driver/driver_handle_imp.cpp

@@ -5,14 +5,14 @@
  *
  */
 
-#include "level_zero/core/source/driver_handle_imp.h"
+#include "level_zero/core/source/driver/driver_handle_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/os_library.h"
 
-#include "level_zero/core/source/device_imp.h"
+#include "level_zero/core/source/device/device_imp.h"
 
 #include "driver_version_l0.h"
 

level_zero/core/source/driver/driver_handle_imp.h

@@ -9,7 +9,7 @@
 
 #include "shared/source/os_interface/os_library.h"
 
-#include "level_zero/core/source/driver_handle.h"
+#include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/tools/source/tracing/tracing.h"
 
 namespace L0 {

level_zero/core/source/driver/driver_imp.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/core/source/driver.h"
+#include "level_zero/core/source/driver/driver.h"
 
 #include <mutex>
 

level_zero/core/source/driver/driver_version.h.in

@@ -11,4 +11,3 @@
 #define L0_DRIVER_VERSION @L0_DRIVER_VERSION@
 
 #endif /* L0_DRIVER_VERSION_H */
-

level_zero/core/source/event/event.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/event.h"
+#include "level_zero/core/source/event/event.h"
 
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/command_stream/csr_definitions.h"
@@ -19,8 +19,8 @@
 #include "shared/source/memory_manager/memory_operations_handler.h"
 #include "shared/source/utilities/cpuintrinsics.h"
 
-#include "level_zero/core/source/device.h"
-#include "level_zero/core/source/device_imp.h"
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/tools/source/metrics/metric.h"
 
 #include <queue>

level_zero/core/source/event/event.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include "level_zero/core/source/cmdlist.h"
-#include "level_zero/core/source/device.h"
-#include "level_zero/core/source/driver_handle.h"
+#include "level_zero/core/source/cmdlist/cmdlist.h"
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/driver/driver_handle.h"
 #include <level_zero/ze_event.h>
 
 struct _ze_event_handle_t {};

level_zero/core/source/fence/fence.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/fence.h"
+#include "level_zero/core/source/fence/fence.h"
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/memory_manager/memory_constants.h"

level_zero/core/source/fence/fence.h

@@ -9,8 +9,8 @@
 
 #include "shared/source/command_stream/csr_definitions.h"
 
-#include "level_zero/core/source/cmdqueue.h"
-#include "level_zero/core/source/cmdqueue_imp.h"
+#include "level_zero/core/source/cmdqueue/cmdqueue.h"
+#include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
 #include <level_zero/ze_fence.h>
 
 #include <limits>

level_zero/core/source/gen11/icllp/cmdlist_icllp.cpp

@@ -8,9 +8,9 @@
 #include "shared/source/gen11/hw_cmds.h"
 #include "shared/source/gen11/hw_info.h"
 
-#include "level_zero/core/source/cmdlist_hw.inl"
-#include "level_zero/core/source/cmdlist_hw_base.inl"
-#include "level_zero/core/source/cmdlist_hw_immediate.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl"
 #include "level_zero/core/source/gen11/cmdlist_gen11.inl"
 
 #include "cmdlist_extended.inl"

level_zero/core/source/gen11/icllp/cmdqueue_icllp.cpp

@@ -8,8 +8,8 @@
 #include "shared/source/gen11/hw_cmds.h"
 #include "shared/source/gen11/hw_info.h"
 
-#include "level_zero/core/source/cmdqueue_hw.inl"
-#include "level_zero/core/source/cmdqueue_hw_base.inl"
+#include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl"
+#include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl"
 
 #include "cmdqueue_extended.inl"
 #include "igfxfmid.h"

level_zero/core/source/gen11/icllp/image_icllp.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/gen11/hw_cmds.h"
 #include "shared/source/gen11/hw_info.h"
 
-#include "level_zero/core/source/image_hw.inl"
+#include "level_zero/core/source/image/image_hw.inl"
 
 namespace L0 {
 

level_zero/core/source/gen11/icllp/kernel_icllp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/kernel_hw.h"
+#include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {
 

level_zero/core/source/gen11/icllp/sampler_icllp.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/gen11/hw_cmds.h"
 #include "shared/source/gen11/hw_info.h"
 
-#include "level_zero/core/source/sampler_hw.inl"
+#include "level_zero/core/source/sampler/sampler_hw.inl"
 
 namespace L0 {
 

level_zero/core/source/gen12lp/cmdlist_gen12lp.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "level_zero/core/source/cmdlist_hw.h"
-#include "level_zero/core/source/cmdlist_hw_immediate.h"
+#include "level_zero/core/source/cmdlist/cmdlist_hw.h"
+#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
 
 namespace L0 {
 

level_zero/core/source/gen12lp/definitions/cache_flush_gen12lp.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/cmdlist_hw.h"
+#include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 
 namespace L0 {
 

level_zero/core/source/gen12lp/tgllp/cmdlist_tgllp.cpp

@@ -8,9 +8,9 @@
 #include "shared/source/gen12lp/hw_cmds.h"
 #include "shared/source/gen12lp/hw_info.h"
 
-#include "level_zero/core/source/cmdlist_hw.inl"
-#include "level_zero/core/source/cmdlist_hw_base.inl"
-#include "level_zero/core/source/cmdlist_hw_immediate.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl"
 #include "level_zero/core/source/gen12lp/cmdlist_gen12lp.h"
 
 #include "cache_flush_gen12lp.inl"

level_zero/core/source/gen12lp/tgllp/cmdqueue_tgllp.cpp

@@ -8,8 +8,8 @@
 #include "shared/source/gen12lp/hw_cmds.h"
 #include "shared/source/gen12lp/hw_info.h"
 
-#include "level_zero/core/source/cmdqueue_hw.inl"
-#include "level_zero/core/source/cmdqueue_hw_base.inl"
+#include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl"
+#include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl"
 
 #include "cmdqueue_extended.inl"
 #include "igfxfmid.h"

level_zero/core/source/gen12lp/tgllp/image_tgllp.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/gen12lp/hw_cmds.h"
 #include "shared/source/gen12lp/hw_info.h"
 
-#include "level_zero/core/source/image_hw.inl"
+#include "level_zero/core/source/image/image_hw.inl"
 
 namespace L0 {
 

level_zero/core/source/gen12lp/tgllp/kernel_tgllp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/kernel_hw.h"
+#include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {
 

level_zero/core/source/gen12lp/tgllp/sampler_tgllp.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/gen12lp/hw_cmds.h"
 #include "shared/source/gen12lp/hw_info.h"
 
-#include "level_zero/core/source/sampler_hw.inl"
+#include "level_zero/core/source/sampler/sampler_hw.inl"
 
 namespace L0 {
 

level_zero/core/source/gen9/cfl/cmdlist_cfl.cpp

@@ -8,9 +8,9 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/cmdlist_hw.inl"
-#include "level_zero/core/source/cmdlist_hw_base.inl"
-#include "level_zero/core/source/cmdlist_hw_immediate.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl"
 #include "level_zero/core/source/gen9/cmdlist_gen9.h"
 #include "level_zero/core/source/gen9/cmdlist_gen9.inl"
 

level_zero/core/source/gen9/cfl/cmdqueue_cfl.cpp

@@ -8,8 +8,8 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/cmdqueue_hw.inl"
-#include "level_zero/core/source/cmdqueue_hw_base.inl"
+#include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl"
+#include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl"
 
 #include "cmdqueue_extended.inl"
 #include "igfxfmid.h"

level_zero/core/source/gen9/cfl/image_cfl.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/image_hw.inl"
+#include "level_zero/core/source/image/image_hw.inl"
 
 namespace L0 {
 

level_zero/core/source/gen9/cfl/kernel_cfl.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/kernel_hw.h"
+#include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {
 

level_zero/core/source/gen9/cfl/sampler_cfl.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/sampler_hw.inl"
+#include "level_zero/core/source/sampler/sampler_hw.inl"
 
 namespace L0 {
 

level_zero/core/source/gen9/cmdlist_gen9.h

@@ -11,8 +11,8 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/cmdlist_hw.h"
-#include "level_zero/core/source/cmdlist_hw_immediate.h"
+#include "level_zero/core/source/cmdlist/cmdlist_hw.h"
+#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
 
 #include "igfxfmid.h"
 

level_zero/core/source/gen9/cmdlist_gen9.inl

@@ -10,7 +10,7 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/cmdlist_hw.h"
+#include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 
 namespace L0 {
 

level_zero/core/source/gen9/glk/cmdlist_glk.cpp

@@ -9,9 +9,9 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/cmdlist_hw.inl"
-#include "level_zero/core/source/cmdlist_hw_base.inl"
-#include "level_zero/core/source/cmdlist_hw_immediate.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl"
 #include "level_zero/core/source/gen9/cmdlist_gen9.h"
 #include "level_zero/core/source/gen9/cmdlist_gen9.inl"
 

level_zero/core/source/gen9/glk/cmdqueue_glk.cpp

@@ -8,8 +8,8 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/cmdqueue_hw.inl"
-#include "level_zero/core/source/cmdqueue_hw_base.inl"
+#include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl"
+#include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl"
 
 #include "cmdqueue_extended.inl"
 #include "igfxfmid.h"

level_zero/core/source/gen9/glk/image_glk.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/image_hw.inl"
+#include "level_zero/core/source/image/image_hw.inl"
 
 namespace L0 {
 

level_zero/core/source/gen9/glk/kernel_glk.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/kernel_hw.h"
+#include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {
 

level_zero/core/source/gen9/glk/sampler_glk.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/sampler_hw.inl"
+#include "level_zero/core/source/sampler/sampler_hw.inl"
 
 namespace L0 {
 

level_zero/core/source/gen9/kbl/cmdlist_kbl.cpp

@@ -8,9 +8,9 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/cmdlist_hw.inl"
-#include "level_zero/core/source/cmdlist_hw_base.inl"
-#include "level_zero/core/source/cmdlist_hw_immediate.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl"
 #include "level_zero/core/source/gen9/cmdlist_gen9.h"
 #include "level_zero/core/source/gen9/cmdlist_gen9.inl"
 

level_zero/core/source/gen9/kbl/cmdqueue_kbl.cpp

@@ -8,8 +8,8 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/cmdqueue_hw.inl"
-#include "level_zero/core/source/cmdqueue_hw_base.inl"
+#include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl"
+#include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl"
 
 #include "cmdqueue_extended.inl"
 #include "igfxfmid.h"

level_zero/core/source/gen9/kbl/image_kbl.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/image_hw.inl"
+#include "level_zero/core/source/image/image_hw.inl"
 
 namespace L0 {
 

level_zero/core/source/gen9/kbl/kernel_kbl.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/kernel_hw.h"
+#include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {
 

level_zero/core/source/gen9/kbl/sampler_kbl.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/sampler_hw.inl"
+#include "level_zero/core/source/sampler/sampler_hw.inl"
 
 namespace L0 {
 

level_zero/core/source/gen9/skl/cmdlist_skl.cpp

@@ -8,9 +8,9 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/cmdlist_hw.inl"
-#include "level_zero/core/source/cmdlist_hw_base.inl"
-#include "level_zero/core/source/cmdlist_hw_immediate.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl"
+#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl"
 #include "level_zero/core/source/gen9/cmdlist_gen9.h"
 #include "level_zero/core/source/gen9/cmdlist_gen9.inl"
 

level_zero/core/source/gen9/skl/cmdqueue_skl.cpp

@@ -8,8 +8,8 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/cmdqueue_hw.inl"
-#include "level_zero/core/source/cmdqueue_hw_base.inl"
+#include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl"
+#include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl"
 
 #include "cmdqueue_extended.inl"
 #include "igfxfmid.h"

level_zero/core/source/gen9/skl/image_skl.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/image_hw.inl"
+#include "level_zero/core/source/image/image_hw.inl"
 
 namespace L0 {
 

level_zero/core/source/gen9/skl/kernel_skl.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/kernel_hw.h"
+#include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {
 

level_zero/core/source/gen9/skl/sampler_skl.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
 
-#include "level_zero/core/source/sampler_hw.inl"
+#include "level_zero/core/source/sampler/sampler_hw.inl"
 
 namespace L0 {
 

level_zero/core/source/image/image.h

@@ -9,7 +9,7 @@
 
 #include "shared/source/command_container/cmdcontainer.h"
 
-#include "level_zero/core/source/device.h"
+#include "level_zero/core/source/device/device.h"
 #include <level_zero/ze_image.h>
 
 struct _ze_image_handle_t {};

level_zero/core/source/image/image_formats_append.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/core/source/image_imp.h"
+#include "level_zero/core/source/image/image_imp.h"
 
 #define GEN10PLUS_IMAGE_FORMATS()                                                 \
     {                                                                             \

level_zero/core/source/image/image_hw.h

@@ -12,8 +12,8 @@
 #include "shared/source/helpers/surface_format_info.h"
 #include "shared/source/indirect_heap/indirect_heap.h"
 
-#include "level_zero/core/source/image_formats_append.h"
-#include "level_zero/core/source/image_imp.h"
+#include "level_zero/core/source/image/image_formats_append.h"
+#include "level_zero/core/source/image/image_imp.h"
 
 namespace L0 {
 

level_zero/core/source/image/image_hw.inl

@@ -16,7 +16,7 @@
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/utilities/compiler_support.h"
 
-#include "level_zero/core/source/image_hw.h"
+#include "level_zero/core/source/image/image_hw.h"
 
 inline NEO::ImageType convertType(const ze_image_type_t type) {
     switch (type) {

level_zero/core/source/image/image_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/image_imp.h"
+#include "level_zero/core/source/image/image_imp.h"
 
 #include "shared/source/memory_manager/memory_manager.h"
 

level_zero/core/source/image/image_imp.h

@@ -9,7 +9,7 @@
 
 #include "shared/source/helpers/surface_format_info.h"
 
-#include "level_zero/core/source/image.h"
+#include "level_zero/core/source/image/image.h"
 
 namespace L0 {
 

level_zero/core/source/kernel/kernel.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/kernel.h"
+#include "level_zero/core/source/kernel/kernel.h"
 
 #include "igfxfmid.h"
 

level_zero/core/source/kernel/kernel_hw.h

@@ -10,8 +10,8 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/helpers/string.h"
 
-#include "level_zero/core/source/kernel_imp.h"
-#include "level_zero/core/source/module.h"
+#include "level_zero/core/source/kernel/kernel_imp.h"
+#include "level_zero/core/source/module/module.h"
 
 #include "igfxfmid.h"
 

level_zero/core/source/kernel/kernel_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/kernel_imp.h"
+#include "level_zero/core/source/kernel/kernel_imp.h"
 
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/hw_helper.h"
@@ -19,12 +19,12 @@
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/program/kernel_info.h"
 
-#include "level_zero/core/source/device.h"
-#include "level_zero/core/source/image.h"
-#include "level_zero/core/source/module.h"
-#include "level_zero/core/source/module_imp.h"
-#include "level_zero/core/source/printf_handler.h"
-#include "level_zero/core/source/sampler.h"
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/image/image.h"
+#include "level_zero/core/source/module/module.h"
+#include "level_zero/core/source/module/module_imp.h"
+#include "level_zero/core/source/printf_handler/printf_handler.h"
+#include "level_zero/core/source/sampler/sampler.h"
 
 #include <memory>
 

level_zero/core/source/kernel/kernel_imp.h

@@ -10,7 +10,7 @@
 #include "shared/source/kernel/dispatch_kernel_encoder_interface.h"
 #include "shared/source/unified_memory/unified_memory.h"
 
-#include "level_zero/core/source/kernel.h"
+#include "level_zero/core/source/kernel/kernel.h"
 
 #include <memory>
 

level_zero/core/source/memory/cpu_page_fault_memory_manager.cpp

@@ -7,10 +7,10 @@
 
 #include "shared/source/page_fault_manager/cpu_page_fault_manager.h"
 
-#include "level_zero/core/source/cmdlist.h"
-#include "level_zero/core/source/device.h"
-#include "level_zero/core/source/device_imp.h"
-#include "level_zero/core/source/driver_handle_imp.h"
+#include "level_zero/core/source/cmdlist/cmdlist.h"
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/device/device_imp.h"
+#include "level_zero/core/source/driver/driver_handle_imp.h"
 
 namespace NEO {
 void PageFaultManager::transferToCpu(void *ptr, size_t size, void *device) {

level_zero/core/source/memory/memory.cpp

@@ -8,8 +8,8 @@
 #include "shared/source/helpers/string.h"
 #include "shared/source/memory_manager/memory_manager.h"
 
-#include "level_zero/core/source/device.h"
-#include "level_zero/core/source/driver_handle_imp.h"
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/driver/driver_handle_imp.h"
 
 namespace L0 {
 

level_zero/core/source/module/module.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include "level_zero/core/source/cmdlist.h"
-#include "level_zero/core/source/kernel.h"
-#include "level_zero/core/source/module_build_log.h"
+#include "level_zero/core/source/cmdlist/cmdlist.h"
+#include "level_zero/core/source/kernel/kernel.h"
+#include "level_zero/core/source/module/module_build_log.h"
 #include <level_zero/ze_api.h>
 
 #include <vector>

level_zero/core/source/module/module_build_log.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/string.h"
 
-#include "level_zero/core/source/module.h"
+#include "level_zero/core/source/module/module.h"
 
 #include <memory>
 

level_zero/core/source/module/module_extra_options.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/module_imp.h"
+#include "level_zero/core/source/module/module_imp.h"
 
 namespace L0 {
 

level_zero/core/source/module/module_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/core/source/module_imp.h"
+#include "level_zero/core/source/module/module_imp.h"
 
 #include "shared/source/compiler_interface/compiler_interface.h"
 #include "shared/source/compiler_interface/intermediate_representations.h"
@@ -20,9 +20,9 @@
 
 #include "opencl/source/program/kernel_info.h"
 
-#include "level_zero/core/source/device.h"
-#include "level_zero/core/source/kernel.h"
-#include "level_zero/core/source/module_build_log.h"
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/kernel/kernel.h"
+#include "level_zero/core/source/module/module_build_log.h"
 
 #include "compiler_options.h"
 #include "program_debug_data.h"

level_zero/core/source/module/module_imp.h

@@ -10,8 +10,8 @@
 #include "shared/source/compiler_interface/linker.h"
 #include "shared/source/utilities/const_stringref.h"
 
-#include "level_zero/core/source/device.h"
-#include "level_zero/core/source/module.h"
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/module/module.h"
 
 #include "igfxfmid.h"
 

level_zero/core/source/printf_handler/printf_handler.cpp

@@ -5,13 +5,13 @@
  *
  */
 
-#include "level_zero/core/source/printf_handler.h"
+#include "level_zero/core/source/printf_handler/printf_handler.h"
 
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/program/print_formatter.h"
 
-#include "level_zero/core/source/device_imp.h"
+#include "level_zero/core/source/device/device_imp.h"
 
 namespace L0 {
 

level_zero/core/source/printf_handler/printf_handler.h

@@ -9,7 +9,7 @@
 
 #include "shared/source/memory_manager/memory_constants.h"
 
-#include "level_zero/core/source/kernel.h"
+#include "level_zero/core/source/kernel/kernel.h"
 
 #include <cstdint>
 

level_zero/core/source/sampler/sampler.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/core/source/device.h"
+#include "level_zero/core/source/device/device.h"
 #include <level_zero/ze_sampler.h>
 
 struct _ze_sampler_handle_t {};

level_zero/core/source/sampler/sampler_hw.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/core/source/sampler_imp.h"
+#include "level_zero/core/source/sampler/sampler_imp.h"
 
 namespace L0 {
 

level_zero/core/source/sampler/sampler_hw.inl

@@ -10,7 +10,7 @@
 #include "shared/source/helpers/string.h"
 #include "shared/source/utilities/numeric.h"
 
-#include "level_zero/core/source/sampler_hw.h"
+#include "level_zero/core/source/sampler/sampler_hw.h"
 
 namespace L0 {
 template <GFXCORE_FAMILY gfxCoreFamily>

level_zero/core/source/sampler/sampler_imp.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "level_zero/core/source/sampler_imp.h"
+#include "level_zero/core/source/sampler/sampler_imp.h"
 
-#include "level_zero/core/source/device.h"
+#include "level_zero/core/source/device/device.h"
 
 namespace L0 {
 

level_zero/core/source/sampler/sampler_imp.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/core/source/sampler.h"
+#include "level_zero/core/source/sampler/sampler.h"
 
 namespace L0 {