feat(ble_mesh): Bluetooth Mesh folder and file misc updates

components/bt/CMakeLists.txt

@@ -372,22 +372,22 @@ if(CONFIG_BT_ENABLED)
         list(APPEND srcs "common/btc/profile/esp/blufi/bluedroid_host/esp_blufi.c")
 
         if(CONFIG_BLE_MESH)
-            list(APPEND srcs "esp_ble_mesh/mesh_core/bluedroid_host/mesh_bearer_adapt.c")
+            list(APPEND srcs "esp_ble_mesh/core/bluedroid_host/adapter.c")
         endif()
 
     endif()
 
     if(CONFIG_BLE_MESH)
         list(APPEND include_dirs
-                    "esp_ble_mesh/mesh_common/include"
+                    "esp_ble_mesh/common/include"
-                    "esp_ble_mesh/mesh_common/tinycrypt/include"
+                    "esp_ble_mesh/common/tinycrypt/include"
-                    "esp_ble_mesh/mesh_core"
+                    "esp_ble_mesh/core"
-                    "esp_ble_mesh/mesh_core/include"
+                    "esp_ble_mesh/core/include"
-                    "esp_ble_mesh/mesh_core/storage"
+                    "esp_ble_mesh/core/storage"
                     "esp_ble_mesh/btc/include"
-                    "esp_ble_mesh/mesh_models/common/include"
+                    "esp_ble_mesh/models/common/include"
-                    "esp_ble_mesh/mesh_models/client/include"
+                    "esp_ble_mesh/models/client/include"
-                    "esp_ble_mesh/mesh_models/server/include"
+                    "esp_ble_mesh/models/server/include"
                     "esp_ble_mesh/api/core/include"
                     "esp_ble_mesh/api/models/include"
                     "esp_ble_mesh/api")
@@ -413,66 +413,66 @@ if(CONFIG_BT_ENABLED)
                     "esp_ble_mesh/btc/btc_ble_mesh_prov.c"
                     "esp_ble_mesh/btc/btc_ble_mesh_sensor_model.c"
                     "esp_ble_mesh/btc/btc_ble_mesh_time_scene_model.c"
