diff --git a/lib/stm32wba/hci/app_common.h b/lib/stm32wba/BLE_TransparentMode/Core/Inc/app_common.h
similarity index 100%
rename from lib/stm32wba/hci/app_common.h
rename to lib/stm32wba/BLE_TransparentMode/Core/Inc/app_common.h
diff --git a/lib/stm32wba/hci/app_conf.h b/lib/stm32wba/BLE_TransparentMode/Core/Inc/app_conf.h
similarity index 100%
rename from lib/stm32wba/hci/app_conf.h
rename to lib/stm32wba/BLE_TransparentMode/Core/Inc/app_conf.h
diff --git a/lib/stm32wba/hci/app_entry.h b/lib/stm32wba/BLE_TransparentMode/Core/Inc/app_entry.h
similarity index 100%
rename from lib/stm32wba/hci/app_entry.h
rename to lib/stm32wba/BLE_TransparentMode/Core/Inc/app_entry.h
diff --git a/lib/stm32wba/hci/main.h b/lib/stm32wba/BLE_TransparentMode/Core/Inc/main.h
similarity index 100%
rename from lib/stm32wba/hci/main.h
rename to lib/stm32wba/BLE_TransparentMode/Core/Inc/main.h
diff --git a/lib/stm32wba/hci/utilities_conf.h b/lib/stm32wba/BLE_TransparentMode/Core/Inc/utilities_conf.h
similarity index 100%
rename from lib/stm32wba/hci/utilities_conf.h
rename to lib/stm32wba/BLE_TransparentMode/Core/Inc/utilities_conf.h
diff --git a/lib/stm32wba/hci/bpka.c b/lib/stm32wba/BLE_TransparentMode/STM32_WPAN/Target/bpka.c
similarity index 100%
rename from lib/stm32wba/hci/bpka.c
rename to lib/stm32wba/BLE_TransparentMode/STM32_WPAN/Target/bpka.c
diff --git a/lib/stm32wba/hci/bpka.h b/lib/stm32wba/BLE_TransparentMode/STM32_WPAN/Target/bpka.h
similarity index 100%
rename from lib/stm32wba/hci/bpka.h
rename to lib/stm32wba/BLE_TransparentMode/STM32_WPAN/Target/bpka.h
diff --git a/lib/stm32wba/hci/linklayer_plat.c b/lib/stm32wba/BLE_TransparentMode/STM32_WPAN/Target/linklayer_plat.c
similarity index 100%
rename from lib/stm32wba/hci/linklayer_plat.c
rename to lib/stm32wba/BLE_TransparentMode/STM32_WPAN/Target/linklayer_plat.c
diff --git a/lib/stm32wba/hci/ll_sys_if.c b/lib/stm32wba/BLE_TransparentMode/STM32_WPAN/Target/ll_sys_if.c
similarity index 100%
rename from lib/stm32wba/hci/ll_sys_if.c
rename to lib/stm32wba/BLE_TransparentMode/STM32_WPAN/Target/ll_sys_if.c
diff --git a/lib/stm32wba/hci/power_table.c b/lib/stm32wba/BLE_TransparentMode/STM32_WPAN/Target/power_table.c
similarity index 100%
rename from lib/stm32wba/hci/power_table.c
rename to lib/stm32wba/BLE_TransparentMode/STM32_WPAN/Target/power_table.c
diff --git a/lib/stm32wba/hci/app_debug.h b/lib/stm32wba/BLE_TransparentMode/System/Config/Debug_GPIO/app_debug.h
similarity index 100%
rename from lib/stm32wba/hci/app_debug.h
rename to lib/stm32wba/BLE_TransparentMode/System/Config/Debug_GPIO/app_debug.h
diff --git a/lib/stm32wba/hci/debug_config.h b/lib/stm32wba/BLE_TransparentMode/System/Config/Debug_GPIO/debug_config.h
similarity index 100%
rename from lib/stm32wba/hci/debug_config.h
rename to lib/stm32wba/BLE_TransparentMode/System/Config/Debug_GPIO/debug_config.h
diff --git a/lib/stm32wba/hci/log_module.c b/lib/stm32wba/BLE_TransparentMode/System/Config/Log/log_module.c
similarity index 100%
rename from lib/stm32wba/hci/log_module.c
rename to lib/stm32wba/BLE_TransparentMode/System/Config/Log/log_module.c
diff --git a/lib/stm32wba/hci/log_module.h b/lib/stm32wba/BLE_TransparentMode/System/Config/Log/log_module.h
similarity index 100%
rename from lib/stm32wba/hci/log_module.h
rename to lib/stm32wba/BLE_TransparentMode/System/Config/Log/log_module.h
diff --git a/lib/stm32wba/hci/hw.h b/lib/stm32wba/BLE_TransparentMode/System/Interfaces/hw.h
similarity index 100%
rename from lib/stm32wba/hci/hw.h
rename to lib/stm32wba/BLE_TransparentMode/System/Interfaces/hw.h
diff --git a/lib/stm32wba/hci/hw_aes.c b/lib/stm32wba/BLE_TransparentMode/System/Interfaces/hw_aes.c
similarity index 100%
rename from lib/stm32wba/hci/hw_aes.c
rename to lib/stm32wba/BLE_TransparentMode/System/Interfaces/hw_aes.c
diff --git a/lib/stm32wba/hci/hw_if.h b/lib/stm32wba/BLE_TransparentMode/System/Interfaces/hw_if.h
similarity index 100%
rename from lib/stm32wba/hci/hw_if.h
rename to lib/stm32wba/BLE_TransparentMode/System/Interfaces/hw_if.h
diff --git a/lib/stm32wba/hci/hw_pka.c b/lib/stm32wba/BLE_TransparentMode/System/Interfaces/hw_pka.c
similarity index 100%
rename from lib/stm32wba/hci/hw_pka.c
rename to lib/stm32wba/BLE_TransparentMode/System/Interfaces/hw_pka.c
diff --git a/lib/stm32wba/hci/pka_p256.c b/lib/stm32wba/BLE_TransparentMode/System/Interfaces/pka_p256.c
similarity index 100%
rename from lib/stm32wba/hci/pka_p256.c
rename to lib/stm32wba/BLE_TransparentMode/System/Interfaces/pka_p256.c
diff --git a/lib/stm32wba/hci/flash_driver.c b/lib/stm32wba/BLE_TransparentMode/System/Modules/Flash/flash_driver.c
similarity index 100%
rename from lib/stm32wba/hci/flash_driver.c
rename to lib/stm32wba/BLE_TransparentMode/System/Modules/Flash/flash_driver.c
diff --git a/lib/stm32wba/hci/flash_driver.h b/lib/stm32wba/BLE_TransparentMode/System/Modules/Flash/flash_driver.h
similarity index 100%
rename from lib/stm32wba/hci/flash_driver.h
rename to lib/stm32wba/BLE_TransparentMode/System/Modules/Flash/flash_driver.h
diff --git a/lib/stm32wba/hci/flash_manager.c b/lib/stm32wba/BLE_TransparentMode/System/Modules/Flash/flash_manager.c
similarity index 100%
rename from lib/stm32wba/hci/flash_manager.c
rename to lib/stm32wba/BLE_TransparentMode/System/Modules/Flash/flash_manager.c
diff --git a/lib/stm32wba/hci/flash_manager.h b/lib/stm32wba/BLE_TransparentMode/System/Modules/Flash/flash_manager.h
similarity index 100%
rename from lib/stm32wba/hci/flash_manager.h
rename to lib/stm32wba/BLE_TransparentMode/System/Modules/Flash/flash_manager.h
diff --git a/lib/stm32wba/hci/rf_timing_synchro.c b/lib/stm32wba/BLE_TransparentMode/System/Modules/Flash/rf_timing_synchro.c
similarity index 100%
rename from lib/stm32wba/hci/rf_timing_synchro.c
rename to lib/stm32wba/BLE_TransparentMode/System/Modules/Flash/rf_timing_synchro.c
diff --git a/lib/stm32wba/hci/rf_timing_synchro.h b/lib/stm32wba/BLE_TransparentMode/System/Modules/Flash/rf_timing_synchro.h
similarity index 100%
rename from lib/stm32wba/hci/rf_timing_synchro.h
rename to lib/stm32wba/BLE_TransparentMode/System/Modules/Flash/rf_timing_synchro.h
diff --git a/lib/stm32wba/hci/RTDebug.c b/lib/stm32wba/BLE_TransparentMode/System/Modules/RTDebug/RTDebug.c
similarity index 100%
rename from lib/stm32wba/hci/RTDebug.c
rename to lib/stm32wba/BLE_TransparentMode/System/Modules/RTDebug/RTDebug.c
diff --git a/lib/stm32wba/hci/RTDebug.h b/lib/stm32wba/BLE_TransparentMode/System/Modules/RTDebug/RTDebug.h
similarity index 100%
rename from lib/stm32wba/hci/RTDebug.h
rename to lib/stm32wba/BLE_TransparentMode/System/Modules/RTDebug/RTDebug.h
diff --git a/lib/stm32wba/hci/debug_signals.h b/lib/stm32wba/BLE_TransparentMode/System/Modules/RTDebug/debug_signals.h
similarity index 100%
rename from lib/stm32wba/hci/debug_signals.h
rename to lib/stm32wba/BLE_TransparentMode/System/Modules/RTDebug/debug_signals.h
diff --git a/lib/stm32wba/hci/local_debug_tables.h b/lib/stm32wba/BLE_TransparentMode/System/Modules/RTDebug/local_debug_tables.h
similarity index 100%
rename from lib/stm32wba/hci/local_debug_tables.h
rename to lib/stm32wba/BLE_TransparentMode/System/Modules/RTDebug/local_debug_tables.h
diff --git a/lib/stm32wba/hci/scm.c b/lib/stm32wba/BLE_TransparentMode/System/Modules/scm.c
similarity index 100%
rename from lib/stm32wba/hci/scm.c
rename to lib/stm32wba/BLE_TransparentMode/System/Modules/scm.c
diff --git a/lib/stm32wba/hci/scm.h b/lib/stm32wba/BLE_TransparentMode/System/Modules/scm.h
similarity index 100%
rename from lib/stm32wba/hci/scm.h
rename to lib/stm32wba/BLE_TransparentMode/System/Modules/scm.h
diff --git a/lib/stm32wba/hci/stm_list.c b/lib/stm32wba/BLE_TransparentMode/System/Modules/stm_list.c
similarity index 100%
rename from lib/stm32wba/hci/stm_list.c
rename to lib/stm32wba/BLE_TransparentMode/System/Modules/stm_list.c
diff --git a/lib/stm32wba/hci/stm_list.h b/lib/stm32wba/BLE_TransparentMode/System/Modules/stm_list.h
similarity index 100%
rename from lib/stm32wba/hci/stm_list.h
rename to lib/stm32wba/BLE_TransparentMode/System/Modules/stm_list.h
diff --git a/lib/stm32wba/hci/utilities_common.h b/lib/stm32wba/BLE_TransparentMode/System/Modules/utilities_common.h
similarity index 100%
rename from lib/stm32wba/hci/utilities_common.h
rename to lib/stm32wba/BLE_TransparentMode/System/Modules/utilities_common.h
diff --git a/lib/stm32wba/CMakeLists.txt b/lib/stm32wba/CMakeLists.txt
index 214fc80a0..eca5399df 100644
--- a/lib/stm32wba/CMakeLists.txt
+++ b/lib/stm32wba/CMakeLists.txt
@@ -8,31 +8,49 @@ endif()
 
 zephyr_compile_definitions( -DBLE )
 
