diff --git a/.github/ALL_BSP_COMPILE.json b/.github/ALL_BSP_COMPILE.json
index b129c97bfde..5f20ba39c18 100644
--- a/.github/ALL_BSP_COMPILE.json
+++ b/.github/ALL_BSP_COMPILE.json
@@ -457,7 +457,7 @@
       "RTT_BSP": "ESP32C3",
       "RTT_TOOL_CHAIN": "sourcery-riscv32-esp32",
       "SUB_RTT_BSP": [
-        "ESP32_C3"
+        "ESP/ESP32_C3"
       ]
     },
     {
diff --git a/bsp/ESP32_C3/.ci/attachconfig/ci.attachconfig.yml b/bsp/ESP/ESP32_C3/.ci/attachconfig/ci.attachconfig.yml
similarity index 100%
rename from bsp/ESP32_C3/.ci/attachconfig/ci.attachconfig.yml
rename to bsp/ESP/ESP32_C3/.ci/attachconfig/ci.attachconfig.yml
diff --git a/bsp/ESP32_C3/.config b/bsp/ESP/ESP32_C3/.config
similarity index 100%
rename from bsp/ESP32_C3/.config
rename to bsp/ESP/ESP32_C3/.config
diff --git a/bsp/ESP32_C3/Kconfig b/bsp/ESP/ESP32_C3/Kconfig
similarity index 78%
rename from bsp/ESP32_C3/Kconfig
rename to bsp/ESP/ESP32_C3/Kconfig
index 09feb04acdc..49c80301b3b 100644
--- a/bsp/ESP32_C3/Kconfig
+++ b/bsp/ESP/ESP32_C3/Kconfig
@@ -8,4 +8,4 @@ PKGS_DIR := packages
 
 source "$(RTT_DIR)/Kconfig"
 osource "$PKGS_DIR/Kconfig"
-rsource "drivers/Kconfig"
+rsource "../libraries/drivers/Kconfig"
diff --git a/bsp/ESP32_C3/README.md b/bsp/ESP/ESP32_C3/README.md
similarity index 100%
rename from bsp/ESP32_C3/README.md
rename to bsp/ESP/ESP32_C3/README.md
diff --git a/bsp/ESP32_C3/README_ZH.md b/bsp/ESP/ESP32_C3/README_ZH.md
similarity index 100%
rename from bsp/ESP32_C3/README_ZH.md
rename to bsp/ESP/ESP32_C3/README_ZH.md
diff --git a/bsp/ESP32_C3/SConscript b/bsp/ESP/ESP32_C3/SConscript
similarity index 100%
rename from bsp/ESP32_C3/SConscript
rename to bsp/ESP/ESP32_C3/SConscript
diff --git a/bsp/ESP32_C3/SConstruct b/bsp/ESP/ESP32_C3/SConstruct
similarity index 100%
rename from bsp/ESP32_C3/SConstruct
rename to bsp/ESP/ESP32_C3/SConstruct
diff --git a/bsp/ESP32_C3/builtin_imgs/.gitignore b/bsp/ESP/ESP32_C3/builtin_imgs/.gitignore
similarity index 100%
rename from bsp/ESP32_C3/builtin_imgs/.gitignore
rename to bsp/ESP/ESP32_C3/builtin_imgs/.gitignore
diff --git a/bsp/ESP32_C3/builtin_imgs/bootloader.bin b/bsp/ESP/ESP32_C3/builtin_imgs/bootloader.bin
similarity index 100%
rename from bsp/ESP32_C3/builtin_imgs/bootloader.bin
rename to bsp/ESP/ESP32_C3/builtin_imgs/bootloader.bin
diff --git a/bsp/ESP32_C3/builtin_imgs/partition-table.bin b/bsp/ESP/ESP32_C3/builtin_imgs/partition-table.bin
similarity index 100%
rename from bsp/ESP32_C3/builtin_imgs/partition-table.bin
rename to bsp/ESP/ESP32_C3/builtin_imgs/partition-table.bin
diff --git a/bsp/ESP32_C3/docker/Dockerfile b/bsp/ESP/ESP32_C3/docker/Dockerfile
similarity index 100%
rename from bsp/ESP32_C3/docker/Dockerfile
rename to bsp/ESP/ESP32_C3/docker/Dockerfile
diff --git a/bsp/ESP32_C3/esp32c3.gpb b/bsp/ESP/ESP32_C3/esp32c3.gpb
similarity index 100%
rename from bsp/ESP32_C3/esp32c3.gpb
rename to bsp/ESP/ESP32_C3/esp32c3.gpb
diff --git a/bsp/ESP32_C3/idf_port/SConscript b/bsp/ESP/ESP32_C3/idf_port/SConscript
similarity index 100%
rename from bsp/ESP32_C3/idf_port/SConscript
rename to bsp/ESP/ESP32_C3/idf_port/SConscript
diff --git a/bsp/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig.h b/bsp/ESP/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig.h
similarity index 100%
rename from bsp/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig.h
rename to bsp/ESP/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig.h
diff --git a/bsp/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig_arch.h b/bsp/ESP/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig_arch.h
similarity index 100%
rename from bsp/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig_arch.h
rename to bsp/ESP/ESP32_C3/idf_port/include/freertos/FreeRTOSConfig_arch.h
diff --git a/bsp/ESP32_C3/idf_port/include/freertos/freertos_tasks_c_additions.h b/bsp/ESP/ESP32_C3/idf_port/include/freertos/freertos_tasks_c_additions.h
similarity index 100%
rename from bsp/ESP32_C3/idf_port/include/freertos/freertos_tasks_c_additions.h
rename to bsp/ESP/ESP32_C3/idf_port/include/freertos/freertos_tasks_c_additions.h
diff --git a/bsp/ESP32_C3/idf_port/include/freertos/portmacro.h b/bsp/ESP/ESP32_C3/idf_port/include/freertos/portmacro.h
similarity index 100%
rename from bsp/ESP32_C3/idf_port/include/freertos/portmacro.h
rename to bsp/ESP/ESP32_C3/idf_port/include/freertos/portmacro.h
diff --git a/bsp/ESP32_C3/idf_port/include/freertos/task_snapshot.h b/bsp/ESP/ESP32_C3/idf_port/include/freertos/task_snapshot.h
similarity index 100%
rename from bsp/ESP32_C3/idf_port/include/freertos/task_snapshot.h
rename to bsp/ESP/ESP32_C3/idf_port/include/freertos/task_snapshot.h
diff --git a/bsp/ESP32_C3/idf_port/ld/memory.ld b/bsp/ESP/ESP32_C3/idf_port/ld/memory.ld
similarity index 100%
rename from bsp/ESP32_C3/idf_port/ld/memory.ld
rename to bsp/ESP/ESP32_C3/idf_port/ld/memory.ld
diff --git a/bsp/ESP32_C3/idf_port/ld/sections.ld b/bsp/ESP/ESP32_C3/idf_port/ld/sections.ld
similarity index 100%
rename from bsp/ESP32_C3/idf_port/ld/sections.ld
rename to bsp/ESP/ESP32_C3/idf_port/ld/sections.ld
diff --git a/bsp/ESP32_C3/idf_port/src/port.c b/bsp/ESP/ESP32_C3/idf_port/src/port.c
similarity index 100%
rename from bsp/ESP32_C3/idf_port/src/port.c
rename to bsp/ESP/ESP32_C3/idf_port/src/port.c
diff --git a/bsp/ESP32_C3/idf_port/src/port_common.c b/bsp/ESP/ESP32_C3/idf_port/src/port_common.c
similarity index 100%
rename from bsp/ESP32_C3/idf_port/src/port_common.c
rename to bsp/ESP/ESP32_C3/idf_port/src/port_common.c
diff --git a/bsp/ESP32_C3/idf_port/src/rt-thread_balance_stub.c b/bsp/ESP/ESP32_C3/idf_port/src/rt-thread_balance_stub.c
similarity index 100%
rename from bsp/ESP32_C3/idf_port/src/rt-thread_balance_stub.c
rename to bsp/ESP/ESP32_C3/idf_port/src/rt-thread_balance_stub.c
diff --git a/bsp/ESP32_C3/idf_port/src/x509_crt_bundle.S b/bsp/ESP/ESP32_C3/idf_port/src/x509_crt_bundle.S
similarity index 100%
rename from bsp/ESP32_C3/idf_port/src/x509_crt_bundle.S
rename to bsp/ESP/ESP32_C3/idf_port/src/x509_crt_bundle.S
diff --git a/bsp/ESP32_C3/images/flash_download_tools.png b/bsp/ESP/ESP32_C3/images/flash_download_tools.png
similarity index 100%
rename from bsp/ESP32_C3/images/flash_download_tools.png
rename to bsp/ESP/ESP32_C3/images/flash_download_tools.png
diff --git a/bsp/ESP32_C3/images/hx_shang.png b/bsp/ESP/ESP32_C3/images/hx_shang.png
similarity index 100%
rename from bsp/ESP32_C3/images/hx_shang.png
rename to bsp/ESP/ESP32_C3/images/hx_shang.png
diff --git a/bsp/ESP32_C3/images/luatos_esp32c3.png b/bsp/ESP/ESP32_C3/images/luatos_esp32c3.png
similarity index 100%
rename from bsp/ESP32_C3/images/luatos_esp32c3.png
rename to bsp/ESP/ESP32_C3/images/luatos_esp32c3.png
diff --git a/bsp/ESP32_C3/main/SConscript b/bsp/ESP/ESP32_C3/main/SConscript
similarity index 100%
rename from bsp/ESP32_C3/main/SConscript
rename to bsp/ESP/ESP32_C3/main/SConscript
diff --git a/bsp/ESP32_C3/main/main.c b/bsp/ESP/ESP32_C3/main/main.c
similarity index 100%
rename from bsp/ESP32_C3/main/main.c
rename to bsp/ESP/ESP32_C3/main/main.c
diff --git a/bsp/ESP32_C3/rtconfig.h b/bsp/ESP/ESP32_C3/rtconfig.h
similarity index 100%
rename from bsp/ESP32_C3/rtconfig.h
rename to bsp/ESP/ESP32_C3/rtconfig.h
diff --git a/bsp/ESP32_C3/rtconfig.py b/bsp/ESP/ESP32_C3/rtconfig.py
similarity index 100%
rename from bsp/ESP32_C3/rtconfig.py
rename to bsp/ESP/ESP32_C3/rtconfig.py
diff --git a/bsp/ESP32_C3/drivers/Kconfig b/bsp/ESP/libraries/drivers/Kconfig
similarity index 100%
rename from bsp/ESP32_C3/drivers/Kconfig
rename to bsp/ESP/libraries/drivers/Kconfig
diff --git a/bsp/ESP32_C3/drivers/SConscript b/bsp/ESP/libraries/drivers/SConscript
similarity index 100%
rename from bsp/ESP32_C3/drivers/SConscript
rename to bsp/ESP/libraries/drivers/SConscript
diff --git a/bsp/ESP32_C3/drivers/board.c b/bsp/ESP/libraries/drivers/board.c
similarity index 100%
rename from bsp/ESP32_C3/drivers/board.c
rename to bsp/ESP/libraries/drivers/board.c
diff --git a/bsp/ESP32_C3/drivers/board.h b/bsp/ESP/libraries/drivers/board.h
similarity index 100%
rename from bsp/ESP32_C3/drivers/board.h
rename to bsp/ESP/libraries/drivers/board.h
diff --git a/bsp/ESP32_C3/drivers/drv_adc.c b/bsp/ESP/libraries/drivers/drv_adc.c
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_adc.c
rename to bsp/ESP/libraries/drivers/drv_adc.c
diff --git a/bsp/ESP32_C3/drivers/drv_adc.h b/bsp/ESP/libraries/drivers/drv_adc.h
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_adc.h
rename to bsp/ESP/libraries/drivers/drv_adc.h
diff --git a/bsp/ESP32_C3/drivers/drv_gpio.c b/bsp/ESP/libraries/drivers/drv_gpio.c
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_gpio.c
rename to bsp/ESP/libraries/drivers/drv_gpio.c
diff --git a/bsp/ESP32_C3/drivers/drv_gpio.h b/bsp/ESP/libraries/drivers/drv_gpio.h
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_gpio.h
rename to bsp/ESP/libraries/drivers/drv_gpio.h
diff --git a/bsp/ESP32_C3/drivers/drv_hw_i2c.c b/bsp/ESP/libraries/drivers/drv_hw_i2c.c
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_hw_i2c.c
rename to bsp/ESP/libraries/drivers/drv_hw_i2c.c
diff --git a/bsp/ESP32_C3/drivers/drv_hw_i2c.h b/bsp/ESP/libraries/drivers/drv_hw_i2c.h
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_hw_i2c.h
rename to bsp/ESP/libraries/drivers/drv_hw_i2c.h
diff --git a/bsp/ESP32_C3/drivers/drv_pwm.c b/bsp/ESP/libraries/drivers/drv_pwm.c
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_pwm.c
rename to bsp/ESP/libraries/drivers/drv_pwm.c
diff --git a/bsp/ESP32_C3/drivers/drv_pwm.h b/bsp/ESP/libraries/drivers/drv_pwm.h
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_pwm.h
rename to bsp/ESP/libraries/drivers/drv_pwm.h
diff --git a/bsp/ESP32_C3/drivers/drv_spi.c b/bsp/ESP/libraries/drivers/drv_spi.c
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_spi.c
rename to bsp/ESP/libraries/drivers/drv_spi.c
diff --git a/bsp/ESP32_C3/drivers/drv_spi.h b/bsp/ESP/libraries/drivers/drv_spi.h
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_spi.h
rename to bsp/ESP/libraries/drivers/drv_spi.h
diff --git a/bsp/ESP32_C3/drivers/drv_sw_i2c.c b/bsp/ESP/libraries/drivers/drv_sw_i2c.c
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_sw_i2c.c
rename to bsp/ESP/libraries/drivers/drv_sw_i2c.c
diff --git a/bsp/ESP32_C3/drivers/drv_sw_i2c.h b/bsp/ESP/libraries/drivers/drv_sw_i2c.h
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_sw_i2c.h
rename to bsp/ESP/libraries/drivers/drv_sw_i2c.h
diff --git a/bsp/ESP32_C3/drivers/drv_timer.c b/bsp/ESP/libraries/drivers/drv_timer.c
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_timer.c
rename to bsp/ESP/libraries/drivers/drv_timer.c
diff --git a/bsp/ESP32_C3/drivers/drv_timer.h b/bsp/ESP/libraries/drivers/drv_timer.h
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_timer.h
rename to bsp/ESP/libraries/drivers/drv_timer.h
diff --git a/bsp/ESP32_C3/drivers/drv_uart.c b/bsp/ESP/libraries/drivers/drv_uart.c
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_uart.c
rename to bsp/ESP/libraries/drivers/drv_uart.c
diff --git a/bsp/ESP32_C3/drivers/drv_uart.h b/bsp/ESP/libraries/drivers/drv_uart.h
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_uart.h
rename to bsp/ESP/libraries/drivers/drv_uart.h
diff --git a/bsp/ESP32_C3/drivers/drv_wifi.c b/bsp/ESP/libraries/drivers/drv_wifi.c
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_wifi.c
rename to bsp/ESP/libraries/drivers/drv_wifi.c
diff --git a/bsp/ESP32_C3/drivers/drv_wifi.h b/bsp/ESP/libraries/drivers/drv_wifi.h
similarity index 100%
rename from bsp/ESP32_C3/drivers/drv_wifi.h
rename to bsp/ESP/libraries/drivers/drv_wifi.h
diff --git a/bsp/ESP32_C3/drivers/sdkconfig.h b/bsp/ESP/libraries/drivers/sdkconfig.h
similarity index 100%
rename from bsp/ESP32_C3/drivers/sdkconfig.h
rename to bsp/ESP/libraries/drivers/sdkconfig.h
diff --git a/bsp/ESP/tools/sdk_dist.py b/bsp/ESP/tools/sdk_dist.py
new file mode 100644
index 00000000000..11a39a60de7
--- /dev/null
+++ b/bsp/ESP/tools/sdk_dist.py
@@ -0,0 +1,17 @@
+import os
+import sys
+import shutil
+
+cwd_path = os.getcwd()
+sys.path.append(os.path.join(os.path.dirname(cwd_path), 'rt-thread', 'tools'))
+
+
+# BSP dist function
+def dist_do_building(BSP_ROOT, dist_dir):
+    from mkdist import bsp_copy_files
+    import rtconfig
+
+
+    print("=> copy bsp drivers")
+    bsp_copy_files(os.path.join(library_path, 'drivers'), os.path.join(library_dir, 'drivers'))
+    shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))