diff --git a/examples/09_a2dp/Makefile b/examples/bluetooth/a2dp_sink/Makefile
similarity index 86%
rename from examples/09_a2dp/Makefile
rename to examples/bluetooth/a2dp_sink/Makefile
index 1e91bbb89..aa0fd4fe0 100755
--- a/examples/09_a2dp/Makefile
+++ b/examples/bluetooth/a2dp_sink/Makefile
@@ -3,7 +3,7 @@
 # project subdirectory.
 #
 
-PROJECT_NAME := bluedroid_demos
+PROJECT_NAME := a2dp_sink
 
 COMPONENT_ADD_INCLUDEDIRS := components/include
 
diff --git a/examples/09_a2dp/README.rst b/examples/bluetooth/a2dp_sink/README.rst
similarity index 75%
rename from examples/09_a2dp/README.rst
rename to examples/bluetooth/a2dp_sink/README.rst
index 49306a2fd..734791bbd 100755
--- a/examples/09_a2dp/README.rst
+++ b/examples/bluetooth/a2dp_sink/README.rst
@@ -1,4 +1,4 @@
-ESP-IDF 09 A2DP
+ESP-IDF A2DP-SINK
 =======================
 
 Demo of A2DP audio sink role
diff --git a/examples/09_a2dp/components/bluedroid_demos/app_core/bt_app_main.c b/examples/bluetooth/a2dp_sink/components/bluedroid_demos/app_core/bt_app_main.c
similarity index 100%
rename from examples/09_a2dp/components/bluedroid_demos/app_core/bt_app_main.c
rename to examples/bluetooth/a2dp_sink/components/bluedroid_demos/app_core/bt_app_main.c
diff --git a/examples/09_a2dp/components/bluedroid_demos/app_project/SampleAV.c b/examples/bluetooth/a2dp_sink/components/bluedroid_demos/app_project/SampleAV.c
similarity index 95%
rename from examples/09_a2dp/components/bluedroid_demos/app_project/SampleAV.c
rename to examples/bluetooth/a2dp_sink/components/bluedroid_demos/app_project/SampleAV.c
index 9fd5560ad..55f37def4 100644
--- a/examples/09_a2dp/components/bluedroid_demos/app_project/SampleAV.c
+++ b/examples/bluetooth/a2dp_sink/components/bluedroid_demos/app_project/SampleAV.c
@@ -8,15 +8,16 @@
 #include "freertos/timers.h"
 
 #include "esp_system.h"
-// #include "EspAudio.h"
-// #include "EspAudioCom.h"
 
 #include "bt_app_common.h"
 #include "esp_bt_main.h"
+#include "esp_bt_device.h"
 #include "esp_gap_bt_api.h"
 #include "esp_a2dp_api.h"
 #include "esp_avrc_api.h"
 
+static uint32_t m_pkt_cnt = 0;
+
 typedef enum {
     BT_APP_EVT_STACK_ON = 0xa0,
     BT_APP_EVT_MAX
@@ -52,6 +53,9 @@ static void bt_app_a2d_cb(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param)
 
 static void bt_app_a2d_data_cb(const uint8_t *data, uint32_t len)
 {
+    if (++m_pkt_cnt % 50 == 0) {
+        BT_APP_TRACE_ERROR("audio data pkt cnt %u\n", m_pkt_cnt);
+    }
     // EspAudioPlayerStreamWrite((uint8_t *)data, len, 10);
 }
 
@@ -77,7 +81,7 @@ static void bt_app_handle_evt(uint16_t event, void *p_param)
     case BT_APP_EVT_STACK_ON: {
         char *dev_name = "ESP_SPEAKER";
 
-	esp_bt_gap_set_device_name(dev_name);
+	esp_bt_dev_set_device_name(dev_name);
 
         esp_a2d_register_callback(&bt_app_a2d_cb);
         esp_a2d_register_data_callback(bt_app_a2d_data_cb);
@@ -144,13 +148,11 @@ void bt_app_handle_rc_evt(uint16_t event, void *p_param)
 void app_main_entry(void)
 {
     esp_err_t init, enable;
-    // init = esp_bt_init_stack();
     init = esp_bluedroid_init();
     if (init != ESP_OK) {
         return;
     }
 
-    // enable = esp_bt_enable_stack();
     enable = esp_bluedroid_enable();
     if (enable != ESP_OK) {
         return;
diff --git a/examples/09_a2dp/components/bluedroid_demos/component.mk b/examples/bluetooth/a2dp_sink/components/bluedroid_demos/component.mk
similarity index 100%
rename from examples/09_a2dp/components/bluedroid_demos/component.mk
rename to examples/bluetooth/a2dp_sink/components/bluedroid_demos/component.mk
diff --git a/examples/09_a2dp/components/bluedroid_demos/include/bt_app_common.h b/examples/bluetooth/a2dp_sink/components/bluedroid_demos/include/bt_app_common.h
similarity index 100%
rename from examples/09_a2dp/components/bluedroid_demos/include/bt_app_common.h
rename to examples/bluetooth/a2dp_sink/components/bluedroid_demos/include/bt_app_common.h
diff --git a/examples/09_a2dp/gen_misch.sh b/examples/bluetooth/a2dp_sink/gen_misch.sh
similarity index 100%
rename from examples/09_a2dp/gen_misch.sh
rename to examples/bluetooth/a2dp_sink/gen_misch.sh
diff --git a/examples/09_a2dp/main/component.mk b/examples/bluetooth/a2dp_sink/main/component.mk
similarity index 100%
rename from examples/09_a2dp/main/component.mk
rename to examples/bluetooth/a2dp_sink/main/component.mk
diff --git a/examples/09_a2dp/main/demo_main.c b/examples/bluetooth/a2dp_sink/main/demo_main.c
similarity index 100%
rename from examples/09_a2dp/main/demo_main.c
rename to examples/bluetooth/a2dp_sink/main/demo_main.c
diff --git a/examples/09_a2dp/main/include/psramApi.h b/examples/bluetooth/a2dp_sink/main/include/psramApi.h
similarity index 100%
rename from examples/09_a2dp/main/include/psramApi.h
rename to examples/bluetooth/a2dp_sink/main/include/psramApi.h