-zephyr_include_directories(hci)
-zephyr_include_directories(hci/ll)
-
-zephyr_sources(hci/ll_sys_cs.c)
-zephyr_sources(hci/ll_sys_intf.c)
-zephyr_sources(hci/ll_sys_dp_slp.c)
-zephyr_sources(hci/ll_sys_startup.c)
-zephyr_sources(hci/RTDebug.c)
-zephyr_sources(hci/hw_pka.c)
-zephyr_sources(hci/pka_p256.c)
-zephyr_sources(hci/bpka.c)
-zephyr_sources(hci/power_table.c)
-zephyr_sources(hci/scm.c)
-zephyr_sources(hci/log_module.c)
-zephyr_sources(hci/linklayer_plat.c)
-zephyr_sources(hci/ll_sys_if.c)
+zephyr_include_directories(BLE_TransparentMode/Core/Inc)
+zephyr_include_directories(BLE_TransparentMode/STM32_WPAN/Target)
+zephyr_include_directories(BLE_TransparentMode/System/Config/Debug_GPIO)
+zephyr_include_directories(BLE_TransparentMode/System/Config/Log)
+zephyr_include_directories(BLE_TransparentMode/System/Interfaces)
+zephyr_include_directories(BLE_TransparentMode/System/Modules)
+zephyr_include_directories(BLE_TransparentMode/System/Modules/Flash)
+zephyr_include_directories(BLE_TransparentMode/System/Modules/RTDebug)
+zephyr_include_directories(STM32_WPAN)
+zephyr_include_directories(STM32_WPAN/ble/stack/include)
+zephyr_include_directories(STM32_WPAN/ble/stack/include/auto)
+zephyr_include_directories(STM32_WPAN/link_layer/ll_cmd_lib/config/ble_full)
+zephyr_include_directories(STM32_WPAN/link_layer/ll_cmd_lib/inc)
+zephyr_include_directories(STM32_WPAN/link_layer/ll_cmd_lib/inc/_40nm_reg_files)
+zephyr_include_directories(STM32_WPAN/link_layer/ll_sys/inc)
+zephyr_include_directories(Utilities/misc)
+zephyr_include_directories(Utilities/tim_serv)
+zephyr_include_directories(Utilities/trace/adv_trace)
+
+zephyr_sources(BLE_TransparentMode/STM32_WPAN/Target/bpka.c)
+zephyr_sources(BLE_TransparentMode/STM32_WPAN/Target/linklayer_plat.c)
+zephyr_sources(BLE_TransparentMode/STM32_WPAN/Target/ll_sys_if.c)
+zephyr_sources(BLE_TransparentMode/STM32_WPAN/Target/power_table.c)
+zephyr_sources(BLE_TransparentMode/System/Config/Log/log_module.c)
+zephyr_sources(BLE_TransparentMode/System/Interfaces/hw_pka.c)
+zephyr_sources(BLE_TransparentMode/System/Interfaces/pka_p256.c)
+zephyr_sources(BLE_TransparentMode/System/Modules/scm.c)
+zephyr_sources(BLE_TransparentMode/System/Modules/RTDebug/RTDebug.c)
+zephyr_sources(STM32_WPAN/link_layer/ll_sys/src/ll_sys_cs.c)
+zephyr_sources(STM32_WPAN/link_layer/ll_sys/src/ll_sys_dp_slp.c)
+zephyr_sources(STM32_WPAN/link_layer/ll_sys/src/ll_sys_intf.c)
+zephyr_sources(STM32_WPAN/link_layer/ll_sys/src/ll_sys_startup.c)
+
 if(CONFIG_FLASH)
