refactor: Move sysman_driver/sysman_device files to driver/device directories

Related-To: NEO-9376

Signed-off-by: Jitendra Sharma <jitendra.sharma@intel.com>

level_zero/api/sysman/zes_sysman_api_entrypoints.h

@@ -8,9 +8,9 @@
 #pragma once
 #include "level_zero/core/source/driver/driver.h"
 #include "level_zero/core/source/driver/driver_handle.h"
-#include "level_zero/sysman/source/sysman_device.h"
-#include "level_zero/sysman/source/sysman_driver.h"
-#include "level_zero/sysman/source/sysman_driver_handle.h"
+#include "level_zero/sysman/source/device/sysman_device.h"
+#include "level_zero/sysman/source/driver/sysman_driver.h"
+#include "level_zero/sysman/source/driver/sysman_driver_handle.h"
 #include "level_zero/tools/source/sysman/sysman.h"
 
 namespace L0 {

level_zero/core/source/global_teardown.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "level_zero/core/source/driver/driver_handle_imp.h"
-#include "level_zero/sysman/source/sysman_driver_handle_imp.h"
+#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h"
 
 namespace L0 {
 

level_zero/core/test/unit_tests/os_interface/global_teardown_tests.cpp

@@ -13,7 +13,7 @@
 #include "level_zero/core/source/driver/driver.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/source/global_teardown.h"
-#include "level_zero/sysman/source/sysman_driver_handle_imp.h"
+#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h"
 
 namespace L0 {
 namespace ult {

level_zero/sysman/source/CMakeLists.txt

@@ -7,19 +7,6 @@
 target_sources(${L0_STATIC_LIB_NAME}
                PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_imp.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_handle.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_handle_imp.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_handle_imp.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device_imp.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device_imp.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_hw_device_id.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_driver.h
 )
 
 add_subdirectories()

level_zero/sysman/source/api/diagnostics/sysman_diagnostics.cpp

@@ -11,7 +11,7 @@
 
 #include "level_zero/sysman/source/api/diagnostics/sysman_diagnostics_imp.h"
 #include "level_zero/sysman/source/api/diagnostics/sysman_os_diagnostics.h"
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/diagnostics/sysman_os_diagnostics.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 #include <level_zero/zes_api.h>
 
 #include <memory>

level_zero/sysman/source/api/ecc/sysman_ecc_imp.h

@@ -9,7 +9,7 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
 #include "level_zero/sysman/source/api/ecc/sysman_ecc.h"
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/engine/linux/sysman_os_engine_imp.h

@@ -10,7 +10,7 @@
 #include "shared/source/os_interface/linux/drm_neo.h"
 
 #include "level_zero/sysman/source/api/engine/sysman_os_engine.h"
-#include "level_zero/sysman/source/sysman_device_imp.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 
 #include <unistd.h>
 

level_zero/sysman/source/api/engine/sysman_engine.cpp

@@ -10,8 +10,8 @@
 #include "shared/source/helpers/basic_math.h"
 
 #include "level_zero/sysman/source/api/engine/sysman_engine_imp.h"
-#include "level_zero/sysman/source/os_sysman.h"
-#include "level_zero/sysman/source/sysman_device_imp.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/engine/sysman_engine.h

@@ -7,7 +7,7 @@
 
 #pragma once
 #include "level_zero/api/sysman/zes_handles_struct.h"
-#include "level_zero/sysman/source/sysman_device.h"
+#include "level_zero/sysman/source/device/sysman_device.h"
 #include <level_zero/zes_api.h>
 
 #include <map>

level_zero/sysman/source/api/events/linux/sysman_os_events_imp.cpp

@@ -12,9 +12,9 @@
 
 #include "level_zero/sysman/source/api/events/sysman_events_imp.h"
 #include "level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp_prelim.h"
+#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h"
 #include "level_zero/sysman/source/linux/zes_os_sysman_driver_imp.h"
 #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
-#include "level_zero/sysman/source/sysman_driver_handle_imp.h"
 
 #include <sys/stat.h>
 

level_zero/sysman/source/api/events/sysman_os_events.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 #include <level_zero/zes_api.h>
 
 namespace L0 {

level_zero/sysman/source/api/fabric_port/sysman_os_fabric_port.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 #include <level_zero/zes_api.h>
 
 namespace L0 {

level_zero/sysman/source/api/firmware/sysman_os_firmware.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 #include <level_zero/zes_api.h>
 
 #include <memory>

level_zero/sysman/source/api/frequency/sysman_frequency.cpp

@@ -11,7 +11,7 @@
 
 #include "level_zero/sysman/source/api/frequency/sysman_frequency_imp.h"
 #include "level_zero/sysman/source/api/frequency/sysman_os_frequency.h"
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/frequency/sysman_frequency_imp.cpp

@@ -9,7 +9,7 @@
 
 #include "shared/source/helpers/debug_helpers.h"
 
-#include "level_zero/sysman/source/sysman_device_imp.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 
 #include <algorithm>
 #include <cmath>

level_zero/sysman/source/api/frequency/sysman_os_frequency.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/global_operations/sysman_os_global_operations.h

@@ -11,7 +11,7 @@
 #include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/product_helper.h"
 
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 #include <level_zero/zes_api.h>
 
 #include <array>

level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp_prelim.h

@@ -10,9 +10,9 @@
 #include "shared/source/os_interface/linux/drm_neo.h"
 
 #include "level_zero/sysman/source/api/memory/sysman_os_memory.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 #include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
 #include "level_zero/sysman/source/linux/sysman_fs_access.h"
-#include "level_zero/sysman/source/sysman_device_imp.h"
 
 #include <map>
 

level_zero/sysman/source/api/memory/sysman_memory.cpp

@@ -9,7 +9,7 @@
 #include "shared/source/memory_manager/memory_manager.h"
 
 #include "level_zero/sysman/source/api/memory/sysman_memory_imp.h"
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/performance/sysman_os_performance.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 #include <level_zero/zes_api.h>
 
 namespace L0 {

level_zero/sysman/source/api/performance/sysman_performance.cpp

@@ -8,7 +8,7 @@
 #include "level_zero/sysman/source/api/performance/sysman_performance.h"
 
 #include "level_zero/sysman/source/api/performance/sysman_performance_imp.h"
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 
 #include <algorithm>
 

level_zero/sysman/source/api/performance/sysman_performance_imp.cpp

@@ -9,7 +9,7 @@
 
 #include "shared/source/helpers/debug_helpers.h"
 
-#include "level_zero/sysman/source/sysman_device_imp.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/power/sysman_power.cpp

@@ -10,7 +10,7 @@
 #include "shared/source/helpers/basic_math.h"
 
 #include "level_zero/sysman/source/api/power/sysman_power_imp.h"
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/power/sysman_power_imp.cpp

@@ -10,7 +10,7 @@
 #include "shared/source/helpers/debug_helpers.h"
 
 #include "level_zero/sysman/source/api/power/sysman_os_power.h"
-#include "level_zero/sysman/source/sysman_device_imp.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/ras/linux/sysman_os_ras_imp_prelim.h

@@ -9,10 +9,10 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
 #include "level_zero/sysman/source/api/ras/sysman_os_ras.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 #include "level_zero/sysman/source/linux/pmu/sysman_pmu_imp.h"
 #include "level_zero/sysman/source/linux/sysman_fs_access.h"
 #include "level_zero/sysman/source/sysman_const.h"
-#include "level_zero/sysman/source/sysman_device_imp.h"
 
 #include <map>
 #include <memory>

level_zero/sysman/source/api/ras/sysman_ras.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/helpers/basic_math.h"
 
 #include "level_zero/sysman/source/api/ras/sysman_ras_imp.h"
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/ras/sysman_ras.h

@@ -7,7 +7,7 @@
 
 #pragma once
 #include "level_zero/api/sysman/zes_handles_struct.h"
-#include "level_zero/sysman/source/sysman_device.h"
+#include "level_zero/sysman/source/device/sysman_device.h"
 #include <level_zero/zes_api.h>
 
 #include <mutex>

level_zero/sysman/source/api/scheduler/sysman_scheduler.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "level_zero/sysman/source/api/scheduler/sysman_scheduler_imp.h"
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 
 #include <algorithm>
 

level_zero/sysman/source/api/scheduler/sysman_scheduler_imp.cpp

@@ -9,8 +9,8 @@
 
 #include "shared/source/helpers/debug_helpers.h"
 
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 #include "level_zero/sysman/source/sysman_const.h"
-#include "level_zero/sysman/source/sysman_device_imp.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/standby/sysman_os_standby.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 #include <level_zero/zes_api.h>
 
 #include <memory>

level_zero/sysman/source/api/standby/sysman_standby_imp.cpp

@@ -9,7 +9,7 @@
 
 #include "shared/source/helpers/debug_helpers.h"
 
-#include "level_zero/sysman/source/sysman_device_imp.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/temperature/sysman_temperature.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/helpers/basic_math.h"
 
 #include "level_zero/sysman/source/api/temperature/sysman_temperature_imp.h"
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/temperature/sysman_temperature_imp.cpp

@@ -7,7 +7,7 @@
 
 #include "level_zero/sysman/source/api/temperature/sysman_temperature_imp.h"
 
-#include "level_zero/sysman/source/sysman_device_imp.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/device/CMakeLists.txt

@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2023 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+target_sources(${L0_STATIC_LIB_NAME}
+               PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device_imp.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device_imp.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_hw_device_id.h
+)
+
+add_subdirectories()

level_zero/sysman/source/device/sysman_device.cpp

@@ -7,7 +7,7 @@
 
 #include "shared/source/execution_environment/execution_environment.h"
 
-#include "level_zero/sysman/source/sysman_device_imp.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 
 #include <cstring>
 #include <vector>

level_zero/sysman/source/device/sysman_device_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/sysman_device_imp.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 
@@ -14,7 +14,7 @@
 #include "level_zero/sysman/source/api/fan/sysman_fan_imp.h"
 #include "level_zero/sysman/source/api/global_operations/sysman_global_operations_imp.h"
 #include "level_zero/sysman/source/api/pci/sysman_pci_imp.h"
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
 
 #include <vector>
 

level_zero/sysman/source/device/sysman_device_imp.h

@@ -11,7 +11,7 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/sysman_device.h"
+#include "level_zero/sysman/source/device/sysman_device.h"
 
 #include <unordered_map>
 

level_zero/sysman/source/driver/CMakeLists.txt

@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2023 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+target_sources(${L0_STATIC_LIB_NAME}
+               PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_imp.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_handle.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_handle_imp.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_handle_imp.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_driver.h
+)
+
+add_subdirectories()

level_zero/sysman/source/driver/sysman_driver.cpp

@@ -12,9 +12,9 @@
 #include "shared/source/os_interface/os_interface.h"
 
 #include "level_zero/core/source/driver/driver.h"
-#include "level_zero/sysman/source/sysman_driver_handle_imp.h"
-#include "level_zero/sysman/source/sysman_driver_imp.h"
-#include "level_zero/sysman/source/sysman_hw_device_id.h"
+#include "level_zero/sysman/source/device/sysman_hw_device_id.h"
+#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h"
+#include "level_zero/sysman/source/driver/sysman_driver_imp.h"
 
 #include <cstring>
 #include <vector>

level_zero/sysman/source/driver/sysman_driver_handle_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/sysman_driver_handle_imp.h"
+#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/execution_environment/execution_environment.h"
@@ -14,9 +14,9 @@
 #include "shared/source/os_interface/os_interface.h"
 
 #include "level_zero/core/source/get_extension_function_lookup_map.h"
-#include "level_zero/sysman/source/os_sysman_driver.h"
-#include "level_zero/sysman/source/sysman_device.h"
-#include "level_zero/sysman/source/sysman_driver.h"
+#include "level_zero/sysman/source/device/sysman_device.h"
+#include "level_zero/sysman/source/driver/os_sysman_driver.h"
+#include "level_zero/sysman/source/driver/sysman_driver.h"
 
 #include <cstring>
 #include <vector>

level_zero/sysman/source/driver/sysman_driver_handle_imp.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "level_zero/sysman/source/sysman_driver_handle.h"
+#include "level_zero/sysman/source/driver/sysman_driver_handle.h"
 
 #include <string>
 #include <unordered_map>

level_zero/sysman/source/driver/sysman_driver_imp.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "level_zero/sysman/source/sysman_driver.h"
+#include "level_zero/sysman/source/driver/sysman_driver.h"
 
 #include <mutex>
 

level_zero/sysman/source/linux/pmt/sysman_pmt.cpp

@@ -10,8 +10,8 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/os_interface/linux/file_descriptor.h"
 
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
-#include "level_zero/sysman/source/sysman_device_imp.h"
 
 #include <algorithm>
 #include <errno.h>

level_zero/sysman/source/linux/sysman_hw_device_id_linux.cpp

@@ -9,7 +9,7 @@
 
 #include "shared/source/os_interface/linux/sys_calls.h"
 
-#include "level_zero/sysman/source/sysman_hw_device_id.h"
+#include "level_zero/sysman/source/device/sysman_hw_device_id.h"
 
 #include <fcntl.h>
 

level_zero/sysman/source/linux/zes_os_sysman_driver_imp.h

@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
+#include "level_zero/sysman/source/driver/os_sysman_driver.h"
 #include "level_zero/sysman/source/linux/udev/udev_lib.h"
-#include "level_zero/sysman/source/os_sysman_driver.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/linux/zes_os_sysman_imp.h

@@ -11,10 +11,10 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 
+#include "level_zero/sysman/source/device/os_sysman.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 #include "level_zero/sysman/source/linux/sysman_hw_device_id_linux.h"
-#include "level_zero/sysman/source/os_sysman.h"
 #include "level_zero/sysman/source/sysman_const.h"
-#include "level_zero/sysman/source/sysman_device_imp.h"
 
 #include <map>
 #include <mutex>

level_zero/sysman/source/windows/sysman_hw_device_id_windows.cpp

@@ -7,7 +7,7 @@
 
 #include "shared/source/os_interface/os_interface.h"
 
-#include "level_zero/sysman/source/sysman_hw_device_id.h"
+#include "level_zero/sysman/source/device/sysman_hw_device_id.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/windows/zes_os_sysman_driver_imp.cpp

@@ -10,9 +10,9 @@
 #include "shared/source/helpers/sleep.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
-#include "level_zero/sysman/source/os_sysman.h"
+#include "level_zero/sysman/source/device/os_sysman.h"
+#include "level_zero/sysman/source/device/sysman_device.h"
 #include "level_zero/sysman/source/sysman_const.h"
-#include "level_zero/sysman/source/sysman_device.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/windows/zes_os_sysman_driver_imp.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/os_sysman_driver.h"
+#include "level_zero/sysman/source/driver/os_sysman_driver.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/windows/zes_os_sysman_imp.h

@@ -9,10 +9,10 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
+#include "level_zero/sysman/source/device/os_sysman.h"
+#include "level_zero/sysman/source/device/sysman_device.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 #include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
-#include "level_zero/sysman/source/os_sysman.h"
-#include "level_zero/sysman/source/sysman_device.h"
-#include "level_zero/sysman/source/sysman_device_imp.h"
 #include "level_zero/sysman/source/windows/sysman_kmd_sys_manager.h"
 
 namespace NEO {

level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_driver.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/sysman_driver_imp.h"
+#include "level_zero/sysman/source/driver/sysman_driver_imp.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h

@@ -15,12 +15,12 @@
 #include "shared/test/common/test_macros/hw_test.h"
 
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
+#include "level_zero/sysman/source/device/sysman_device.h"
+#include "level_zero/sysman/source/driver/sysman_driver.h"
+#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h"
 #include "level_zero/sysman/source/linux/sysman_fs_access.h"
 #include "level_zero/sysman/source/linux/zes_os_sysman_driver_imp.h"
 #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
-#include "level_zero/sysman/source/sysman_device.h"
-#include "level_zero/sysman/source/sysman_driver.h"
-#include "level_zero/sysman/source/sysman_driver_handle_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_drm.h"
 

level_zero/sysman/test/unit_tests/sources/linux/test_sysman_driver.cpp

@@ -12,9 +12,9 @@
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h"
 
-#include "level_zero/sysman/source/sysman_device.h"
-#include "level_zero/sysman/source/sysman_driver_handle.h"
-#include "level_zero/sysman/source/sysman_driver_handle_imp.h"
+#include "level_zero/sysman/source/device/sysman_device.h"
+#include "level_zero/sysman/source/driver/sysman_driver_handle.h"
+#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_driver.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_drm.h"
 

level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 #include "level_zero/sysman/source/shared/linux/product_helper/sysman_product_helper.h"
-#include "level_zero/sysman/source/sysman_device_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 #include "level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory.h"
 

level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_dg1.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/sysman_device_imp.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 #include "level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory.h"
 

level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power.h

@@ -11,9 +11,9 @@
 
 #include "level_zero/sysman/source/api/power/linux/sysman_os_power_imp.h"
 #include "level_zero/sysman/source/api/power/sysman_power_imp.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 #include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
 #include "level_zero/sysman/source/sysman_const.h"
-#include "level_zero/sysman/source/sysman_device_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 
 namespace L0 {

level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power_prelim.h

@@ -11,9 +11,9 @@
 
 #include "level_zero/sysman/source/api/power/linux/sysman_os_power_imp_prelim.h"
 #include "level_zero/sysman/source/api/power/sysman_power_imp.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 #include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
 #include "level_zero/sysman/source/sysman_const.h"
-#include "level_zero/sysman/source/sysman_device_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 
 namespace L0 {

level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_driver.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/sysman_driver_imp.h"
+#include "level_zero/sysman/source/driver/sysman_driver_imp.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h

@@ -9,8 +9,8 @@
 
 #include "shared/test/common/helpers/default_hw_info.h"
 
-#include "level_zero/sysman/source/sysman_driver.h"
-#include "level_zero/sysman/source/sysman_driver_handle_imp.h"
+#include "level_zero/sysman/source/driver/sysman_driver.h"
+#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h"
 #include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h"
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_wddm.h"