-                    "esp_ble_mesh/mesh_common/tinycrypt/src/aes_decrypt.c"
+                    "esp_ble_mesh/common/tinycrypt/src/aes_decrypt.c"
-                    "esp_ble_mesh/mesh_common/tinycrypt/src/aes_encrypt.c"
+                    "esp_ble_mesh/common/tinycrypt/src/aes_encrypt.c"
-                    "esp_ble_mesh/mesh_common/tinycrypt/src/cbc_mode.c"
+                    "esp_ble_mesh/common/tinycrypt/src/cbc_mode.c"
-                    "esp_ble_mesh/mesh_common/tinycrypt/src/ccm_mode.c"
+                    "esp_ble_mesh/common/tinycrypt/src/ccm_mode.c"
-                    "esp_ble_mesh/mesh_common/tinycrypt/src/cmac_mode.c"
+                    "esp_ble_mesh/common/tinycrypt/src/cmac_mode.c"
-                    "esp_ble_mesh/mesh_common/tinycrypt/src/ctr_mode.c"
+                    "esp_ble_mesh/common/tinycrypt/src/ctr_mode.c"
-                    "esp_ble_mesh/mesh_common/tinycrypt/src/ctr_prng.c"
+                    "esp_ble_mesh/common/tinycrypt/src/ctr_prng.c"
-                    "esp_ble_mesh/mesh_common/tinycrypt/src/ecc_dh.c"
+                    "esp_ble_mesh/common/tinycrypt/src/ecc_dh.c"
-                    "esp_ble_mesh/mesh_common/tinycrypt/src/ecc_dsa.c"
+                    "esp_ble_mesh/common/tinycrypt/src/ecc_dsa.c"
-                    "esp_ble_mesh/mesh_common/tinycrypt/src/ecc_platform_specific.c"
+                    "esp_ble_mesh/common/tinycrypt/src/ecc_platform_specific.c"
-                    "esp_ble_mesh/mesh_common/tinycrypt/src/ecc.c"
+                    "esp_ble_mesh/common/tinycrypt/src/ecc.c"
-                    "esp_ble_mesh/mesh_common/tinycrypt/src/hmac_prng.c"
+                    "esp_ble_mesh/common/tinycrypt/src/hmac_prng.c"
-                    "esp_ble_mesh/mesh_common/tinycrypt/src/hmac.c"
+                    "esp_ble_mesh/common/tinycrypt/src/hmac.c"
-                    "esp_ble_mesh/mesh_common/tinycrypt/src/sha256.c"
+                    "esp_ble_mesh/common/tinycrypt/src/sha256.c"
-                    "esp_ble_mesh/mesh_common/tinycrypt/src/utils.c"
+                    "esp_ble_mesh/common/tinycrypt/src/utils.c"
-                    "esp_ble_mesh/mesh_common/mesh_atomic.c"
+                    "esp_ble_mesh/common/atomic.c"
-                    "esp_ble_mesh/mesh_common/mesh_buf.c"
+                    "esp_ble_mesh/common/buf.c"
-                    "esp_ble_mesh/mesh_common/mesh_common.c"
+                    "esp_ble_mesh/common/common.c"
-                    "esp_ble_mesh/mesh_common/mesh_kernel.c"
+                    "esp_ble_mesh/common/kernel.c"
-                    "esp_ble_mesh/mesh_common/mesh_mutex.c"
+                    "esp_ble_mesh/common/mutex.c"
-                    "esp_ble_mesh/mesh_common/mesh_timer.c"
+                    "esp_ble_mesh/common/timer.c"
-                    "esp_ble_mesh/mesh_common/mesh_util.c"
+                    "esp_ble_mesh/common/utils.c"
-                    "esp_ble_mesh/mesh_core/storage/settings_nvs.c"
+                    "esp_ble_mesh/core/storage/settings_nvs.c"
-                    "esp_ble_mesh/mesh_core/access.c"
+                    "esp_ble_mesh/core/storage/settings_uid.c"
-                    "esp_ble_mesh/mesh_core/adv.c"
+                    "esp_ble_mesh/core/storage/settings.c"
-                    "esp_ble_mesh/mesh_core/beacon.c"
+                    "esp_ble_mesh/core/access.c"
-                    "esp_ble_mesh/mesh_core/cfg_cli.c"
+                    "esp_ble_mesh/core/adv.c"
-                    "esp_ble_mesh/mesh_core/cfg_srv.c"
+                    "esp_ble_mesh/core/beacon.c"
-                    "esp_ble_mesh/mesh_core/crypto.c"
+                    "esp_ble_mesh/core/cfg_cli.c"
-                    "esp_ble_mesh/mesh_core/fast_prov.c"
+                    "esp_ble_mesh/core/cfg_srv.c"
-                    "esp_ble_mesh/mesh_core/friend.c"
+                    "esp_ble_mesh/core/crypto.c"
-                    "esp_ble_mesh/mesh_core/health_cli.c"
+                    "esp_ble_mesh/core/fast_prov.c"
-                    "esp_ble_mesh/mesh_core/health_srv.c"
+                    "esp_ble_mesh/core/friend.c"
-                    "esp_ble_mesh/mesh_core/local_operation.c"
+                    "esp_ble_mesh/core/health_cli.c"
-                    "esp_ble_mesh/mesh_core/lpn.c"
+                    "esp_ble_mesh/core/health_srv.c"
-                    "esp_ble_mesh/mesh_core/main.c"
+                    "esp_ble_mesh/core/local.c"
-                    "esp_ble_mesh/mesh_core/net.c"
+                    "esp_ble_mesh/core/lpn.c"
-                    "esp_ble_mesh/mesh_core/prov.c"
+                    "esp_ble_mesh/core/main.c"
-                    "esp_ble_mesh/mesh_core/provisioner_main.c"
+                    "esp_ble_mesh/core/net.c"
-                    "esp_ble_mesh/mesh_core/provisioner_prov.c"
+                    "esp_ble_mesh/core/prov_node.c"
-                    "esp_ble_mesh/mesh_core/proxy_client.c"
+                    "esp_ble_mesh/core/prov_pvnr.c"
-                    "esp_ble_mesh/mesh_core/proxy_server.c"
+                    "esp_ble_mesh/core/proxy_client.c"
-                    "esp_ble_mesh/mesh_core/settings_uid.c"
+                    "esp_ble_mesh/core/proxy_server.c"
-                    "esp_ble_mesh/mesh_core/settings.c"
+                    "esp_ble_mesh/core/pvnr_mgmt.c"
-                    "esp_ble_mesh/mesh_core/scan.c"
+                    "esp_ble_mesh/core/scan.c"
-                    "esp_ble_mesh/mesh_core/test.c"
+                    "esp_ble_mesh/core/test.c"
-                    "esp_ble_mesh/mesh_core/transport.c"
+                    "esp_ble_mesh/core/transport.c"
-                    "esp_ble_mesh/mesh_models/common/device_property.c"
+                    "esp_ble_mesh/models/common/device_property.c"
-                    "esp_ble_mesh/mesh_models/client/client_common.c"
+                    "esp_ble_mesh/models/client/client_common.c"
-                    "esp_ble_mesh/mesh_models/client/generic_client.c"
+                    "esp_ble_mesh/models/client/generic_client.c"
-                    "esp_ble_mesh/mesh_models/client/lighting_client.c"
+                    "esp_ble_mesh/models/client/lighting_client.c"
-                    "esp_ble_mesh/mesh_models/client/sensor_client.c"
+                    "esp_ble_mesh/models/client/sensor_client.c"
-                    "esp_ble_mesh/mesh_models/client/time_scene_client.c"
+                    "esp_ble_mesh/models/client/time_scene_client.c"
-                    "esp_ble_mesh/mesh_models/server/generic_server.c"
+                    "esp_ble_mesh/models/server/generic_server.c"
-                    "esp_ble_mesh/mesh_models/server/lighting_server.c"
+                    "esp_ble_mesh/models/server/lighting_server.c"
-                    "esp_ble_mesh/mesh_models/server/sensor_server.c"
+                    "esp_ble_mesh/models/server/sensor_server.c"
-                    "esp_ble_mesh/mesh_models/server/server_common.c"
+                    "esp_ble_mesh/models/server/server_common.c"
-                    "esp_ble_mesh/mesh_models/server/state_binding.c"
+                    "esp_ble_mesh/models/server/state_binding.c"
-                    "esp_ble_mesh/mesh_models/server/state_transition.c"
+                    "esp_ble_mesh/models/server/state_transition.c"
-                    "esp_ble_mesh/mesh_models/server/time_scene_server.c")
+                    "esp_ble_mesh/models/server/time_scene_server.c")
     endif()
 
 