-  zephyr_sources(hci/flash_manager.c)
-  zephyr_sources(hci/flash_driver.c)
-  zephyr_sources(hci/stm_list.c)
-  zephyr_sources(hci/rf_timing_synchro.c)
+  zephyr_sources(BLE_TransparentMode/System/Modules/Flash/flash_manager.c)
+  zephyr_sources(BLE_TransparentMode/System/Modules/Flash/flash_driver.c)
+  zephyr_sources(BLE_TransparentMode/System/Modules/stm_list.c)
+  zephyr_sources(BLE_TransparentMode/System/Modules/Flash/rf_timing_synchro.c)
 endif()
 
 set(STM32WBA_BLE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../zephyr/blobs/stm32wba/lib)
-set(STM32WBA_BLE_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/hci)
+set(STM32WBA_BLE_LIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/STM32_WPAN/ble/stack)
+set(STM32WBA_LL_LIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/STM32_WPAN/link_layer/ll_cmd_lib)
 
 add_library(stm32wba_ble_lib STATIC IMPORTED GLOBAL)
 add_library(stm32wba_ll_lib STATIC IMPORTED GLOBAL)
@@ -48,8 +66,8 @@ set_target_properties(
   stm32wba_ll_lib PROPERTIES IMPORTED_LOCATION ${STM32WBA_BLE_LIB_DIR}/LinkLayer_BLE_Full_lib.a
 )
 
