refactor: Move Sysman APIs to level_zero/sysman/source/api

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

level_zero/sysman/source/api/CMakeLists.txt

@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2023 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+add_subdirectories()

level_zero/sysman/source/api/diagnostics/linux/sysman_os_diagnostics_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/diagnostics/linux/sysman_os_diagnostics_imp.h"
+#include "level_zero/sysman/source/api/diagnostics/linux/sysman_os_diagnostics_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/sleep.h"

level_zero/sysman/source/api/diagnostics/linux/sysman_os_diagnostics_imp.h

@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/diagnostics/sysman_diagnostics_imp.h"
-#include "level_zero/sysman/source/diagnostics/sysman_os_diagnostics.h"
+#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/linux/sysman_fs_access.h"
 #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 

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

@@ -5,12 +5,12 @@
  *
  */
 
-#include "level_zero/sysman/source/diagnostics/sysman_diagnostics.h"
+#include "level_zero/sysman/source/api/diagnostics/sysman_diagnostics.h"
 
 #include "shared/source/helpers/basic_math.h"
 
-#include "level_zero/sysman/source/diagnostics/sysman_diagnostics_imp.h"
-#include "level_zero/sysman/source/diagnostics/sysman_os_diagnostics.h"
+#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"
 
 namespace L0 {

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

@@ -5,11 +5,11 @@
  *
  */
 
-#include "level_zero/sysman/source/diagnostics/sysman_diagnostics_imp.h"
+#include "level_zero/sysman/source/api/diagnostics/sysman_diagnostics_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 
-#include "level_zero/sysman/source/diagnostics/sysman_os_diagnostics.h"
+#include "level_zero/sysman/source/api/diagnostics/sysman_os_diagnostics.h"
 
 namespace L0 {
 namespace Sysman {

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

@@ -9,8 +9,8 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/helpers/string.h"
 
-#include "level_zero/sysman/source/diagnostics/sysman_diagnostics.h"
-#include "level_zero/sysman/source/diagnostics/sysman_os_diagnostics.h"
+#include "level_zero/sysman/source/api/diagnostics/sysman_diagnostics.h"
+#include "level_zero/sysman/source/api/diagnostics/sysman_os_diagnostics.h"
 #include <level_zero/zes_api.h>
 
 namespace L0 {

level_zero/sysman/source/api/diagnostics/windows/sysman_os_diagnostics_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/diagnostics/windows/sysman_os_diagnostics_imp.h"
+#include "level_zero/sysman/source/api/diagnostics/windows/sysman_os_diagnostics_imp.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/diagnostics/windows/sysman_os_diagnostics_imp.h

@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/diagnostics/sysman_os_diagnostics.h"
+#include "level_zero/sysman/source/api/diagnostics/sysman_os_diagnostics.h"
 #include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 
 namespace L0 {

level_zero/sysman/source/api/ecc/linux/sysman_os_ecc.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/ecc/sysman_ecc_imp.h"
+#include "level_zero/sysman/source/api/ecc/sysman_ecc_imp.h"
 #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 namespace L0 {

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

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/ecc/sysman_ecc_imp.h"
+#include "level_zero/sysman/source/api/ecc/sysman_ecc_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 

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

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

level_zero/sysman/source/api/ecc/windows/sysman_os_ecc.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/ecc/sysman_ecc_imp.h"
+#include "level_zero/sysman/source/api/ecc/sysman_ecc_imp.h"
 #include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 
 namespace L0 {

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

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/engine/linux/sysman_os_engine_imp.h"
+#include "level_zero/sysman/source/api/engine/linux/sysman_os_engine_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/os_interface/linux/engine_info.h"

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

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

level_zero/sysman/source/api/engine/linux/sysman_os_engine_imp_prelim.cpp

@@ -9,7 +9,7 @@
 #include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/i915_prelim.h"
 
-#include "level_zero/sysman/source/engine/linux/sysman_os_engine_imp.h"
+#include "level_zero/sysman/source/api/engine/linux/sysman_os_engine_imp.h"
 #include "level_zero/sysman/source/linux/pmu/sysman_pmu_imp.h"
 #include "level_zero/sysman/source/linux/sysman_hw_device_id_linux.h"
 #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"

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

@@ -5,11 +5,11 @@
  *
  */
 
-#include "level_zero/sysman/source/engine/sysman_engine.h"
+#include "level_zero/sysman/source/api/engine/sysman_engine.h"
 
 #include "shared/source/helpers/basic_math.h"
 
-#include "level_zero/sysman/source/engine/sysman_engine_imp.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"
 

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

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/engine/sysman_engine_imp.h"
+#include "level_zero/sysman/source/api/engine/sysman_engine_imp.h"
 
 namespace L0 {
 namespace Sysman {

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

@@ -9,8 +9,8 @@
 
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/engine/sysman_engine.h"
-#include "level_zero/sysman/source/engine/sysman_os_engine.h"
+#include "level_zero/sysman/source/api/engine/sysman_engine.h"
+#include "level_zero/sysman/source/api/engine/sysman_os_engine.h"
 #include <level_zero/zes_api.h>
 namespace L0 {
 namespace Sysman {

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

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/engine/sysman_engine.h"
+#include "level_zero/sysman/source/api/engine/sysman_engine.h"
 #include <level_zero/zes_api.h>
 
 #include <set>

level_zero/sysman/source/api/engine/windows/sysman_os_engine_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/engine/windows/sysman_os_engine_imp.h"
+#include "level_zero/sysman/source/api/engine/windows/sysman_os_engine_imp.h"
 
 #include "level_zero/sysman/source/windows/sysman_kmd_sys.h"
 #include "level_zero/sysman/source/windows/sysman_kmd_sys_manager.h"

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

@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/engine/sysman_os_engine.h"
+#include "level_zero/sysman/source/api/engine/sysman_os_engine.h"
 #include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 
 namespace L0 {

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

@@ -5,15 +5,15 @@
  *
  */
 
-#include "level_zero/sysman/source/events/linux/sysman_os_events_imp.h"
+#include "level_zero/sysman/source/api/events/linux/sysman_os_events_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/utilities/directory.h"
 
-#include "level_zero/sysman/source/events/sysman_events_imp.h"
+#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/linux/zes_os_sysman_driver_imp.h"
 #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
-#include "level_zero/sysman/source/memory/linux/sysman_os_memory_imp_prelim.h"
 #include "level_zero/sysman/source/sysman_driver_handle_imp.h"
 
 #include <sys/stat.h>

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

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "level_zero/sysman/source/events/sysman_os_events.h"
+#include "level_zero/sysman/source/api/events/sysman_os_events.h"
 #include "level_zero/sysman/source/linux/udev/udev_lib.h"
 #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 

level_zero/sysman/source/api/events/sysman_events_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/events/sysman_events_imp.h"
+#include "level_zero/sysman/source/api/events/sysman_events_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 

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

@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/events/sysman_events.h"
-#include "level_zero/sysman/source/events/sysman_os_events.h"
+#include "level_zero/sysman/source/api/events/sysman_events.h"
+#include "level_zero/sysman/source/api/events/sysman_os_events.h"
 
 #include <mutex>
 

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

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/events/windows/sysman_os_events_imp.h"
+#include "level_zero/sysman/source/api/events/windows/sysman_os_events_imp.h"
 
 #include "level_zero/sysman/source/windows/sysman_kmd_sys_manager.h"
 #include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"

level_zero/sysman/source/api/events/windows/sysman_os_events_imp.h

@@ -9,7 +9,7 @@
 
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/events/sysman_os_events.h"
+#include "level_zero/sysman/source/api/events/sysman_os_events.h"
 #include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 
 namespace L0 {

level_zero/sysman/source/api/fabric_port/linux/sysman_fabric_device_access_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_imp.h"
+#include "level_zero/sysman/source/api/fabric_port/linux/sysman_fabric_device_access_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 

level_zero/sysman/source/api/fabric_port/linux/sysman_fabric_device_access_imp.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access.h"
+#include "level_zero/sysman/source/api/fabric_port/linux/sysman_fabric_device_access.h"
 #include "level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h"
 #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 

level_zero/sysman/source/api/fabric_port/linux/sysman_fabric_device_access_stub.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_stub.h"
+#include "level_zero/sysman/source/api/fabric_port/linux/sysman_fabric_device_access_stub.h"
 
 #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 

level_zero/sysman/source/api/fabric_port/linux/sysman_fabric_device_access_stub.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access.h"
+#include "level_zero/sysman/source/api/fabric_port/linux/sysman_fabric_device_access.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/fabric_port/linux/sysman_os_fabric_port_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp.h"
+#include "level_zero/sysman/source/api/fabric_port/linux/sysman_os_fabric_port_imp.h"
 
 #include <cstdio>
 

level_zero/sysman/source/api/fabric_port/linux/sysman_os_fabric_port_imp.h

@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.h"
-#include "level_zero/sysman/source/fabric_port/sysman_os_fabric_port.h"
+#include "level_zero/sysman/source/api/fabric_port/sysman_fabric_port_imp.h"
+#include "level_zero/sysman/source/api/fabric_port/sysman_os_fabric_port.h"
 #include "level_zero/sysman/source/linux/sysman_fs_access.h"
 
 namespace L0 {

level_zero/sysman/source/api/fabric_port/linux/sysman_os_fabric_port_imp_prelim.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp_prelim.h"
+#include "level_zero/sysman/source/api/fabric_port/linux/sysman_os_fabric_port_imp_prelim.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/debug_helpers.h"

level_zero/sysman/source/api/fabric_port/linux/sysman_os_fabric_port_imp_prelim.h

@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access.h"
-#include "level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.h"
-#include "level_zero/sysman/source/fabric_port/sysman_os_fabric_port.h"
+#include "level_zero/sysman/source/api/fabric_port/linux/sysman_fabric_device_access.h"
+#include "level_zero/sysman/source/api/fabric_port/sysman_fabric_port_imp.h"
+#include "level_zero/sysman/source/api/fabric_port/sysman_os_fabric_port.h"
 
 #include <vector>
 

level_zero/sysman/source/api/fabric_port/sysman_fabric_port.cpp

@@ -5,12 +5,12 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/sysman_fabric_port.h"
+#include "level_zero/sysman/source/api/fabric_port/sysman_fabric_port.h"
 
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/debug_helpers.h"
 
-#include "level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.h"
+#include "level_zero/sysman/source/api/fabric_port/sysman_fabric_port_imp.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/fabric_port/sysman_fabric_port_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.h"
+#include "level_zero/sysman/source/api/fabric_port/sysman_fabric_port_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 

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

@@ -9,8 +9,8 @@
 
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/fabric_port/sysman_fabric_port.h"
-#include "level_zero/sysman/source/fabric_port/sysman_os_fabric_port.h"
+#include "level_zero/sysman/source/api/fabric_port/sysman_fabric_port.h"
+#include "level_zero/sysman/source/api/fabric_port/sysman_os_fabric_port.h"
 #include <level_zero/zes_api.h>
 
 namespace L0 {

level_zero/sysman/source/api/fabric_port/windows/sysman_os_fabric_port_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/windows/sysman_os_fabric_port_imp.h"
+#include "level_zero/sysman/source/api/fabric_port/windows/sysman_os_fabric_port_imp.h"
 
 #include <cstring>
 

level_zero/sysman/source/api/fabric_port/windows/sysman_os_fabric_port_imp.h

@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.h"
-#include "level_zero/sysman/source/fabric_port/sysman_os_fabric_port.h"
+#include "level_zero/sysman/source/api/fabric_port/sysman_fabric_port_imp.h"
+#include "level_zero/sysman/source/api/fabric_port/sysman_os_fabric_port.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/fan/linux/sysman_os_fan_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/fan/linux/sysman_os_fan_imp.h"
+#include "level_zero/sysman/source/api/fan/linux/sysman_os_fan_imp.h"
 
 #include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
 #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"

level_zero/sysman/source/api/fan/linux/sysman_os_fan_imp.h

@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/fan/sysman_os_fan.h"
+#include "level_zero/sysman/source/api/fan/sysman_os_fan.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/fan/sysman_fan.cpp

@@ -5,11 +5,11 @@
  *
  */
 
-#include "level_zero/sysman/source/fan/sysman_fan.h"
+#include "level_zero/sysman/source/api/fan/sysman_fan.h"
 
 #include "shared/source/helpers/basic_math.h"
 
-#include "level_zero/sysman/source/fan/sysman_fan_imp.h"
+#include "level_zero/sysman/source/api/fan/sysman_fan_imp.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/fan/sysman_fan_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/fan/sysman_fan_imp.h"
+#include "level_zero/sysman/source/api/fan/sysman_fan_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 

level_zero/sysman/source/api/fan/sysman_fan_imp.h

@@ -9,8 +9,8 @@
 
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/fan/sysman_fan.h"
-#include "level_zero/sysman/source/fan/sysman_os_fan.h"
+#include "level_zero/sysman/source/api/fan/sysman_fan.h"
+#include "level_zero/sysman/source/api/fan/sysman_os_fan.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/fan/windows/sysman_os_fan_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/fan/windows/sysman_os_fan_imp.h"
+#include "level_zero/sysman/source/api/fan/windows/sysman_os_fan_imp.h"
 
 #include "level_zero/sysman/source/windows/sysman_kmd_sys_manager.h"
 

level_zero/sysman/source/api/fan/windows/sysman_os_fan_imp.h

@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/fan/sysman_os_fan.h"
+#include "level_zero/sysman/source/api/fan/sysman_os_fan.h"
 #include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 
 namespace L0 {

level_zero/sysman/source/api/firmware/linux/sysman_os_firmware_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.h"
+#include "level_zero/sysman/source/api/firmware/linux/sysman_os_firmware_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/string.h"

level_zero/sysman/source/api/firmware/linux/sysman_os_firmware_imp.h

@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/firmware/sysman_firmware_imp.h"
-#include "level_zero/sysman/source/firmware/sysman_os_firmware.h"
+#include "level_zero/sysman/source/api/firmware/sysman_firmware_imp.h"
+#include "level_zero/sysman/source/api/firmware/sysman_os_firmware.h"
 #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 namespace L0 {

level_zero/sysman/source/api/firmware/linux/sysman_os_firmware_imp_helper.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.h"
+#include "level_zero/sysman/source/api/firmware/linux/sysman_os_firmware_imp.h"
 #include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
 
 namespace L0 {

level_zero/sysman/source/api/firmware/linux/sysman_os_firmware_imp_helper_prelim.cpp

@@ -7,7 +7,7 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 
-#include "level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.h"
+#include "level_zero/sysman/source/api/firmware/linux/sysman_os_firmware_imp.h"
 #include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
 #include "level_zero/sysman/source/linux/sysman_fs_access.h"
 

level_zero/sysman/source/api/firmware/sysman_firmware.cpp

@@ -7,7 +7,7 @@
 
 #include "shared/source/helpers/basic_math.h"
 
-#include "level_zero/sysman/source/firmware/sysman_firmware_imp.h"
+#include "level_zero/sysman/source/api/firmware/sysman_firmware_imp.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/firmware/sysman_firmware_imp.cpp

@@ -5,11 +5,11 @@
  *
  */
 
-#include "level_zero/sysman/source/firmware/sysman_firmware_imp.h"
+#include "level_zero/sysman/source/api/firmware/sysman_firmware_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 
-#include "level_zero/sysman/source/firmware/sysman_os_firmware.h"
+#include "level_zero/sysman/source/api/firmware/sysman_os_firmware.h"
 
 namespace L0 {
 namespace Sysman {

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

@@ -9,8 +9,8 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/helpers/string.h"
 
-#include "level_zero/sysman/source/firmware/sysman_firmware.h"
-#include "level_zero/sysman/source/firmware/sysman_os_firmware.h"
+#include "level_zero/sysman/source/api/firmware/sysman_firmware.h"
+#include "level_zero/sysman/source/api/firmware/sysman_os_firmware.h"
 #include <level_zero/zes_api.h>
 
 namespace L0 {

level_zero/sysman/source/api/firmware/windows/sysman_os_firmware_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/firmware/windows/sysman_os_firmware_imp.h"
+#include "level_zero/sysman/source/api/firmware/windows/sysman_os_firmware_imp.h"
 
 #include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
 #include "level_zero/sysman/source/sysman_const.h"

level_zero/sysman/source/api/firmware/windows/sysman_os_firmware_imp.h

@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/firmware/sysman_os_firmware.h"
+#include "level_zero/sysman/source/api/firmware/sysman_os_firmware.h"
 
 namespace L0 {
 namespace Sysman {

level_zero/sysman/source/api/frequency/linux/sysman_os_frequency_imp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp.h"
+#include "level_zero/sysman/source/api/frequency/linux/sysman_os_frequency_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 

level_zero/sysman/source/api/frequency/linux/sysman_os_frequency_imp.h

@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/frequency/sysman_frequency_imp.h"
-#include "level_zero/sysman/source/frequency/sysman_os_frequency.h"
+#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/linux/sysman_fs_access.h"
 
 namespace L0 {

level_zero/sysman/source/api/frequency/linux/sysman_os_frequency_imp_prelim.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp_prelim.h"
+#include "level_zero/sysman/source/api/frequency/linux/sysman_os_frequency_imp_prelim.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"

level_zero/sysman/source/api/frequency/linux/sysman_os_frequency_imp_prelim.h

@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/frequency/sysman_frequency_imp.h"
-#include "level_zero/sysman/source/frequency/sysman_os_frequency.h"
+#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/linux/sysman_fs_access.h"
 
 #include "igfxfmid.h"

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

@@ -5,12 +5,12 @@
  *
  */
 
-#include "level_zero/sysman/source/frequency/sysman_frequency.h"
+#include "level_zero/sysman/source/api/frequency/sysman_frequency.h"
 
 #include "shared/source/helpers/basic_math.h"
 
-#include "level_zero/sysman/source/frequency/sysman_frequency_imp.h"
-#include "level_zero/sysman/source/frequency/sysman_os_frequency.h"
+#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"
 
 namespace L0 {

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

@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/frequency/sysman_frequency_imp.h"
+#include "level_zero/sysman/source/api/frequency/sysman_frequency_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 

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

@@ -9,8 +9,8 @@
 
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/frequency/sysman_frequency.h"
-#include "level_zero/sysman/source/frequency/sysman_os_frequency.h"
+#include "level_zero/sysman/source/api/frequency/sysman_frequency.h"
+#include "level_zero/sysman/source/api/frequency/sysman_os_frequency.h"
 #include <level_zero/zes_api.h>
 
 namespace L0 {