@@ -645,7 +645,7 @@ if(CONFIG_BT_ENABLED)
                     "common/btc/profile/esp/blufi/nimble_host/esp_blufi.c")
 
         if(CONFIG_BLE_MESH)
-            list(APPEND srcs "esp_ble_mesh/mesh_core/nimble_host/mesh_bearer_adapt.c")
+            list(APPEND srcs "esp_ble_mesh/core/nimble_host/adapter.c")
         endif()
 
         if(CONFIG_BT_NIMBLE_MESH)

components/bt/esp_ble_mesh/api/esp_ble_mesh_defs.h

@@ -9,10 +9,10 @@
 
 #include <stdint.h>
 
-#include "mesh_config.h"
+#include "mesh/config.h"
-#include "mesh_common.h"
+#include "mesh/common.h"
 #include "proxy_server.h"
-#include "provisioner_main.h"
+#include "pvnr_mgmt.h"
 
 #ifdef __cplusplus
 extern "C" {

components/bt/esp_ble_mesh/btc/btc_ble_mesh_ble.c

@@ -10,7 +10,7 @@
 #include "btc_ble_mesh_ble.h"
 #include "adv.h"
 #include "scan.h"
-#include "mesh_bearer_adapt.h"
+#include "mesh/adapter.h"
 #include "esp_ble_mesh_ble_api.h"
 
 #if CONFIG_BLE_MESH_BLE_COEX_SUPPORT

components/bt/esp_ble_mesh/btc/btc_ble_mesh_config_model.c

@@ -12,7 +12,7 @@
 #include "esp_ble_mesh_config_model_api.h"
 
 #if CONFIG_BLE_MESH_CFG_CLI
-#include "cfg_cli.h"
+#include "mesh/cfg_cli.h"
 
 /* Configuration Client Model related functions */
 

components/bt/esp_ble_mesh/btc/btc_ble_mesh_generic_model.c

@@ -11,7 +11,7 @@
 #include "esp_ble_mesh_generic_model_api.h"
 
 #if CONFIG_BLE_MESH_GENERIC_CLIENT
-#include "generic_client.h"
+#include "mesh/generic_client.h"
 
 /* Generic Client Models related functions */
 

components/bt/esp_ble_mesh/btc/btc_ble_mesh_health_model.c

@@ -12,7 +12,7 @@
 #include "esp_ble_mesh_health_model_api.h"
 
 #if CONFIG_BLE_MESH_HEALTH_CLI
-#include "health_cli.h"
+#include "mesh/health_cli.h"
 
 /* Health Client Model related functions */
 
@@ -453,7 +453,7 @@ void btc_ble_mesh_health_client_cb_handler(btc_msg_t *msg)
 #endif /* CONFIG_BLE_MESH_HEALTH_CLI */
 
 #if CONFIG_BLE_MESH_HEALTH_SRV
-#include "health_srv.h"
+#include "mesh/health_srv.h"
 
 /* Health Server Model related functions */
 

components/bt/esp_ble_mesh/btc/btc_ble_mesh_lighting_model.c

@@ -11,7 +11,7 @@
 #include "esp_ble_mesh_lighting_model_api.h"
 
 #if CONFIG_BLE_MESH_LIGHTING_CLIENT
-#include "lighting_client.h"
+#include "mesh/lighting_client.h"
 
 /* Lighting Client Models related functions */
 

components/bt/esp_ble_mesh/btc/btc_ble_mesh_prov.c

@@ -16,42 +16,42 @@
 #include "btc_ble_mesh_lighting_model.h"
 
 #include "adv.h"
-#include "mesh_kernel.h"
+#include "mesh/kernel.h"
-#include "mesh_proxy.h"
+#include "mesh/proxy.h"
 #include "mesh.h"
 #include "access.h"
-#include "prov.h"
+#include "prov_node.h"
 #include "settings_uid.h"
 #include "proxy_server.h"
 #include "proxy_client.h"
-#include "provisioner_prov.h"
+#include "prov_pvnr.h"
-#include "provisioner_main.h"
+#include "pvnr_mgmt.h"
 
 #if CONFIG_BLE_MESH_CFG_CLI
-#include "cfg_cli.h"
+#include "mesh/cfg_cli.h"
 #endif /* CONFIG_BLE_MESH_CFG_CLI */
 #if CONFIG_BLE_MESH_HEALTH_CLI
-#include "health_cli.h"
+#include "mesh/health_cli.h"
 #endif /* CONFIG_BLE_MESH_HEALTH_CLI */
-#include "cfg_srv.h"
+#include "mesh/cfg_srv.h"
 #if CONFIG_BLE_MESH_HEALTH_SRV
-#include "health_srv.h"
+#include "mesh/health_srv.h"
 #endif /* CONFIG_BLE_MESH_HEALTH_SRV */
 #if CONFIG_BLE_MESH_GENERIC_CLIENT
-#include "generic_client.h"
+#include "mesh/generic_client.h"
 #endif /* CONFIG_BLE_MESH_GENERIC_CLIENT */
 #if CONFIG_BLE_MESH_LIGHTING_CLIENT
-#include "lighting_client.h"
+#include "mesh/lighting_client.h"
 #endif /* CONFIG_BLE_MESH_LIGHTING_CLIENT */
 #if CONFIG_BLE_MESH_SENSOR_CLI
-#include "sensor_client.h"
+#include "mesh/sensor_client.h"
 #endif /* CONFIG_BLE_MESH_SENSOR_CLI */
 #if CONFIG_BLE_MESH_TIME_SCENE_CLIENT
-#include "time_scene_client.h"
+#include "mesh/time_scene_client.h"
 #endif /* CONFIG_BLE_MESH_TIME_SCENE_CLIENT */
-#include "client_common.h"
+#include "mesh/client_common.h"
-#include "state_binding.h"
+#include "mesh/state_binding.h"
-#include "local_operation.h"
+#include "local.h"
 
 #include "esp_ble_mesh_common_api.h"
 #include "esp_ble_mesh_provisioning_api.h"

components/bt/esp_ble_mesh/btc/btc_ble_mesh_sensor_model.c

@@ -11,7 +11,7 @@
 #include "esp_ble_mesh_sensor_model_api.h"
 
 #if CONFIG_BLE_MESH_SENSOR_CLI
-#include "sensor_client.h"
+#include "mesh/sensor_client.h"
 
 /* Sensor Client Models related functions */
 

components/bt/esp_ble_mesh/btc/btc_ble_mesh_time_scene_model.c

@@ -11,7 +11,7 @@
 #include "esp_ble_mesh_time_scene_model_api.h"
 
 #if CONFIG_BLE_MESH_TIME_SCENE_CLIENT
-#include "time_scene_client.h"
+#include "mesh/time_scene_client.h"
 
 /* Time and Scenes Client Models related functions */
 

components/bt/esp_ble_mesh/btc/include/btc_ble_mesh_ble.h

@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 #include "btc/btc_manage.h"
-#include "mesh_bearer_adapt.h"
+#include "mesh/adapter.h"
 #include "esp_ble_mesh_ble_api.h"
 
 #ifdef __cplusplus

components/bt/esp_ble_mesh/btc/include/btc_ble_mesh_prov.h

@@ -8,11 +8,11 @@
 #define _BTC_BLE_MESH_PROV_H_
 
 #include "btc/btc_manage.h"
-#include "mesh_byteorder.h"
+#include "mesh/byteorder.h"
-#include "mesh_config.h"
+#include "mesh/config.h"
-#include "mesh_main.h"
+#include "mesh/main.h"
 #include "fast_prov.h"
-#include "provisioner_prov.h"
+#include "prov_pvnr.h"
 #include "esp_ble_mesh_defs.h"
 
 #ifdef __cplusplus

components/bt/esp_ble_mesh/common/atomic.c

@@ -18,8 +18,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "mesh_atomic.h"
+#include "mesh/atomic.h"
-#include "mesh_mutex.h"
+#include "mesh/mutex.h"
 
 #ifndef CONFIG_ATOMIC_OPERATIONS_BUILTIN
 

components/bt/esp_ble_mesh/common/buf.c

@@ -6,7 +6,7 @@
  */
 
 #include <string.h>
-#include "mesh_common.h"
+#include "mesh/common.h"
 
 int net_buf_id(struct net_buf *buf)
 {

components/bt/esp_ble_mesh/common/common.c

@@ -9,9 +9,9 @@
 
 #include "esp_random.h"
 
-#include "mesh_main.h"
+#include "mesh/main.h"
-#include "client_common.h"
+#include "mesh/client_common.h"
-#include "mesh_common.h"
+#include "mesh/common.h"
 
 IRAM_ATTR void *bt_mesh_malloc(size_t size)
 {

components/bt/esp_ble_mesh/common/include/mesh/atomic.h

@@ -9,7 +9,7 @@
 #ifndef _BLE_MESH_ATOMIC_H_
 #define _BLE_MESH_ATOMIC_H_
 
-#include "mesh_types.h"
+#include "mesh/types.h"
 
 #ifdef __cplusplus
 extern "C" {

components/bt/esp_ble_mesh/common/include/mesh/buf.h

@@ -11,10 +11,10 @@
 #ifndef _BLE_MESH_BUF_H_
 #define _BLE_MESH_BUF_H_
 
-#include "mesh_config.h"
+#include "mesh/config.h"
-#include "mesh_types.h"
+#include "mesh/types.h"
-#include "mesh_slist.h"
+#include "mesh/slist.h"
-#include "mesh_compiler.h"
+#include "mesh/compiler.h"
 
 #ifdef __cplusplus
 extern "C" {

components/bt/esp_ble_mesh/common/include/mesh/byteorder.h

@@ -7,8 +7,8 @@
 #ifndef _BLE_MESH_BYTEORDER_H_
 #define _BLE_MESH_BYTEORDER_H_
 
-#include "mesh_types.h"
+#include "mesh/types.h"
-#include "mesh_trace.h"
+#include "mesh/trace.h"
 
 #ifdef __cplusplus
 extern "C" {

components/bt/esp_ble_mesh/common/include/mesh/common.h

@@ -17,11 +17,11 @@
 #include "esp_attr.h"
 #include "esp_heap_caps.h"
 
-#include "mesh_byteorder.h"
+#include "mesh/byteorder.h"
-#include "mesh_ffs.h"
+#include "mesh/ffs.h"
-#include "mesh_trace.h"
+#include "mesh/trace.h"
-#include "mesh_mutex.h"
+#include "mesh/mutex.h"
-#include "mesh_access.h"
+#include "mesh/access.h"
 
 #ifdef __cplusplus
 extern "C" {

components/bt/esp_ble_mesh/common/include/mesh/dlist.h

@@ -21,7 +21,7 @@
 #define _BLE_MESH_DLIST_H_
 
 #include <stddef.h>
-#include "mesh_util.h"
+#include "mesh/utils.h"
 
 #ifdef __cplusplus
 extern "C" {

components/bt/esp_ble_mesh/common/include/mesh/ffs.h

@@ -8,8 +8,8 @@
 #ifndef _BLE_MESH_FFS_H_
 #define _BLE_MESH_FFS_H_
 
-#include "mesh_types.h"
+#include "mesh/types.h"
-#include "mesh_compiler.h"
+#include "mesh/compiler.h"
 
 #ifdef __cplusplus
 extern "C" {

components/bt/esp_ble_mesh/common/include/mesh/kernel.h

@@ -13,8 +13,8 @@
 #include "freertos/queue.h"
 #include "freertos/semphr.h"
 
-#include "mesh_config.h"
+#include "mesh/config.h"
-#include "mesh_types.h"
+#include "mesh/types.h"
 
 #ifdef __cplusplus
 extern "C" {

components/bt/esp_ble_mesh/common/include/mesh/mutex.h

@@ -7,9 +7,9 @@
 #ifndef _BLE_MESH_MUTEX_H_
 #define _BLE_MESH_MUTEX_H_
 
-#include "mesh_kernel.h"
+#include "mesh/kernel.h"
-#include "mesh_slist.h"
+#include "mesh/slist.h"
-#include "mesh_atomic.h"
+#include "mesh/atomic.h"
 
 #ifdef __cplusplus
 extern "C" {

components/bt/esp_ble_mesh/common/include/mesh/slist.h

@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include "mesh_util.h"
+#include "mesh/utils.h"
 
 #ifdef __cplusplus
 extern "C" {

components/bt/esp_ble_mesh/common/include/mesh/timer.h

@@ -8,9 +8,9 @@
 #ifndef _BLE_MESH_TIMER_H_
 #define _BLE_MESH_TIMER_H_
 
-#include "mesh_types.h"
+#include "mesh/types.h"
-#include "mesh_slist.h"
+#include "mesh/slist.h"
-#include "mesh_atomic.h"
+#include "mesh/atomic.h"
 
 #ifdef __cplusplus
 extern "C" {

components/bt/esp_ble_mesh/common/include/mesh/trace.h

@@ -11,7 +11,7 @@
 
 #include <assert.h>
 #include "esp_log.h"
-#include "mesh_util.h"
+#include "mesh/utils.h"
 #include "esp_rom_sys.h"
 
 #ifdef __cplusplus

components/bt/esp_ble_mesh/common/include/mesh/utils.h

@@ -11,12 +11,12 @@
  * Misc utilities usable by the kernel and application code.
  */
 
-#ifndef _BLE_MESH_UTIL_H_
+#ifndef _BLE_MESH_UTILS_H_
-#define _BLE_MESH_UTIL_H_
+#define _BLE_MESH_UTILS_H_
 
 #include <stddef.h>
 #include "esp_bit_defs.h"
-#include "mesh_types.h"
+#include "mesh/types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -188,4 +188,4 @@ void mem_rcopy(uint8_t *dst, uint8_t const *src, uint16_t len);
 }
 #endif
 
-#endif /* _BLE_MESH_UTIL_H_ */
+#endif /* _BLE_MESH_UTILS_H_ */

components/bt/esp_ble_mesh/common/kernel.c

@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "mesh_kernel.h"
+#include "mesh/kernel.h"
 
 void k_sleep(int32_t duration)
 {

components/bt/esp_ble_mesh/common/mutex.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "mesh_common.h"
+#include "mesh/common.h"
 
 static bt_mesh_mutex_t alarm_lock;
 static bt_mesh_mutex_t list_lock;

components/bt/esp_ble_mesh/common/timer.c

@@ -12,8 +12,8 @@
 #include "osi/alarm.h"
 #include "osi/hash_functions.h"
 
-#include "mesh_common.h"
+#include "mesh/common.h"
-#include "provisioner_prov.h"
+#include "prov_pvnr.h"
 
 static hash_map_t *bm_alarm_hash_map;
 static const size_t BLE_MESH_GENERAL_ALARM_HASH_MAP_SIZE = 20 + CONFIG_BLE_MESH_PBA_SAME_TIME + \

components/bt/esp_ble_mesh/common/utils.c

@@ -9,9 +9,9 @@
 #include <string.h>
 #include <errno.h>
 
-#include "mesh_types.h"
+#include "mesh/types.h"
-#include "mesh_util.h"
+#include "mesh/utils.h"
-#include "mesh_trace.h"
+#include "mesh/trace.h"
 
 const char *bt_hex(const void *buf, size_t len)
 {

components/bt/esp_ble_mesh/core/access.c

@@ -15,10 +15,10 @@
 #include "transport.h"
 #include "access.h"
 #include "foundation.h"
-#include "mesh_main.h"
+#include "mesh/main.h"
-#include "mesh_common.h"
+#include "mesh/common.h"
 #include "fast_prov.h"
-#include "provisioner_main.h"
+#include "pvnr_mgmt.h"
 
 #define BLE_MESH_SDU_MAX_LEN    384
 

components/bt/esp_ble_mesh/core/adv.c

@@ -11,18 +11,18 @@
 #include <string.h>
 #include <errno.h>
 
-#include "mesh_kernel.h"
+#include "mesh/kernel.h"
 #include "mesh.h"
-#include "mesh_hci.h"
+#include "mesh/hci.h"
-#include "mesh_common.h"
+#include "mesh/common.h"
 #include "adv.h"
 #include "beacon.h"
-#include "prov.h"
+#include "prov_node.h"
 #include "foundation.h"
 #include "proxy_server.h"
 #include "proxy_client.h"
-#include "provisioner_prov.h"
+#include "prov_pvnr.h"
-#include "mesh_bearer_adapt.h"
+#include "mesh/adapter.h"
 
 /* Convert from ms to 0.625ms units */
 #define ADV_SCAN_UNIT(_ms)  ((_ms) * 8 / 5)

components/bt/esp_ble_mesh/core/adv.h

@@ -10,8 +10,8 @@
 #ifndef _ADV_H_
 #define _ADV_H_
 
-#include "mesh_access.h"
+#include "mesh/access.h"
-#include "mesh_bearer_adapt.h"
+#include "mesh/adapter.h"
 
 #ifdef __cplusplus
 extern "C" {

components/bt/esp_ble_mesh/core/beacon.c

@@ -12,15 +12,15 @@
 
 #include "adv.h"
 #include "mesh.h"
-#include "prov.h"
+#include "prov_node.h"
 #include "crypto.h"
 #include "beacon.h"
 #include "access.h"
 #include "foundation.h"
 #include "proxy_client.h"
-#include "mesh_main.h"
+#include "mesh/main.h"
-#include "provisioner_prov.h"
+#include "prov_pvnr.h"
-#include "provisioner_main.h"
+#include "pvnr_mgmt.h"
 
 #if defined(CONFIG_BLE_MESH_UNPROVISIONED_BEACON_INTERVAL)
 #define UNPROVISIONED_INTERVAL     K_SECONDS(CONFIG_BLE_MESH_UNPROVISIONED_BEACON_INTERVAL)

components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c

@@ -23,10 +23,10 @@
 #include <tinycrypt/aes.h>
 #include <tinycrypt/constants.h>
 
-#include "mesh_hci.h"
+#include "mesh/hci.h"
-#include "mesh_bearer_adapt.h"
+#include "mesh/adapter.h"
-#include "mesh_common.h"
+#include "mesh/common.h"
-#include "provisioner_prov.h"
+#include "prov_pvnr.h"
 
 struct bt_mesh_dev bt_mesh_dev;
 

components/bt/esp_ble_mesh/core/cfg_cli.c

@@ -14,10 +14,10 @@
 #include "btc_ble_mesh_config_model.h"
 
 #include "mesh.h"
-#include "mesh_config.h"
+#include "mesh/config.h"
 #include "foundation.h"
-#include "mesh_common.h"
+#include "mesh/common.h"
-#include "cfg_cli.h"
+#include "mesh/cfg_cli.h"
 
 #if CONFIG_BLE_MESH_CFG_CLI
 

components/bt/esp_ble_mesh/core/cfg_srv.c

@@ -23,10 +23,10 @@
 #include "foundation.h"
 #include "friend.h"
 #include "settings.h"
-#include "cfg_srv.h"
+#include "mesh/cfg_srv.h"
 #include "proxy_server.h"
-#include "mesh_main.h"
+#include "mesh/main.h"
-#include "mesh_common.h"
+#include "mesh/common.h"
 
 #define DEFAULT_TTL 7
 

components/bt/esp_ble_mesh/core/crypto.c

@@ -16,8 +16,8 @@
 #include <tinycrypt/cmac_mode.h>
 
 #include "crypto.h"
-#include "mesh_common.h"
+#include "mesh/common.h"
-#include "mesh_bearer_adapt.h"
+#include "mesh/adapter.h"
 
 #define NET_MIC_LEN(pdu) (((pdu)[1] & 0x80) ? 8 : 4)
 #define APP_MIC_LEN(aszmic) ((aszmic) ? 8 : 4)

components/bt/esp_ble_mesh/core/crypto.h

@@ -11,7 +11,7 @@
 #define _CRYPTO_H_
 
 #include <string.h>
-#include "mesh_buf.h"
+#include "mesh/buf.h"
 
 #ifdef __cplusplus
 extern "C" {

components/bt/esp_ble_mesh/core/fast_prov.c

@@ -8,13 +8,13 @@
 #include <errno.h>
 
 #include "mesh.h"
-#include "mesh_common.h"
+#include "mesh/common.h"
 #include "access.h"
 #include "beacon.h"
 #include "foundation.h"
 #include "proxy_client.h"
-#include "provisioner_prov.h"
+#include "prov_pvnr.h"
-#include "provisioner_main.h"
+#include "pvnr_mgmt.h"
 
 #if CONFIG_BLE_MESH_FAST_PROV
 

components/bt/esp_ble_mesh/core/foundation.h

@@ -8,7 +8,7 @@
 #ifndef _FOUNDATION_H_
 #define _FOUNDATION_H_
 
-#include "mesh_byteorder.h"
+#include "mesh/byteorder.h"
 #include "net.h"
 
 #ifdef __cplusplus

components/bt/esp_ble_mesh/core/friend.c

@@ -17,8 +17,8 @@
 #include "access.h"
 #include "friend.h"
 #include "foundation.h"
-#include "mesh_main.h"
+#include "mesh/main.h"
-#include "provisioner_main.h"
+#include "pvnr_mgmt.h"
 
 #ifdef CONFIG_BLE_MESH_FRIEND
 

components/bt/esp_ble_mesh/core/health_cli.c

@@ -12,12 +12,12 @@
 
 #include "btc_ble_mesh_health_model.h"
 
-#include "mesh_config.h"
+#include "mesh/config.h"
 #include "foundation.h"
-#include "mesh_common.h"
+#include "mesh/common.h"
 
 #if CONFIG_BLE_MESH_HEALTH_CLI
-#include "health_cli.h"
+#include "mesh/health_cli.h"
 
 static const bt_mesh_client_op_pair_t health_op_pair[] = {
     { OP_HEALTH_FAULT_GET,   OP_HEALTH_FAULT_STATUS  },

components/bt/esp_ble_mesh/core/health_srv.c

@@ -14,10 +14,10 @@
 
 #include "access.h"
 #include "foundation.h"
-#include "mesh_common.h"
+#include "mesh/common.h"
 
 #if CONFIG_BLE_MESH_HEALTH_SRV
-#include "health_srv.h"
+#include "mesh/health_srv.h"
 
 #define HEALTH_TEST_STANDARD    0x00
 

components/bt/esp_ble_mesh/core/include/mesh/access.h

@@ -11,9 +11,9 @@
 #ifndef _BLE_MESH_ACCESS_H_
 #define _BLE_MESH_ACCESS_H_
 
-#include "mesh_config.h"
+#include "mesh/config.h"
-#include "mesh_buf.h"
+#include "mesh/buf.h"
-#include "mesh_timer.h"
+#include "mesh/timer.h"
 
 /**
  * @brief Bluetooth Mesh Access Layer

components/bt/esp_ble_mesh/core/include/mesh/adapter.h

@@ -6,15 +6,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _BLE_MESH_BEARER_ADAPT_H_
+#ifndef _BLE_MESH_ADAPTER_H_
-#define _BLE_MESH_BEARER_ADAPT_H_
+#define _BLE_MESH_ADAPTER_H_
 
 #include <sys/types.h>
-#include "mesh_config.h"
+#include "mesh/config.h"
-#include "mesh_types.h"
+#include "mesh/types.h"
-#include "mesh_util.h"
+#include "mesh/utils.h"
-#include "mesh_uuid.h"
+#include "mesh/uuid.h"
-#include "mesh_buf.h"
+#include "mesh/buf.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -803,4 +803,4 @@ int bt_mesh_update_exceptional_list(uint8_t sub_code, uint32_t type, void *info)
 }
 #endif
 
-#endif /* _BLE_MESH_BEARER_ADAPT_H_ */
+#endif /* _BLE_MESH_ADAPTER_H_ */

components/bt/esp_ble_mesh/core/include/mesh/cfg_cli.h

@@ -11,7 +11,7 @@
 #ifndef _BLE_MESH_CFG_CLI_H_
 #define _BLE_MESH_CFG_CLI_H_
 
-#include "client_common.h"
+#include "mesh/client_common.h"
 
 /**
  * @brief Bluetooth Mesh

components/bt/esp_ble_mesh/core/include/mesh/cfg_srv.h

@@ -10,7 +10,7 @@
 #ifndef _BLE_MESH_CFG_SRV_H_
 #define _BLE_MESH_CFG_SRV_H_
 
-#include "mesh_access.h"
+#include "mesh/access.h"
 
 /**
  * @brief Bluetooth Mesh

components/bt/esp_ble_mesh/core/include/mesh/hci.h

@@ -7,8 +7,8 @@
 #ifndef _BLE_MESH_HCI_H_
 #define _BLE_MESH_HCI_H_
 
-#include "mesh_atomic.h"
+#include "mesh/atomic.h"
-#include "mesh_bearer_adapt.h"
+#include "mesh/adapter.h"
 
 #ifdef __cplusplus
 extern "C" {

components/bt/esp_ble_mesh/core/include/mesh/health_cli.h

@@ -11,7 +11,7 @@
 #ifndef _BLE_MESH_HEALTH_CLI_H_
 #define _BLE_MESH_HEALTH_CLI_H_
 
-#include "client_common.h"
+#include "mesh/client_common.h"
 
 /**
  * @brief Bluetooth Mesh

components/bt/esp_ble_mesh/core/include/mesh/health_srv.h

@@ -10,7 +10,7 @@
 #ifndef _BLE_MESH_HEALTH_SRV_H_
 #define _BLE_MESH_HEALTH_SRV_H_
 
-#include "mesh_access.h"
+#include "mesh/access.h"
 
 /**
  * @brief Bluetooth Mesh Health Server Model

components/bt/esp_ble_mesh/core/include/mesh/main.h

@@ -11,7 +11,7 @@
 #ifndef _BLE_MESH_MAIN_H_
 #define _BLE_MESH_MAIN_H_
 
-#include "mesh_access.h"
+#include "mesh/access.h"
 
 /**
  * @brief Bluetooth Mesh Provisioning

components/bt/esp_ble_mesh/core/include/mesh/uuid.h

@@ -17,7 +17,7 @@
  * @{
  */
 
-#include "mesh_util.h"
+#include "mesh/utils.h"
 
 #ifdef __cplusplus
 extern "C" {

components/bt/esp_ble_mesh/core/local.c

@@ -15,7 +15,7 @@
 #include "access.h"
 #include "foundation.h"
 #include "transport.h"
-#include "mesh_main.h"
+#include "mesh/main.h"
 #include "settings.h"
 
 static struct bt_mesh_model *find_model(uint16_t elem_addr, uint16_t cid, uint16_t mod_id)

components/bt/esp_ble_mesh/core/local.h

@@ -7,10 +7,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _LOCAL_OPERATION_H_
+#ifndef _LOCAL_H_
-#define _LOCAL_OPERATION_H_
+#define _LOCAL_H_
 
-#include "mesh_types.h"
+#include "mesh/types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -38,4 +38,4 @@ int bt_mesh_node_bind_app_key_to_model(uint16_t elem_addr, uint16_t mod_id,
 }
 #endif
 
-#endif /* _LOCAL_OPERATION_H_ */
+#endif /* _LOCAL_H_ */

components/bt/esp_ble_mesh/core/lpn.c

@@ -18,8 +18,8 @@
 #include "beacon.h"
 #include "lpn.h"
 #include "foundation.h"
-#include "mesh_main.h"
+#include "mesh/main.h"
-#include "cfg_srv.h"
+#include "mesh/cfg_srv.h"
 
 #ifdef CONFIG_BLE_MESH_LOW_POWER
 

components/bt/esp_ble_mesh/core/main.c

@@ -12,7 +12,7 @@
 
 #include "adv.h"
 #include "scan.h"
-#include "prov.h"
+#include "prov_node.h"
 #include "beacon.h"
 #include "lpn.h"
 #include "friend.h"
@@ -21,12 +21,12 @@
 #include "foundation.h"
 #include "settings.h"
 #include "mesh.h"
-#include "mesh_hci.h"
+#include "mesh/hci.h"
-#include "mesh_common.h"
+#include "mesh/common.h"
 #include "proxy_client.h"
 #include "proxy_server.h"
-#include "provisioner_prov.h"
+#include "prov_pvnr.h"
-#include "provisioner_main.h"
+#include "pvnr_mgmt.h"
 
 static bool mesh_init = false;
 

components/bt/esp_ble_mesh/core/net.c

@@ -22,10 +22,10 @@
 #include "foundation.h"
 #include "beacon.h"
 #include "settings.h"
-#include "prov.h"
+#include "prov_node.h"
 #include "proxy_client.h"
 #include "proxy_server.h"
-#include "provisioner_main.h"
+#include "pvnr_mgmt.h"
 
 /* Minimum valid Mesh Network PDU length. The Network headers
  * themselves take up 9 bytes. After that there is a minumum of 1 byte

components/bt/esp_ble_mesh/core/net.h

@@ -10,7 +10,7 @@
 #ifndef _NET_H_
 #define _NET_H_
 
-#include "mesh_access.h"
+#include "mesh/access.h"
 
 #ifdef __cplusplus
 extern "C" {