-set_target_properties(stm32wba_ble_lib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${STM32WBA_BLE_INCLUDE_DIR})
-set_target_properties(stm32wba_ll_lib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${STM32WBA_BLE_INCLUDE_DIR})
+set_target_properties(stm32wba_ble_lib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${STM32WBA_BLE_LIB_INCLUDE_DIR})
+set_target_properties(stm32wba_ll_lib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${STM32WBA_LL_LIB_INCLUDE_DIR})
 
 target_link_libraries(app PUBLIC stm32wba_ble_lib)
 target_link_libraries(app PUBLIC stm32wba_ll_lib)
diff --git a/lib/stm32wba/hci/LICENSE.md b/lib/stm32wba/LICENSE.md
similarity index 100%
rename from lib/stm32wba/hci/LICENSE.md
rename to lib/stm32wba/LICENSE.md
diff --git a/lib/stm32wba/hci/README b/lib/stm32wba/README
similarity index 100%
rename from lib/stm32wba/hci/README
rename to lib/stm32wba/README
diff --git a/lib/stm32wba/hci/auto/ble_types.h b/lib/stm32wba/STM32_WPAN/ble/stack/include/auto/ble_types.h
similarity index 100%
rename from lib/stm32wba/hci/auto/ble_types.h
rename to lib/stm32wba/STM32_WPAN/ble/stack/include/auto/ble_types.h
diff --git a/lib/stm32wba/hci/ble_bufsize.h b/lib/stm32wba/STM32_WPAN/ble/stack/include/ble_bufsize.h
similarity index 100%
rename from lib/stm32wba/hci/ble_bufsize.h
rename to lib/stm32wba/STM32_WPAN/ble/stack/include/ble_bufsize.h
diff --git a/lib/stm32wba/hci/ble_const.h b/lib/stm32wba/STM32_WPAN/ble/stack/include/ble_const.h
similarity index 100%
rename from lib/stm32wba/hci/ble_const.h
rename to lib/stm32wba/STM32_WPAN/ble/stack/include/ble_const.h
diff --git a/lib/stm32wba/hci/ble_defs.h b/lib/stm32wba/STM32_WPAN/ble/stack/include/ble_defs.h
similarity index 100%
rename from lib/stm32wba/hci/ble_defs.h
rename to lib/stm32wba/STM32_WPAN/ble/stack/include/ble_defs.h
diff --git a/lib/stm32wba/hci/ble_std.h b/lib/stm32wba/STM32_WPAN/ble/stack/include/ble_std.h
similarity index 100%
rename from lib/stm32wba/hci/ble_std.h
rename to lib/stm32wba/STM32_WPAN/ble/stack/include/ble_std.h
diff --git a/lib/stm32wba/hci/bleplat.h b/lib/stm32wba/STM32_WPAN/ble/stack/include/bleplat.h
similarity index 100%
rename from lib/stm32wba/hci/bleplat.h
rename to lib/stm32wba/STM32_WPAN/ble/stack/include/bleplat.h
diff --git a/lib/stm32wba/hci/blestack.h b/lib/stm32wba/STM32_WPAN/ble/stack/include/blestack.h
similarity index 100%
rename from lib/stm32wba/hci/blestack.h
rename to lib/stm32wba/STM32_WPAN/ble/stack/include/blestack.h
diff --git a/lib/stm32wba/hci/ll/ll_fw_config.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/config/ble_full/ll_fw_config.h
similarity index 100%
rename from lib/stm32wba/hci/ll/ll_fw_config.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/config/ble_full/ll_fw_config.h
diff --git a/lib/stm32wba/hci/ll/_40nm_reg_files/DWC_ble154combo.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/_40nm_reg_files/DWC_ble154combo.h
similarity index 100%
rename from lib/stm32wba/hci/ll/_40nm_reg_files/DWC_ble154combo.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/_40nm_reg_files/DWC_ble154combo.h
diff --git a/lib/stm32wba/hci/ll/bsp.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/bsp.h
similarity index 100%
rename from lib/stm32wba/hci/ll/bsp.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/bsp.h
diff --git a/lib/stm32wba/hci/ll/common_types.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/common_types.h
similarity index 100%
rename from lib/stm32wba/hci/ll/common_types.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/common_types.h
diff --git a/lib/stm32wba/hci/ll/event_manager.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/event_manager.h
similarity index 100%
rename from lib/stm32wba/hci/ll/event_manager.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/event_manager.h
diff --git a/lib/stm32wba/hci/ll/evnt_schdlr_gnrc_if.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/evnt_schdlr_gnrc_if.h
similarity index 100%
rename from lib/stm32wba/hci/ll/evnt_schdlr_gnrc_if.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/evnt_schdlr_gnrc_if.h
diff --git a/lib/stm32wba/hci/ll/hci.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/hci.h
similarity index 100%
rename from lib/stm32wba/hci/ll/hci.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/hci.h
diff --git a/lib/stm32wba/hci/ll/ll_intf.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/ll_intf.h
similarity index 100%
rename from lib/stm32wba/hci/ll/ll_intf.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/ll_intf.h
diff --git a/lib/stm32wba/hci/ll_intf_cmn.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/ll_intf_cmn.h
similarity index 100%
rename from lib/stm32wba/hci/ll_intf_cmn.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/ll_intf_cmn.h
diff --git a/lib/stm32wba/hci/ll/mem_intf.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/mem_intf.h
similarity index 100%
rename from lib/stm32wba/hci/ll/mem_intf.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/mem_intf.h
diff --git a/lib/stm32wba/hci/ll/os_wrapper.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/os_wrapper.h
similarity index 100%
rename from lib/stm32wba/hci/ll/os_wrapper.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/os_wrapper.h
diff --git a/lib/stm32wba/hci/ll/power_table.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/power_table.h
similarity index 100%
rename from lib/stm32wba/hci/ll/power_table.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/power_table.h
diff --git a/lib/stm32wba/hci/pta.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/pta.h
similarity index 100%
rename from lib/stm32wba/hci/pta.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_cmd_lib/inc/pta.h
diff --git a/lib/stm32wba/hci/linklayer_plat.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_sys/inc/linklayer_plat.h
similarity index 100%
rename from lib/stm32wba/hci/linklayer_plat.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_sys/inc/linklayer_plat.h
diff --git a/lib/stm32wba/hci/ll_sys.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_sys/inc/ll_sys.h
similarity index 100%
rename from lib/stm32wba/hci/ll_sys.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_sys/inc/ll_sys.h
diff --git a/lib/stm32wba/hci/ll_sys_startup.h b/lib/stm32wba/STM32_WPAN/link_layer/ll_sys/inc/ll_sys_startup.h
similarity index 100%
rename from lib/stm32wba/hci/ll_sys_startup.h
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_sys/inc/ll_sys_startup.h
diff --git a/lib/stm32wba/hci/ll_sys_cs.c b/lib/stm32wba/STM32_WPAN/link_layer/ll_sys/src/ll_sys_cs.c
similarity index 100%
rename from lib/stm32wba/hci/ll_sys_cs.c
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_sys/src/ll_sys_cs.c
diff --git a/lib/stm32wba/hci/ll_sys_dp_slp.c b/lib/stm32wba/STM32_WPAN/link_layer/ll_sys/src/ll_sys_dp_slp.c
similarity index 100%
rename from lib/stm32wba/hci/ll_sys_dp_slp.c
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_sys/src/ll_sys_dp_slp.c
diff --git a/lib/stm32wba/hci/ll_sys_intf.c b/lib/stm32wba/STM32_WPAN/link_layer/ll_sys/src/ll_sys_intf.c
similarity index 100%
rename from lib/stm32wba/hci/ll_sys_intf.c
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_sys/src/ll_sys_intf.c
diff --git a/lib/stm32wba/hci/ll_sys_startup.c b/lib/stm32wba/STM32_WPAN/link_layer/ll_sys/src/ll_sys_startup.c
similarity index 100%
rename from lib/stm32wba/hci/ll_sys_startup.c
rename to lib/stm32wba/STM32_WPAN/link_layer/ll_sys/src/ll_sys_startup.c
diff --git a/lib/stm32wba/hci/stm32_wpan_common.h b/lib/stm32wba/STM32_WPAN/stm32_wpan_common.h
similarity index 100%
rename from lib/stm32wba/hci/stm32_wpan_common.h
rename to lib/stm32wba/STM32_WPAN/stm32_wpan_common.h
diff --git a/lib/stm32wba/hci/stm32_mem.h b/lib/stm32wba/Utilities/misc/stm32_mem.h
similarity index 100%
rename from lib/stm32wba/hci/stm32_mem.h
rename to lib/stm32wba/Utilities/misc/stm32_mem.h
diff --git a/lib/stm32wba/hci/stm32_tiny_vsnprintf.h b/lib/stm32wba/Utilities/misc/stm32_tiny_vsnprintf.h
similarity index 100%
rename from lib/stm32wba/hci/stm32_tiny_vsnprintf.h
rename to lib/stm32wba/Utilities/misc/stm32_tiny_vsnprintf.h
diff --git a/lib/stm32wba/hci/stm32_timer.h b/lib/stm32wba/Utilities/tim_serv/stm32_timer.h
similarity index 100%
rename from lib/stm32wba/hci/stm32_timer.h
rename to lib/stm32wba/Utilities/tim_serv/stm32_timer.h
diff --git a/lib/stm32wba/hci/stm32_adv_trace.h b/lib/stm32wba/Utilities/trace/adv_trace/stm32_adv_trace.h
similarity index 100%
rename from lib/stm32wba/hci/stm32_adv_trace.h
rename to lib/stm32wba/Utilities/trace/adv_trace/stm32_adv_trace.h