diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index 75b2397250..0b9baedb14 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -80,6 +80,7 @@
 /components/esp_http_server/          @esp-idf-codeowners/app-utilities
 /components/esp_https_ota/            @esp-idf-codeowners/app-utilities
 /components/esp_https_server/         @esp-idf-codeowners/app-utilities
+/components/esp_hw_support/           @esp-idf-codeowners/system
 /components/esp_ipc/                  @esp-idf-codeowners/system
 /components/esp_local_ctrl/           @esp-idf-codeowners/app-utilities
 /components/esp_netif/                @esp-idf-codeowners/network
diff --git a/components/bootloader/subproject/CMakeLists.txt b/components/bootloader/subproject/CMakeLists.txt
index b4a04c3768..9397c0db52 100644
--- a/components/bootloader/subproject/CMakeLists.txt
+++ b/components/bootloader/subproject/CMakeLists.txt
@@ -15,10 +15,10 @@ if(NOT IDF_TARGET)
         "in by the parent build process.")
 endif()
 
-set(COMPONENTS bootloader esptool_py partition_table soc bootloader_support log spi_flash micro-ecc main efuse)
+set(COMPONENTS bootloader esptool_py esp_hw_support hal partition_table soc bootloader_support log spi_flash micro-ecc main efuse)
 set(BOOTLOADER_BUILD 1)
 include("${IDF_PATH}/tools/cmake/project.cmake")
-set(common_req log esp_rom esp_common xtensa)
+set(common_req log esp_rom esp_common esp_hw_support hal xtensa)
 if(LEGACY_INCLUDE_COMMON_HEADERS)
     list(APPEND common_req soc hal)
 endif()
diff --git a/components/bootloader/subproject/Makefile b/components/bootloader/subproject/Makefile
index 0a72a6fd06..8547e3ecb0 100644
--- a/components/bootloader/subproject/Makefile
+++ b/components/bootloader/subproject/Makefile
@@ -8,7 +8,7 @@ endif
 
 PROJECT_NAME := bootloader
 
-COMPONENTS := esptool_py bootloader_support log spi_flash micro-ecc soc main efuse esp_rom hal
+COMPONENTS := esp_hw_support esptool_py bootloader_support log spi_flash micro-ecc soc main efuse esp_rom hal
 
 # Clear C and CXX from top level project
 CFLAGS =
diff --git a/components/bootloader/subproject/main/ld/esp32/bootloader.ld b/components/bootloader/subproject/main/ld/esp32/bootloader.ld
index 304fbc3987..10d586d64c 100644
--- a/components/bootloader/subproject/main/ld/esp32/bootloader.ld
+++ b/components/bootloader/subproject/main/ld/esp32/bootloader.ld
@@ -56,8 +56,8 @@ SECTIONS
     *libmicro-ecc.a:*.*(.literal .text .literal.* .text.*)
     *libspi_flash.a:*.*(.literal .text .literal.* .text.*)
     *libhal.a:wdt_hal_iram.*(.literal .text .literal.* .text.*)
-    *libsoc.a:rtc_clk.*(.literal .text .literal.* .text.*)
-    *libsoc.a:rtc_time.*(.literal .text .literal.* .text.*)
+    *libesp_hw_support.a:rtc_clk.*(.literal .text .literal.* .text.*)
+    *libesp_hw_support.a:rtc_time.*(.literal .text .literal.* .text.*)
     *libefuse.a:*.*(.literal .text .literal.* .text.*)
     *(.fini.literal)
     *(.fini)
diff --git a/components/bootloader/subproject/main/ld/esp32s2/bootloader.ld b/components/bootloader/subproject/main/ld/esp32s2/bootloader.ld
index 158fcb36cb..62b51c9193 100644
--- a/components/bootloader/subproject/main/ld/esp32s2/bootloader.ld
+++ b/components/bootloader/subproject/main/ld/esp32s2/bootloader.ld
@@ -43,9 +43,9 @@ SECTIONS
     *libmicro-ecc.a:*.*(.literal .text .literal.* .text.*)
     *libspi_flash.a:*.*(.literal .text .literal.* .text.*)
     *libhal.a:wdt_hal_iram.*(.literal .text .literal.* .text.*)
-    *libsoc.a:rtc_clk.*(.literal .text .literal.* .text.*)
-    *libsoc.a:rtc_time.*(.literal .text .literal.* .text.*)
-    *libsoc.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
+    *libesp_hw_support.a:rtc_clk.*(.literal .text .literal.* .text.*)
+    *libesp_hw_support.a:rtc_time.*(.literal .text .literal.* .text.*)
+    *libesp_hw_support.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
     *libefuse.a:*.*(.literal .text .literal.* .text.*)
     *(.fini.literal)
     *(.fini)
diff --git a/components/bootloader/subproject/main/ld/esp32s3/bootloader.ld b/components/bootloader/subproject/main/ld/esp32s3/bootloader.ld
index e190d4d3b8..61f0f2770a 100644
--- a/components/bootloader/subproject/main/ld/esp32s3/bootloader.ld
+++ b/components/bootloader/subproject/main/ld/esp32s3/bootloader.ld
@@ -44,9 +44,9 @@ SECTIONS
     *libmicro-ecc.a:*.*(.literal .text .literal.* .text.*)
     *libspi_flash.a:*.*(.literal .text .literal.* .text.*)
     *libhal.a:wdt_hal_iram.*(.literal .text .literal.* .text.*)
-    *libsoc.a:rtc_clk.*(.literal .text .literal.* .text.*)
-    *libsoc.a:rtc_time.*(.literal .text .literal.* .text.*)
-    *libsoc.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
+    *libesp_hw_support.a:rtc_clk.*(.literal .text .literal.* .text.*)
+    *libesp_hw_support.a:rtc_time.*(.literal .text .literal.* .text.*)
+    *libesp_hw_support.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
     *libefuse.a:*.*(.literal .text .literal.* .text.*)
     *(.fini.literal)
     *(.fini)
diff --git a/components/esp_common/CMakeLists.txt b/components/esp_common/CMakeLists.txt
index 2c8891ab6a..991dc10579 100644
--- a/components/esp_common/CMakeLists.txt
+++ b/components/esp_common/CMakeLists.txt
@@ -25,7 +25,7 @@ else()
     # Note: esp_ipc, esp_pm added as a public requirement to keep compatibility as to be located here.
     idf_component_register(SRCS "${srcs}"
                            INCLUDE_DIRS include
-                           REQUIRES ${target} espcoredump esp_timer esp_ipc esp_pm
+                           REQUIRES ${target} espcoredump esp_timer esp_ipc esp_pm esp_hw_support
                            PRIV_REQUIRES soc
                            LDFRAGMENTS "linker.lf")
 
diff --git a/components/esp_hw_support/CMakeLists.txt b/components/esp_hw_support/CMakeLists.txt
new file mode 100644
index 0000000000..ab097c4f69
--- /dev/null
+++ b/components/esp_hw_support/CMakeLists.txt
@@ -0,0 +1,8 @@
+idf_component_register(SRCS "compare_set.c"
+                            "cpu_util.c"
+                       INCLUDE_DIRS include
+                       REQUIRES soc
+                       LDFRAGMENTS linker.lf)
+
+idf_build_get_property(target IDF_TARGET)
+add_subdirectory(port/${target})
diff --git a/components/esp_hw_support/README.md b/components/esp_hw_support/README.md
new file mode 100644
index 0000000000..e75de016c4
--- /dev/null
+++ b/components/esp_hw_support/README.md
@@ -0,0 +1,7 @@
+## `esp_hw_support` ##
+
+This component contains hardware-related operations for supporting the system. These operations
+are one level above that of `hal` in that these(1) use system services such as memory allocation, logging, scheduling
+or (2) may be multi-step operations involving/affecting multiple parts of the SoC.
+
+Implementations that don't fit other components cleanly, but are not worth creating a new component for (yet) may also be placed here as long as they don't pull dependencies other than the core system components.
\ No newline at end of file
diff --git a/components/soc/src/compare_set.c b/components/esp_hw_support/compare_set.c
similarity index 100%
rename from components/soc/src/compare_set.c
rename to components/esp_hw_support/compare_set.c
diff --git a/components/esp_hw_support/component.mk b/components/esp_hw_support/component.mk
new file mode 100644
index 0000000000..b1674229b3
--- /dev/null
+++ b/components/esp_hw_support/component.mk
@@ -0,0 +1,4 @@
+COMPONENT_SRCDIRS := . port/$(IDF_TARGET)
+COMPONENT_ADD_INCLUDEDIRS := . include port/$(IDF_TARGET)/private_include
+
+port/$(IDF_TARGET)/rtc_clk.o: CFLAGS += -fno-jump-tables -fno-tree-switch-conversion
diff --git a/components/soc/src/cpu_util.c b/components/esp_hw_support/cpu_util.c
similarity index 100%
rename from components/soc/src/cpu_util.c
rename to components/esp_hw_support/cpu_util.c
diff --git a/components/soc/include/soc/compare_set.h b/components/esp_hw_support/include/soc/compare_set.h
similarity index 96%
rename from components/soc/include/soc/compare_set.h
rename to components/esp_hw_support/include/soc/compare_set.h
index 626752ad51..b748fa9ea8 100644
--- a/components/soc/include/soc/compare_set.h
+++ b/components/esp_hw_support/include/soc/compare_set.h
@@ -21,6 +21,9 @@
 #include "soc/soc_memory_layout.h"
 #include "xtensa/xtruntime.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 static inline void __attribute__((always_inline)) compare_and_set_native(volatile uint32_t *addr, uint32_t compare, uint32_t *set)
 {
@@ -53,4 +56,8 @@ static inline void __attribute__((always_inline)) compare_and_set_native(volatil
 
 void compare_and_set_extram(volatile uint32_t *addr, uint32_t compare, uint32_t *set);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
\ No newline at end of file
diff --git a/components/soc/include/soc/cpu.h b/components/esp_hw_support/include/soc/cpu.h
similarity index 100%
rename from components/soc/include/soc/cpu.h
rename to components/esp_hw_support/include/soc/cpu.h
diff --git a/components/soc/include/soc/rtc_wdt.h b/components/esp_hw_support/include/soc/rtc_wdt.h
similarity index 100%
rename from components/soc/include/soc/rtc_wdt.h
rename to components/esp_hw_support/include/soc/rtc_wdt.h
diff --git a/components/soc/include/soc/spinlock.h b/components/esp_hw_support/include/soc/spinlock.h
similarity index 98%
rename from components/soc/include/soc/spinlock.h
rename to components/esp_hw_support/include/soc/spinlock.h
index aace1bbf25..286858315b 100644
--- a/components/soc/include/soc/spinlock.h
+++ b/components/esp_hw_support/include/soc/spinlock.h
@@ -21,6 +21,9 @@
 #include "soc/compare_set.h"
 #include "xtensa/xtruntime.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #ifdef CONFIG_SPIRAM_WORKAROUND_NEED_VOLATILE_SPINLOCK
 #define NEED_VOLATILE_MUX volatile
@@ -154,5 +157,9 @@ static inline void __attribute__((always_inline)) spinlock_release(spinlock_t *l
 #endif    
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
diff --git a/components/soc/include/soc_log.h b/components/esp_hw_support/include/soc_log.h
similarity index 99%
rename from components/soc/include/soc_log.h
rename to components/esp_hw_support/include/soc_log.h
index 2934eb0c6b..2f2bfd4e96 100644
--- a/components/soc/include/soc_log.h
+++ b/components/esp_hw_support/include/soc_log.h
@@ -14,6 +14,7 @@
 
 #pragma once
 #include "esp_rom_sys.h"
+
 /**
  * @file soc_log.h
  * @brief SOC library logging functions
diff --git a/components/esp_hw_support/linker.lf b/components/esp_hw_support/linker.lf
new file mode 100644
index 0000000000..b785ec786a
--- /dev/null
+++ b/components/esp_hw_support/linker.lf
@@ -0,0 +1,11 @@
+[mapping:esp_hw_support]
+archive: libesp_hw_support.a
+entries:
+    cpu_util (noflash_text)
+    rtc_clk (noflash)
+    rtc_init:rtc_vddsdio_set_config (noflash)
+    rtc_periph (noflash_text)
+    rtc_pm (noflash_text)
+    rtc_sleep (noflash_text)
+    rtc_time (noflash_text)
+    rtc_wdt (noflash_text)
diff --git a/components/soc/src/esp32s2/CMakeLists.txt b/components/esp_hw_support/port/esp32/CMakeLists.txt
similarity index 54%
rename from components/soc/src/esp32s2/CMakeLists.txt
rename to components/esp_hw_support/port/esp32/CMakeLists.txt
index f1fe8ca090..6edbf56018 100644
--- a/components/soc/src/esp32s2/CMakeLists.txt
+++ b/components/esp_hw_support/port/esp32/CMakeLists.txt
@@ -1,18 +1,17 @@
-set(srcs
-        "rtc_clk.c"
-        "regi2c_ctrl.c"
-        "rtc_clk_init.c"
-        "rtc_init.c"
-        "rtc_pm.c"
-        "rtc_sleep.c"
-        "rtc_time.c"
-        "rtc_wdt.c"
-        "soc_memory_layout.c")
+target_include_directories(${COMPONENT_LIB} PUBLIC .)
+target_include_directories(${COMPONENT_LIB} PRIVATE private_include)
+
+set(srcs 
+    "rtc_clk.c"
+    "rtc_clk_init.c"
+    "rtc_init.c"
+    "rtc_pm.c"
+    "rtc_sleep.c"
+    "rtc_time.c"
+    "rtc_wdt.c")
 
 add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
-
 target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")
-target_include_directories(${COMPONENT_LIB} PUBLIC . include)
 
 if(NOT CMAKE_BUILD_EARLY_EXPANSION)
     set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/rtc_clk.c" PROPERTIES
diff --git a/components/soc/soc/esp32/private_include/regi2c_apll.h b/components/esp_hw_support/port/esp32/private_include/regi2c_apll.h
similarity index 100%
rename from components/soc/soc/esp32/private_include/regi2c_apll.h
rename to components/esp_hw_support/port/esp32/private_include/regi2c_apll.h
diff --git a/components/soc/soc/esp32/private_include/regi2c_bbpll.h b/components/esp_hw_support/port/esp32/private_include/regi2c_bbpll.h
similarity index 100%
rename from components/soc/soc/esp32/private_include/regi2c_bbpll.h
rename to components/esp_hw_support/port/esp32/private_include/regi2c_bbpll.h
diff --git a/components/soc/src/esp32/regi2c_ctrl.h b/components/esp_hw_support/port/esp32/regi2c_ctrl.h
similarity index 100%
rename from components/soc/src/esp32/regi2c_ctrl.h
rename to components/esp_hw_support/port/esp32/regi2c_ctrl.h
diff --git a/components/soc/src/esp32/rtc_clk.c b/components/esp_hw_support/port/esp32/rtc_clk.c
similarity index 100%
rename from components/soc/src/esp32/rtc_clk.c
rename to components/esp_hw_support/port/esp32/rtc_clk.c
diff --git a/components/soc/src/esp32/rtc_clk_common.h b/components/esp_hw_support/port/esp32/rtc_clk_common.h
similarity index 96%
rename from components/soc/src/esp32/rtc_clk_common.h
rename to components/esp_hw_support/port/esp32/rtc_clk_common.h
index 7b7f1bb220..b6ae3ca2e4 100644
--- a/components/soc/src/esp32/rtc_clk_common.h
+++ b/components/esp_hw_support/port/esp32/rtc_clk_common.h
@@ -14,6 +14,9 @@
 
 #pragma once
 
+#include <stdint.h>
+#include <stdbool.h>
+
 #define MHZ (1000000)
 
 #ifdef __cplusplus
diff --git a/components/soc/src/esp32/rtc_clk_init.c b/components/esp_hw_support/port/esp32/rtc_clk_init.c
similarity index 100%
rename from components/soc/src/esp32/rtc_clk_init.c
rename to components/esp_hw_support/port/esp32/rtc_clk_init.c
diff --git a/components/soc/src/esp32/rtc_init.c b/components/esp_hw_support/port/esp32/rtc_init.c
similarity index 100%
rename from components/soc/src/esp32/rtc_init.c
rename to components/esp_hw_support/port/esp32/rtc_init.c
diff --git a/components/soc/src/esp32/rtc_pm.c b/components/esp_hw_support/port/esp32/rtc_pm.c
similarity index 100%
rename from components/soc/src/esp32/rtc_pm.c
rename to components/esp_hw_support/port/esp32/rtc_pm.c
diff --git a/components/soc/src/esp32/rtc_sleep.c b/components/esp_hw_support/port/esp32/rtc_sleep.c
similarity index 100%
rename from components/soc/src/esp32/rtc_sleep.c
rename to components/esp_hw_support/port/esp32/rtc_sleep.c
diff --git a/components/soc/src/esp32/rtc_time.c b/components/esp_hw_support/port/esp32/rtc_time.c
similarity index 100%
rename from components/soc/src/esp32/rtc_time.c
rename to components/esp_hw_support/port/esp32/rtc_time.c
diff --git a/components/soc/src/esp32/rtc_wdt.c b/components/esp_hw_support/port/esp32/rtc_wdt.c
similarity index 100%
rename from components/soc/src/esp32/rtc_wdt.c
rename to components/esp_hw_support/port/esp32/rtc_wdt.c
diff --git a/components/soc/src/esp32/CMakeLists.txt b/components/esp_hw_support/port/esp32s2/CMakeLists.txt
similarity index 74%
rename from components/soc/src/esp32/CMakeLists.txt
rename to components/esp_hw_support/port/esp32s2/CMakeLists.txt
index 3f1279d3f6..94ae9e59c8 100644
--- a/components/soc/src/esp32/CMakeLists.txt
+++ b/components/esp_hw_support/port/esp32s2/CMakeLists.txt
@@ -1,4 +1,7 @@
-set(srcs
+target_include_directories(${COMPONENT_LIB} PUBLIC .)
+target_include_directories(${COMPONENT_LIB} PUBLIC private_include)
+
+set(srcs 
     "rtc_clk.c"
     "rtc_clk_init.c"
     "rtc_init.c"
@@ -6,13 +9,10 @@ set(srcs
     "rtc_sleep.c"
     "rtc_time.c"
     "rtc_wdt.c"
-    "soc_memory_layout.c"
-)
+    "regi2c_ctrl.c")
 
 add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
-
 target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")
-target_include_directories(${COMPONENT_LIB} PUBLIC . include)
 
 if(NOT CMAKE_BUILD_EARLY_EXPANSION)
     set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/rtc_clk.c" PROPERTIES
diff --git a/components/soc/soc/esp32s2/private_include/regi2c_apll.h b/components/esp_hw_support/port/esp32s2/private_include/regi2c_apll.h
similarity index 100%
rename from components/soc/soc/esp32s2/private_include/regi2c_apll.h
rename to components/esp_hw_support/port/esp32s2/private_include/regi2c_apll.h
diff --git a/components/soc/soc/esp32s2/private_include/regi2c_bbpll.h b/components/esp_hw_support/port/esp32s2/private_include/regi2c_bbpll.h
similarity index 100%
rename from components/soc/soc/esp32s2/private_include/regi2c_bbpll.h
rename to components/esp_hw_support/port/esp32s2/private_include/regi2c_bbpll.h
diff --git a/components/soc/soc/esp32s2/private_include/regi2c_brownout.h b/components/esp_hw_support/port/esp32s2/private_include/regi2c_brownout.h
similarity index 100%
rename from components/soc/soc/esp32s2/private_include/regi2c_brownout.h
rename to components/esp_hw_support/port/esp32s2/private_include/regi2c_brownout.h
diff --git a/components/soc/soc/esp32s2/private_include/regi2c_saradc.h b/components/esp_hw_support/port/esp32s2/private_include/regi2c_saradc.h
similarity index 100%
rename from components/soc/soc/esp32s2/private_include/regi2c_saradc.h
rename to components/esp_hw_support/port/esp32s2/private_include/regi2c_saradc.h
diff --git a/components/soc/soc/esp32s2/private_include/regi2c_ulp.h b/components/esp_hw_support/port/esp32s2/private_include/regi2c_ulp.h
similarity index 100%
rename from components/soc/soc/esp32s2/private_include/regi2c_ulp.h
rename to components/esp_hw_support/port/esp32s2/private_include/regi2c_ulp.h
diff --git a/components/soc/src/esp32s2/regi2c_ctrl.c b/components/esp_hw_support/port/esp32s2/regi2c_ctrl.c
similarity index 100%
rename from components/soc/src/esp32s2/regi2c_ctrl.c
rename to components/esp_hw_support/port/esp32s2/regi2c_ctrl.c
diff --git a/components/soc/src/esp32s2/regi2c_ctrl.h b/components/esp_hw_support/port/esp32s2/regi2c_ctrl.h
similarity index 100%
rename from components/soc/src/esp32s2/regi2c_ctrl.h
rename to components/esp_hw_support/port/esp32s2/regi2c_ctrl.h
diff --git a/components/soc/src/esp32s2/rtc_clk.c b/components/esp_hw_support/port/esp32s2/rtc_clk.c
similarity index 100%
rename from components/soc/src/esp32s2/rtc_clk.c
rename to components/esp_hw_support/port/esp32s2/rtc_clk.c
diff --git a/components/soc/src/esp32s2/rtc_clk_common.h b/components/esp_hw_support/port/esp32s2/rtc_clk_common.h
similarity index 97%
rename from components/soc/src/esp32s2/rtc_clk_common.h
rename to components/esp_hw_support/port/esp32s2/rtc_clk_common.h
index cb92f67ac2..d4dad103ad 100644
--- a/components/soc/src/esp32s2/rtc_clk_common.h
+++ b/components/esp_hw_support/port/esp32s2/rtc_clk_common.h
@@ -14,6 +14,9 @@
 
 #pragma once
 
+#include <stdint.h>
+#include <stdbool.h>
+
 #define MHZ (1000000)
 
 #define DPORT_CPUPERIOD_SEL_80		0
diff --git a/components/soc/src/esp32s2/rtc_clk_init.c b/components/esp_hw_support/port/esp32s2/rtc_clk_init.c
similarity index 100%
rename from components/soc/src/esp32s2/rtc_clk_init.c
rename to components/esp_hw_support/port/esp32s2/rtc_clk_init.c
diff --git a/components/soc/src/esp32s2/rtc_init.c b/components/esp_hw_support/port/esp32s2/rtc_init.c
similarity index 100%
rename from components/soc/src/esp32s2/rtc_init.c
rename to components/esp_hw_support/port/esp32s2/rtc_init.c
diff --git a/components/soc/src/esp32s2/rtc_pm.c b/components/esp_hw_support/port/esp32s2/rtc_pm.c
similarity index 100%
rename from components/soc/src/esp32s2/rtc_pm.c
rename to components/esp_hw_support/port/esp32s2/rtc_pm.c
diff --git a/components/soc/src/esp32s2/rtc_sleep.c b/components/esp_hw_support/port/esp32s2/rtc_sleep.c
similarity index 100%
rename from components/soc/src/esp32s2/rtc_sleep.c
rename to components/esp_hw_support/port/esp32s2/rtc_sleep.c
diff --git a/components/soc/src/esp32s2/rtc_time.c b/components/esp_hw_support/port/esp32s2/rtc_time.c
similarity index 100%
rename from components/soc/src/esp32s2/rtc_time.c
rename to components/esp_hw_support/port/esp32s2/rtc_time.c
diff --git a/components/soc/src/esp32s2/rtc_wdt.c b/components/esp_hw_support/port/esp32s2/rtc_wdt.c
similarity index 100%
rename from components/soc/src/esp32s2/rtc_wdt.c
rename to components/esp_hw_support/port/esp32s2/rtc_wdt.c
diff --git a/components/soc/src/esp32s3/CMakeLists.txt b/components/esp_hw_support/port/esp32s3/CMakeLists.txt
similarity index 58%
rename from components/soc/src/esp32s3/CMakeLists.txt
rename to components/esp_hw_support/port/esp32s3/CMakeLists.txt
index 972d69f96b..1939674da4 100644
--- a/components/soc/src/esp32s3/CMakeLists.txt
+++ b/components/esp_hw_support/port/esp32s3/CMakeLists.txt
@@ -1,16 +1,16 @@
-set(srcs
-        "rtc_clk_init.c"
-        "rtc_clk.c"
-        "rtc_init.c"
-        "rtc_pm.c"
-        "rtc_sleep.c"
-        "rtc_time.c"
-        "soc_memory_layout.c")
+target_include_directories(${COMPONENT_LIB} PUBLIC .)
+target_include_directories(${COMPONENT_LIB} PUBLIC private_include)
+
+set(srcs 
+    "rtc_clk.c"
+    "rtc_clk_init.c"
+    "rtc_init.c"
+    "rtc_pm.c"
+    "rtc_sleep.c"
+    "rtc_time.c")
 
 add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
-
 target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")
-target_include_directories(${COMPONENT_LIB} PUBLIC . include)
 
 if(NOT CMAKE_BUILD_EARLY_EXPANSION)
     set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/rtc_clk.c" PROPERTIES
diff --git a/components/soc/soc/esp32s3/private_include/regi2c_bbpll.h b/components/esp_hw_support/port/esp32s3/private_include/regi2c_bbpll.h
similarity index 100%
rename from components/soc/soc/esp32s3/private_include/regi2c_bbpll.h
rename to components/esp_hw_support/port/esp32s3/private_include/regi2c_bbpll.h
diff --git a/components/soc/soc/esp32s3/private_include/regi2c_brownout.h b/components/esp_hw_support/port/esp32s3/private_include/regi2c_brownout.h
similarity index 100%
rename from components/soc/soc/esp32s3/private_include/regi2c_brownout.h
rename to components/esp_hw_support/port/esp32s3/private_include/regi2c_brownout.h
diff --git a/components/soc/soc/esp32s3/private_include/regi2c_dig_reg.h b/components/esp_hw_support/port/esp32s3/private_include/regi2c_dig_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/private_include/regi2c_dig_reg.h
rename to components/esp_hw_support/port/esp32s3/private_include/regi2c_dig_reg.h
diff --git a/components/soc/soc/esp32s3/private_include/regi2c_ulp.h b/components/esp_hw_support/port/esp32s3/private_include/regi2c_ulp.h
similarity index 100%
rename from components/soc/soc/esp32s3/private_include/regi2c_ulp.h
rename to components/esp_hw_support/port/esp32s3/private_include/regi2c_ulp.h
diff --git a/components/soc/src/esp32s3/regi2c_ctrl.h b/components/esp_hw_support/port/esp32s3/regi2c_ctrl.h
similarity index 100%
rename from components/soc/src/esp32s3/regi2c_ctrl.h
rename to components/esp_hw_support/port/esp32s3/regi2c_ctrl.h
diff --git a/components/soc/src/esp32s3/rtc_clk.c b/components/esp_hw_support/port/esp32s3/rtc_clk.c
similarity index 100%
rename from components/soc/src/esp32s3/rtc_clk.c
rename to components/esp_hw_support/port/esp32s3/rtc_clk.c
diff --git a/components/soc/src/esp32s3/rtc_clk_common.h b/components/esp_hw_support/port/esp32s3/rtc_clk_common.h
similarity index 97%
rename from components/soc/src/esp32s3/rtc_clk_common.h
rename to components/esp_hw_support/port/esp32s3/rtc_clk_common.h
index ad6e455835..7c0f76dafd 100644
--- a/components/soc/src/esp32s3/rtc_clk_common.h
+++ b/components/esp_hw_support/port/esp32s3/rtc_clk_common.h
@@ -14,6 +14,9 @@
 
 #pragma once
 
+#include <stdint.h>
+#include <stdbool.h>
+
 #define MHZ (1000000)
 
 #define DPORT_CPUPERIOD_SEL_80      0
diff --git a/components/soc/src/esp32s3/rtc_clk_init.c b/components/esp_hw_support/port/esp32s3/rtc_clk_init.c
similarity index 100%
rename from components/soc/src/esp32s3/rtc_clk_init.c
rename to components/esp_hw_support/port/esp32s3/rtc_clk_init.c
diff --git a/components/soc/src/esp32s3/rtc_init.c b/components/esp_hw_support/port/esp32s3/rtc_init.c
similarity index 100%
rename from components/soc/src/esp32s3/rtc_init.c
rename to components/esp_hw_support/port/esp32s3/rtc_init.c
diff --git a/components/soc/src/esp32s3/rtc_pm.c b/components/esp_hw_support/port/esp32s3/rtc_pm.c
similarity index 100%
rename from components/soc/src/esp32s3/rtc_pm.c
rename to components/esp_hw_support/port/esp32s3/rtc_pm.c
diff --git a/components/soc/src/esp32s3/rtc_sleep.c b/components/esp_hw_support/port/esp32s3/rtc_sleep.c
similarity index 100%
rename from components/soc/src/esp32s3/rtc_sleep.c
rename to components/esp_hw_support/port/esp32s3/rtc_sleep.c
diff --git a/components/soc/src/esp32s3/rtc_time.c b/components/esp_hw_support/port/esp32s3/rtc_time.c
similarity index 100%
rename from components/soc/src/esp32s3/rtc_time.c
rename to components/esp_hw_support/port/esp32s3/rtc_time.c
diff --git a/components/esp_hw_support/test/CMakeLists.txt b/components/esp_hw_support/test/CMakeLists.txt
new file mode 100644
index 0000000000..9e246cfaaa
--- /dev/null
+++ b/components/esp_hw_support/test/CMakeLists.txt
@@ -0,0 +1,3 @@
+idf_component_register(SRC_DIRS "."
+                    PRIV_INCLUDE_DIRS "${include_dirs}"
+                    PRIV_REQUIRES cmock test_utils esp_hw_support)
diff --git a/components/soc/test/component.mk b/components/esp_hw_support/test/component.mk
similarity index 100%
rename from components/soc/test/component.mk
rename to components/esp_hw_support/test/component.mk
diff --git a/components/soc/test/test_rtc_clk.c b/components/esp_hw_support/test/test_rtc_clk.c
similarity index 100%
rename from components/soc/test/test_rtc_clk.c
rename to components/esp_hw_support/test/test_rtc_clk.c
diff --git a/components/fatfs/test_fatfs_host/Makefile.files b/components/fatfs/test_fatfs_host/Makefile.files
index 73b2774296..e8e9d1f700 100644
--- a/components/fatfs/test_fatfs_host/Makefile.files
+++ b/components/fatfs/test_fatfs_host/Makefile.files
@@ -27,9 +27,8 @@ INCLUDE_DIRS := \
 		esp_system/include \
 		xtensa/include \
 		xtensa/esp32/include \
-		soc/soc/esp32/include \
+		soc/esp32/include \
 		soc/include \
-		soc/soc/include \
 		esp32/include \
 		esp_common/include \
 		bootloader_support/include \
diff --git a/components/soc/src/esp32s2/include/hal/memprot_peri_ll.h b/components/hal/esp32s2/include/hal/memprot_peri_ll.h
similarity index 100%
rename from components/soc/src/esp32s2/include/hal/memprot_peri_ll.h
rename to components/hal/esp32s2/include/hal/memprot_peri_ll.h
diff --git a/components/soc/include/hal/sha_hal.h b/components/hal/include/hal/sha_hal.h
similarity index 100%
rename from components/soc/include/hal/sha_hal.h
rename to components/hal/include/hal/sha_hal.h
diff --git a/components/lwip/test_afl_host/Makefile b/components/lwip/test_afl_host/Makefile
index 5a75bcc39f..92e0b14b38 100644
--- a/components/lwip/test_afl_host/Makefile
+++ b/components/lwip/test_afl_host/Makefile
@@ -2,7 +2,7 @@ COMPONENTS_DIR=../..
 COMPILER_ICLUDE_DIR=$(shell echo `which xtensa-esp32-elf-gcc | xargs dirname | xargs dirname`/xtensa-esp32-elf)
 CFLAGS=-std=gnu99 -Og -ggdb -ffunction-sections -fdata-sections -nostdlib -Wall  -Werror=all -Wno-int-to-pointer-cast -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-macro-redefined -Wno-constant-conversion -Wno-incompatible-pointer-types-discards-qualifiers -Wno-typedef-redefinition -Wno-incompatible-pointer-types  -Wextra \
 -Wno-unused-parameter -Wno-sign-compare -Wno-address   -Wno-unused-variable -DESP_PLATFORM -D IDF_VER=\"v3.1\" -MMD -MP -DWITH_POSIX -DLWIP_NO_CTYPE_H=1
-INC_DIRS=-I . -I ./build/config -I $(COMPONENTS_DIR)/newlib/platform_include -I $(COMPONENTS_DIR)/newlib/include -I $(COMPONENTS_DIR)/driver/include -I $(COMPONENTS_DIR)/esp32/include -I $(COMPONENTS_DIR)/ethernet/include -I $(COMPONENTS_DIR)/freertos/include -I $(COMPONENTS_DIR)/heap/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include  -I $(COMPONENTS_DIR)/lwip/include/apps -I $(COMPONENTS_DIR)/lwip/lwip/src/include/netif -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/port/esp32/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/include/apps/ping -I $(COMPONENTS_DIR)/lwip/include/apps/sntp  -I $(COMPONENTS_DIR)/soc/esp32/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/tcpip_adapter/include -I $(COMPONENTS_DIR)/esp_rom/include  -I $(COMPONENTS_DIR)/esp_common/include -I $(COMPONENTS_DIR)/xtensa/include -I $(COMPONENTS_DIR)/xtensa/esp32/include -I $(COMPONENTS_DIR)/esp_wifi/include -I $(COMPONENTS_DIR)/esp_event/include -I $(COMPONENTS_DIR)/freertos/xtensa/include  -I $(COMPONENTS_DIR)/esp_system/include -I $(COMPONENTS_DIR)/esp_timer/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/soc/soc/include -I $(COMPONENTS_DIR)/soc/src/esp32/include -I $(COMPONENTS_DIR)/soc/soc/esp32/include -I $(COMPONENTS_DIR)/esp_netif/include -I $(COMPONENTS_DIR)/esp_eth/include -I $(COMPONENTS_DIR)/esp_netif/lwip -I $(COMPONENTS_DIR)/hal/include -I $(COMPONENTS_DIR)/hal/esp32/include -I $(COMPILER_ICLUDE_DIR)/include
+INC_DIRS=-I . -I ./build/config -I $(COMPONENTS_DIR)/newlib/platform_include -I $(COMPONENTS_DIR)/newlib/include -I $(COMPONENTS_DIR)/driver/include -I $(COMPONENTS_DIR)/esp32/include -I $(COMPONENTS_DIR)/ethernet/include -I $(COMPONENTS_DIR)/freertos/include -I $(COMPONENTS_DIR)/heap/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include  -I $(COMPONENTS_DIR)/lwip/include/apps -I $(COMPONENTS_DIR)/lwip/lwip/src/include/netif -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/port/esp32/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/include/apps/ping -I $(COMPONENTS_DIR)/lwip/include/apps/sntp  -I $(COMPONENTS_DIR)/soc/esp32/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/tcpip_adapter/include -I $(COMPONENTS_DIR)/esp_rom/include  -I $(COMPONENTS_DIR)/esp_common/include -I $(COMPONENTS_DIR)/xtensa/include -I $(COMPONENTS_DIR)/xtensa/esp32/include -I $(COMPONENTS_DIR)/esp_wifi/include -I $(COMPONENTS_DIR)/esp_event/include -I $(COMPONENTS_DIR)/freertos/xtensa/include  -I $(COMPONENTS_DIR)/esp_system/include -I $(COMPONENTS_DIR)/esp_timer/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/soc/src/esp32/include -I $(COMPONENTS_DIR)/soc/esp32/include -I $(COMPONENTS_DIR)/esp_netif/include -I $(COMPONENTS_DIR)/esp_eth/include -I $(COMPONENTS_DIR)/esp_netif/lwip -I $(COMPONENTS_DIR)/hal/include -I $(COMPONENTS_DIR)/hal/esp32/include -I $(COMPILER_ICLUDE_DIR)/include
 TEST_NAME=test
 FUZZ=afl-fuzz
 GEN_CFG=generate_config
diff --git a/components/mdns/test_afl_fuzz_host/Makefile b/components/mdns/test_afl_fuzz_host/Makefile
index e8ad152323..d636e3758a 100644
--- a/components/mdns/test_afl_fuzz_host/Makefile
+++ b/components/mdns/test_afl_fuzz_host/Makefile
@@ -28,8 +28,8 @@ CFLAGS=-g -Wno-unused-value -Wno-missing-declarations -Wno-pointer-bool-conversi
                  -I$(COMPONENTS_DIR)/lwip/port/esp32/include \
                  -I$(COMPONENTS_DIR)/lwip/lwip/src/include/lwip/apps \
                  -I$(COMPONENTS_DIR)/soc/include \
-                 -I$(COMPONENTS_DIR)/soc/soc/include \
-                 -I$(COMPONENTS_DIR)/soc/soc/esp32/include \
+                 -I$(COMPONENTS_DIR)/soc/include \
+                 -I$(COMPONENTS_DIR)/soc/esp32/include \
                  -I$(COMPONENTS_DIR)/soc/src/esp32/include \
                  -I$(COMPONENTS_DIR)/tcpip_adapter/include \
                  -I$(COMPONENTS_DIR)/xtensa/include \
diff --git a/components/soc/CMakeLists.txt b/components/soc/CMakeLists.txt
index e088e3bd63..6fc84323bb 100644
--- a/components/soc/CMakeLists.txt
+++ b/components/soc/CMakeLists.txt
@@ -1,16 +1,8 @@
-idf_build_get_property(target IDF_TARGET)
-
-idf_component_register(SRCS "src/cpu_util.c"
-                            "src/memory_layout_utils.c"
-                            "src/lldesc.c"
-                            "src/soc_include_legacy_warn.c"
-                            "src/compare_set.c"
-                       REQUIRES hal #cpu.h directly includes HAL header
+idf_component_register(SRCS "lldesc.c"
+                            "soc_include_legacy_warn.c"
+                            "memory_layout_utils.c"
                        INCLUDE_DIRS include
-                       PRIV_REQUIRES ${target}
                        LDFRAGMENTS linker.lf)
 
-add_subdirectory(soc)
-
-add_subdirectory(src/${target})
-target_link_libraries(${COMPONENT_LIB} PUBLIC "soc_${target}")
+idf_build_get_property(target IDF_TARGET)
+add_subdirectory(${target})
diff --git a/components/soc/README.md b/components/soc/README.md
index d29d692bd7..6e6d4b127c 100644
--- a/components/soc/README.md
+++ b/components/soc/README.md
@@ -1,33 +1,10 @@
 ## `soc` ##
 
-The `soc` component provides provides hardware description and hardware support functionality for targets supported by ESP-IDF. This is reflected in the component's subdirectories:
-
-- `soc/include` - abstraction
-- `soc/soc` - description
-- `soc/src` - implementation
-
-#### `soc/include` ####
-
-`soc/include` contains header files which provide a hardware-agnostic interface to the SoC. The interface consists of
-function declarations and abstracted types that other, higher level components can make use of in order to have code portable to
-all targets ESP-IDF supports.
-
-The `soc` subdirectory contains other useful interface for SoC-level operations or concepts, such as the memory layout, spinlocks, etc.
-
-#### `soc/soc` ####
-
-The `soc/soc` subdirectory contains description of the underlying hardware:
+The `soc` component provides hardware description for targets supported by ESP-IDF.
 
     - `xxx_reg.h`   - defines registers related to the hardware
     - `xxx_struct.h` - hardware description in C `struct`
     - `xxx_channel.h` - definitions for hardware with multiple channels
     - `xxx_caps.h`  - features/capabilities of the hardware
     - `xxx_pins.h`  - pin definitions
-    - `xxx_periph.h/*.c`  - includes all headers related to a peripheral; declaration and definition of IO mapping for that hardware
-
-Since the hardware description is target-specific, there are subdirectories for each target containing copies of the files above.
-Furthermore, the files in this directory should be standalone, i.e. should not include files from outside directories.
-
-#### `soc/src` ####
-
-Provides the interface about the memory, I2C, and Real_Time Clock functions.
\ No newline at end of file
+    - `xxx_periph.h/*.c`  - includes all headers related to a peripheral; declaration and definition of IO mapping for that hardware
\ No newline at end of file
diff --git a/components/soc/component.mk b/components/soc/component.mk
index 23d74c38e1..74c217e192 100644
--- a/components/soc/component.mk
+++ b/components/soc/component.mk
@@ -1,14 +1,4 @@
-SOC_NAME := $(IDF_TARGET)
-
-COMPONENT_SRCDIRS := src
-COMPONENT_ADD_INCLUDEDIRS :=
-
-# Since there can be chip-specific HAL headers which can include the common
-# HAL header via include_next, process the build scripts here first so that
-# include directories appear first in the compile command.
--include $(COMPONENT_PATH)/src/$(SOC_NAME)/component.mk
-COMPONENT_ADD_INCLUDEDIRS += include
-
--include $(COMPONENT_PATH)/soc/component.mk
+COMPONENT_SRCDIRS := . $(IDF_TARGET)
+COMPONENT_ADD_INCLUDEDIRS := include $(IDF_TARGET) $(IDF_TARGET)/include 
 
 COMPONENT_ADD_LDFRAGMENTS += linker.lf
diff --git a/components/soc/soc/esp32/CMakeLists.txt b/components/soc/esp32/CMakeLists.txt
similarity index 50%
rename from components/soc/soc/esp32/CMakeLists.txt
rename to components/soc/esp32/CMakeLists.txt
index c423a829bc..024eb92ce4 100644
--- a/components/soc/soc/esp32/CMakeLists.txt
+++ b/components/soc/esp32/CMakeLists.txt
@@ -1,18 +1,22 @@
-add_library(soc_esp32 STATIC
+set(srcs
     "adc_periph.c"
     "dac_periph.c"
     "gpio_periph.c"
+    "i2c_periph.c"
+    "i2s_periph.c"
+    "interrupts.c"
     "pcnt_periph.c"
+    "ledc_periph.c"
     "rtc_io_periph.c"
     "rtc_periph.c"
     "sdio_slave_periph.c"
     "sdmmc_periph.c"
-    "interrupts.c"
+    "soc_memory_layout.c"
     "spi_periph.c"
-    "ledc_periph.c"
-    "i2s_periph.c"
-    "i2c_periph.c"
-    "uart_periph.c"
-    "touch_sensor_periph.c")
+    "touch_sensor_periph.c"
+    "uart_periph.c")
 
-target_include_directories(soc_esp32 PUBLIC include ../include private_include)
\ No newline at end of file
+add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
+
+target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")
+target_include_directories(${COMPONENT_LIB} PUBLIC . include)
diff --git a/components/soc/soc/esp32/adc_periph.c b/components/soc/esp32/adc_periph.c
similarity index 100%
rename from components/soc/soc/esp32/adc_periph.c
rename to components/soc/esp32/adc_periph.c
diff --git a/components/soc/soc/esp32/dac_periph.c b/components/soc/esp32/dac_periph.c
similarity index 100%
rename from components/soc/soc/esp32/dac_periph.c
rename to components/soc/esp32/dac_periph.c
diff --git a/components/soc/soc/esp32/gpio_periph.c b/components/soc/esp32/gpio_periph.c
similarity index 100%
rename from components/soc/soc/esp32/gpio_periph.c
rename to components/soc/esp32/gpio_periph.c
diff --git a/components/soc/soc/esp32/i2c_periph.c b/components/soc/esp32/i2c_periph.c
similarity index 100%
rename from components/soc/soc/esp32/i2c_periph.c
rename to components/soc/esp32/i2c_periph.c
diff --git a/components/soc/soc/esp32/i2s_periph.c b/components/soc/esp32/i2s_periph.c
similarity index 100%
rename from components/soc/soc/esp32/i2s_periph.c
rename to components/soc/esp32/i2s_periph.c
diff --git a/components/soc/soc/esp32/include/soc/adc_channel.h b/components/soc/esp32/include/soc/adc_channel.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/adc_channel.h
rename to components/soc/esp32/include/soc/adc_channel.h
diff --git a/components/soc/soc/esp32/include/soc/apb_ctrl_reg.h b/components/soc/esp32/include/soc/apb_ctrl_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/apb_ctrl_reg.h
rename to components/soc/esp32/include/soc/apb_ctrl_reg.h
diff --git a/components/soc/soc/esp32/include/soc/apb_ctrl_struct.h b/components/soc/esp32/include/soc/apb_ctrl_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/apb_ctrl_struct.h
rename to components/soc/esp32/include/soc/apb_ctrl_struct.h
diff --git a/components/soc/soc/esp32/include/soc/bb_reg.h b/components/soc/esp32/include/soc/bb_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/bb_reg.h
rename to components/soc/esp32/include/soc/bb_reg.h
diff --git a/components/soc/soc/esp32/include/soc/boot_mode.h b/components/soc/esp32/include/soc/boot_mode.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/boot_mode.h
rename to components/soc/esp32/include/soc/boot_mode.h
diff --git a/components/soc/soc/esp32/include/soc/can_periph.h b/components/soc/esp32/include/soc/can_periph.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/can_periph.h
rename to components/soc/esp32/include/soc/can_periph.h
diff --git a/components/soc/soc/esp32/include/soc/can_struct.h b/components/soc/esp32/include/soc/can_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/can_struct.h
rename to components/soc/esp32/include/soc/can_struct.h
diff --git a/components/soc/soc/esp32/include/soc/clkout_channel.h b/components/soc/esp32/include/soc/clkout_channel.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/clkout_channel.h
rename to components/soc/esp32/include/soc/clkout_channel.h
diff --git a/components/soc/soc/esp32/include/soc/dac_channel.h b/components/soc/esp32/include/soc/dac_channel.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/dac_channel.h
rename to components/soc/esp32/include/soc/dac_channel.h
diff --git a/components/soc/soc/esp32/include/soc/dport_access.h b/components/soc/esp32/include/soc/dport_access.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/dport_access.h
rename to components/soc/esp32/include/soc/dport_access.h
diff --git a/components/soc/soc/esp32/include/soc/dport_reg.h b/components/soc/esp32/include/soc/dport_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/dport_reg.h
rename to components/soc/esp32/include/soc/dport_reg.h
diff --git a/components/soc/soc/esp32/include/soc/efuse_reg.h b/components/soc/esp32/include/soc/efuse_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/efuse_reg.h
rename to components/soc/esp32/include/soc/efuse_reg.h
diff --git a/components/soc/soc/esp32/include/soc/emac_dma_struct.h b/components/soc/esp32/include/soc/emac_dma_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/emac_dma_struct.h
rename to components/soc/esp32/include/soc/emac_dma_struct.h
diff --git a/components/soc/soc/esp32/include/soc/emac_ext_struct.h b/components/soc/esp32/include/soc/emac_ext_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/emac_ext_struct.h
rename to components/soc/esp32/include/soc/emac_ext_struct.h
diff --git a/components/soc/soc/esp32/include/soc/emac_mac_struct.h b/components/soc/esp32/include/soc/emac_mac_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/emac_mac_struct.h
rename to components/soc/esp32/include/soc/emac_mac_struct.h
diff --git a/components/soc/soc/esp32/include/soc/fe_reg.h b/components/soc/esp32/include/soc/fe_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/fe_reg.h
rename to components/soc/esp32/include/soc/fe_reg.h
diff --git a/components/soc/soc/esp32/include/soc/frc_timer_reg.h b/components/soc/esp32/include/soc/frc_timer_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/frc_timer_reg.h
rename to components/soc/esp32/include/soc/frc_timer_reg.h
diff --git a/components/soc/soc/esp32/include/soc/gpio_pins.h b/components/soc/esp32/include/soc/gpio_pins.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/gpio_pins.h
rename to components/soc/esp32/include/soc/gpio_pins.h
diff --git a/components/soc/soc/esp32/include/soc/gpio_reg.h b/components/soc/esp32/include/soc/gpio_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/gpio_reg.h
rename to components/soc/esp32/include/soc/gpio_reg.h
diff --git a/components/soc/soc/esp32/include/soc/gpio_sd_reg.h b/components/soc/esp32/include/soc/gpio_sd_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/gpio_sd_reg.h
rename to components/soc/esp32/include/soc/gpio_sd_reg.h
diff --git a/components/soc/soc/esp32/include/soc/gpio_sd_struct.h b/components/soc/esp32/include/soc/gpio_sd_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/gpio_sd_struct.h
rename to components/soc/esp32/include/soc/gpio_sd_struct.h
diff --git a/components/soc/soc/esp32/include/soc/gpio_sig_map.h b/components/soc/esp32/include/soc/gpio_sig_map.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/gpio_sig_map.h
rename to components/soc/esp32/include/soc/gpio_sig_map.h
diff --git a/components/soc/soc/esp32/include/soc/gpio_struct.h b/components/soc/esp32/include/soc/gpio_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/gpio_struct.h
rename to components/soc/esp32/include/soc/gpio_struct.h
diff --git a/components/soc/soc/esp32/include/soc/hinf_reg.h b/components/soc/esp32/include/soc/hinf_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/hinf_reg.h
rename to components/soc/esp32/include/soc/hinf_reg.h
diff --git a/components/soc/soc/esp32/include/soc/hinf_struct.h b/components/soc/esp32/include/soc/hinf_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/hinf_struct.h
rename to components/soc/esp32/include/soc/hinf_struct.h
diff --git a/components/soc/soc/esp32/include/soc/host_reg.h b/components/soc/esp32/include/soc/host_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/host_reg.h
rename to components/soc/esp32/include/soc/host_reg.h
diff --git a/components/soc/soc/esp32/include/soc/host_struct.h b/components/soc/esp32/include/soc/host_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/host_struct.h
rename to components/soc/esp32/include/soc/host_struct.h
diff --git a/components/soc/soc/esp32/include/soc/hwcrypto_reg.h b/components/soc/esp32/include/soc/hwcrypto_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/hwcrypto_reg.h
rename to components/soc/esp32/include/soc/hwcrypto_reg.h
diff --git a/components/soc/soc/esp32/include/soc/i2c_reg.h b/components/soc/esp32/include/soc/i2c_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/i2c_reg.h
rename to components/soc/esp32/include/soc/i2c_reg.h
diff --git a/components/soc/soc/esp32/include/soc/i2c_struct.h b/components/soc/esp32/include/soc/i2c_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/i2c_struct.h
rename to components/soc/esp32/include/soc/i2c_struct.h
diff --git a/components/soc/soc/esp32/include/soc/i2s_reg.h b/components/soc/esp32/include/soc/i2s_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/i2s_reg.h
rename to components/soc/esp32/include/soc/i2s_reg.h
diff --git a/components/soc/soc/esp32/include/soc/i2s_struct.h b/components/soc/esp32/include/soc/i2s_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/i2s_struct.h
rename to components/soc/esp32/include/soc/i2s_struct.h
diff --git a/components/soc/soc/esp32/include/soc/io_mux_reg.h b/components/soc/esp32/include/soc/io_mux_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/io_mux_reg.h
rename to components/soc/esp32/include/soc/io_mux_reg.h
diff --git a/components/soc/soc/esp32/include/soc/ledc_reg.h b/components/soc/esp32/include/soc/ledc_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/ledc_reg.h
rename to components/soc/esp32/include/soc/ledc_reg.h
diff --git a/components/soc/soc/esp32/include/soc/ledc_struct.h b/components/soc/esp32/include/soc/ledc_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/ledc_struct.h
rename to components/soc/esp32/include/soc/ledc_struct.h
diff --git a/components/soc/soc/esp32/include/soc/mcpwm_reg.h b/components/soc/esp32/include/soc/mcpwm_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/mcpwm_reg.h
rename to components/soc/esp32/include/soc/mcpwm_reg.h
diff --git a/components/soc/soc/esp32/include/soc/mcpwm_struct.h b/components/soc/esp32/include/soc/mcpwm_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/mcpwm_struct.h
rename to components/soc/esp32/include/soc/mcpwm_struct.h
diff --git a/components/soc/soc/esp32/include/soc/nrx_reg.h b/components/soc/esp32/include/soc/nrx_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/nrx_reg.h
rename to components/soc/esp32/include/soc/nrx_reg.h
diff --git a/components/soc/soc/esp32/include/soc/pcnt_reg.h b/components/soc/esp32/include/soc/pcnt_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/pcnt_reg.h
rename to components/soc/esp32/include/soc/pcnt_reg.h
diff --git a/components/soc/soc/esp32/include/soc/pcnt_struct.h b/components/soc/esp32/include/soc/pcnt_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/pcnt_struct.h
rename to components/soc/esp32/include/soc/pcnt_struct.h
diff --git a/components/soc/soc/esp32/include/soc/periph_defs.h b/components/soc/esp32/include/soc/periph_defs.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/periph_defs.h
rename to components/soc/esp32/include/soc/periph_defs.h
diff --git a/components/soc/soc/esp32/include/soc/pid.h b/components/soc/esp32/include/soc/pid.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/pid.h
rename to components/soc/esp32/include/soc/pid.h
diff --git a/components/soc/soc/esp32/include/soc/rmt_reg.h b/components/soc/esp32/include/soc/rmt_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/rmt_reg.h
rename to components/soc/esp32/include/soc/rmt_reg.h
diff --git a/components/soc/soc/esp32/include/soc/rmt_struct.h b/components/soc/esp32/include/soc/rmt_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/rmt_struct.h
rename to components/soc/esp32/include/soc/rmt_struct.h
diff --git a/components/soc/soc/esp32/include/soc/rsa_caps.h b/components/soc/esp32/include/soc/rsa_caps.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/rsa_caps.h
rename to components/soc/esp32/include/soc/rsa_caps.h
diff --git a/components/soc/soc/esp32/include/soc/rtc.h b/components/soc/esp32/include/soc/rtc.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/rtc.h
rename to components/soc/esp32/include/soc/rtc.h
diff --git a/components/soc/soc/esp32/include/soc/rtc_cntl_reg.h b/components/soc/esp32/include/soc/rtc_cntl_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/rtc_cntl_reg.h
rename to components/soc/esp32/include/soc/rtc_cntl_reg.h
diff --git a/components/soc/soc/esp32/include/soc/rtc_cntl_struct.h b/components/soc/esp32/include/soc/rtc_cntl_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/rtc_cntl_struct.h
rename to components/soc/esp32/include/soc/rtc_cntl_struct.h
diff --git a/components/soc/soc/esp32/include/soc/rtc_i2c_reg.h b/components/soc/esp32/include/soc/rtc_i2c_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/rtc_i2c_reg.h
rename to components/soc/esp32/include/soc/rtc_i2c_reg.h
diff --git a/components/soc/soc/esp32/include/soc/rtc_io_channel.h b/components/soc/esp32/include/soc/rtc_io_channel.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/rtc_io_channel.h
rename to components/soc/esp32/include/soc/rtc_io_channel.h
diff --git a/components/soc/soc/esp32/include/soc/rtc_io_reg.h b/components/soc/esp32/include/soc/rtc_io_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/rtc_io_reg.h
rename to components/soc/esp32/include/soc/rtc_io_reg.h
diff --git a/components/soc/soc/esp32/include/soc/rtc_io_struct.h b/components/soc/esp32/include/soc/rtc_io_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/rtc_io_struct.h
rename to components/soc/esp32/include/soc/rtc_io_struct.h
diff --git a/components/soc/soc/esp32/include/soc/sdio_slave_pins.h b/components/soc/esp32/include/soc/sdio_slave_pins.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/sdio_slave_pins.h
rename to components/soc/esp32/include/soc/sdio_slave_pins.h
diff --git a/components/soc/soc/esp32/include/soc/sdmmc_pins.h b/components/soc/esp32/include/soc/sdmmc_pins.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/sdmmc_pins.h
rename to components/soc/esp32/include/soc/sdmmc_pins.h
diff --git a/components/soc/soc/esp32/include/soc/sdmmc_reg.h b/components/soc/esp32/include/soc/sdmmc_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/sdmmc_reg.h
rename to components/soc/esp32/include/soc/sdmmc_reg.h
diff --git a/components/soc/soc/esp32/include/soc/sdmmc_struct.h b/components/soc/esp32/include/soc/sdmmc_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/sdmmc_struct.h
rename to components/soc/esp32/include/soc/sdmmc_struct.h
diff --git a/components/soc/soc/esp32/include/soc/sens_reg.h b/components/soc/esp32/include/soc/sens_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/sens_reg.h
rename to components/soc/esp32/include/soc/sens_reg.h
diff --git a/components/soc/soc/esp32/include/soc/sens_struct.h b/components/soc/esp32/include/soc/sens_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/sens_struct.h
rename to components/soc/esp32/include/soc/sens_struct.h
diff --git a/components/soc/soc/esp32/include/soc/sha_caps.h b/components/soc/esp32/include/soc/sha_caps.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/sha_caps.h
rename to components/soc/esp32/include/soc/sha_caps.h
diff --git a/components/soc/soc/esp32/include/soc/slc_reg.h b/components/soc/esp32/include/soc/slc_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/slc_reg.h
rename to components/soc/esp32/include/soc/slc_reg.h
diff --git a/components/soc/soc/esp32/include/soc/slc_struct.h b/components/soc/esp32/include/soc/slc_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/slc_struct.h
rename to components/soc/esp32/include/soc/slc_struct.h
diff --git a/components/soc/soc/esp32/include/soc/soc.h b/components/soc/esp32/include/soc/soc.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/soc.h
rename to components/soc/esp32/include/soc/soc.h
diff --git a/components/soc/soc/esp32/include/soc/soc_caps.h b/components/soc/esp32/include/soc/soc_caps.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/soc_caps.h
rename to components/soc/esp32/include/soc/soc_caps.h
diff --git a/components/soc/soc/esp32/include/soc/soc_pins.h b/components/soc/esp32/include/soc/soc_pins.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/soc_pins.h
rename to components/soc/esp32/include/soc/soc_pins.h
diff --git a/components/soc/soc/esp32/include/soc/soc_ulp.h b/components/soc/esp32/include/soc/soc_ulp.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/soc_ulp.h
rename to components/soc/esp32/include/soc/soc_ulp.h
diff --git a/components/soc/soc/esp32/include/soc/spi_pins.h b/components/soc/esp32/include/soc/spi_pins.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/spi_pins.h
rename to components/soc/esp32/include/soc/spi_pins.h
diff --git a/components/soc/soc/esp32/include/soc/spi_reg.h b/components/soc/esp32/include/soc/spi_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/spi_reg.h
rename to components/soc/esp32/include/soc/spi_reg.h
diff --git a/components/soc/soc/esp32/include/soc/spi_struct.h b/components/soc/esp32/include/soc/spi_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/spi_struct.h
rename to components/soc/esp32/include/soc/spi_struct.h
diff --git a/components/soc/soc/esp32/include/soc/syscon_reg.h b/components/soc/esp32/include/soc/syscon_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/syscon_reg.h
rename to components/soc/esp32/include/soc/syscon_reg.h
diff --git a/components/soc/soc/esp32/include/soc/syscon_struct.h b/components/soc/esp32/include/soc/syscon_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/syscon_struct.h
rename to components/soc/esp32/include/soc/syscon_struct.h
diff --git a/components/soc/soc/esp32/include/soc/timer_group_reg.h b/components/soc/esp32/include/soc/timer_group_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/timer_group_reg.h
rename to components/soc/esp32/include/soc/timer_group_reg.h
diff --git a/components/soc/soc/esp32/include/soc/timer_group_struct.h b/components/soc/esp32/include/soc/timer_group_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/timer_group_struct.h
rename to components/soc/esp32/include/soc/timer_group_struct.h
diff --git a/components/soc/soc/esp32/include/soc/touch_sensor_channel.h b/components/soc/esp32/include/soc/touch_sensor_channel.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/touch_sensor_channel.h
rename to components/soc/esp32/include/soc/touch_sensor_channel.h
diff --git a/components/soc/soc/esp32/include/soc/twai_struct.h b/components/soc/esp32/include/soc/twai_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/twai_struct.h
rename to components/soc/esp32/include/soc/twai_struct.h
diff --git a/components/soc/soc/esp32/include/soc/uart_channel.h b/components/soc/esp32/include/soc/uart_channel.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/uart_channel.h
rename to components/soc/esp32/include/soc/uart_channel.h
diff --git a/components/soc/soc/esp32/include/soc/uart_reg.h b/components/soc/esp32/include/soc/uart_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/uart_reg.h
rename to components/soc/esp32/include/soc/uart_reg.h
diff --git a/components/soc/soc/esp32/include/soc/uart_struct.h b/components/soc/esp32/include/soc/uart_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/uart_struct.h
rename to components/soc/esp32/include/soc/uart_struct.h
diff --git a/components/soc/soc/esp32/include/soc/uhci_reg.h b/components/soc/esp32/include/soc/uhci_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/uhci_reg.h
rename to components/soc/esp32/include/soc/uhci_reg.h
diff --git a/components/soc/soc/esp32/include/soc/uhci_struct.h b/components/soc/esp32/include/soc/uhci_struct.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/uhci_struct.h
rename to components/soc/esp32/include/soc/uhci_struct.h
diff --git a/components/soc/soc/esp32/include/soc/wdev_reg.h b/components/soc/esp32/include/soc/wdev_reg.h
similarity index 100%
rename from components/soc/soc/esp32/include/soc/wdev_reg.h
rename to components/soc/esp32/include/soc/wdev_reg.h
diff --git a/components/soc/soc/esp32/interrupts.c b/components/soc/esp32/interrupts.c
similarity index 100%
rename from components/soc/soc/esp32/interrupts.c
rename to components/soc/esp32/interrupts.c
diff --git a/components/soc/soc/esp32/ledc_periph.c b/components/soc/esp32/ledc_periph.c
similarity index 100%
rename from components/soc/soc/esp32/ledc_periph.c
rename to components/soc/esp32/ledc_periph.c
diff --git a/components/soc/soc/esp32/pcnt_periph.c b/components/soc/esp32/pcnt_periph.c
similarity index 100%
rename from components/soc/soc/esp32/pcnt_periph.c
rename to components/soc/esp32/pcnt_periph.c
diff --git a/components/soc/soc/esp32/rtc_io_periph.c b/components/soc/esp32/rtc_io_periph.c
similarity index 100%
rename from components/soc/soc/esp32/rtc_io_periph.c
rename to components/soc/esp32/rtc_io_periph.c
diff --git a/components/soc/soc/esp32/rtc_periph.c b/components/soc/esp32/rtc_periph.c
similarity index 100%
rename from components/soc/soc/esp32/rtc_periph.c
rename to components/soc/esp32/rtc_periph.c
diff --git a/components/soc/soc/esp32/sdio_slave_periph.c b/components/soc/esp32/sdio_slave_periph.c
similarity index 100%
rename from components/soc/soc/esp32/sdio_slave_periph.c
rename to components/soc/esp32/sdio_slave_periph.c
diff --git a/components/soc/soc/esp32/sdmmc_periph.c b/components/soc/esp32/sdmmc_periph.c
similarity index 100%
rename from components/soc/soc/esp32/sdmmc_periph.c
rename to components/soc/esp32/sdmmc_periph.c
diff --git a/components/soc/src/esp32/soc_memory_layout.c b/components/soc/esp32/soc_memory_layout.c
similarity index 100%
rename from components/soc/src/esp32/soc_memory_layout.c
rename to components/soc/esp32/soc_memory_layout.c
diff --git a/components/soc/soc/esp32/spi_periph.c b/components/soc/esp32/spi_periph.c
similarity index 100%
rename from components/soc/soc/esp32/spi_periph.c
rename to components/soc/esp32/spi_periph.c
diff --git a/components/soc/soc/esp32/touch_sensor_periph.c b/components/soc/esp32/touch_sensor_periph.c
similarity index 100%
rename from components/soc/soc/esp32/touch_sensor_periph.c
rename to components/soc/esp32/touch_sensor_periph.c
diff --git a/components/soc/soc/esp32/uart_periph.c b/components/soc/esp32/uart_periph.c
similarity index 100%
rename from components/soc/soc/esp32/uart_periph.c
rename to components/soc/esp32/uart_periph.c
diff --git a/components/soc/soc/esp32s2/CMakeLists.txt b/components/soc/esp32s2/CMakeLists.txt
similarity index 50%
rename from components/soc/soc/esp32s2/CMakeLists.txt
rename to components/soc/esp32s2/CMakeLists.txt
index 9b00451d91..c44629d0e6 100644
--- a/components/soc/soc/esp32s2/CMakeLists.txt
+++ b/components/soc/esp32s2/CMakeLists.txt
@@ -1,18 +1,22 @@
-add_library(soc_esp32s2 STATIC
+set(srcs
     "adc_periph.c"
     "dac_periph.c"
     "dedic_gpio_periph.c"
     "gpio_periph.c"
+    "i2c_periph.c"
+    "i2s_periph.c"
+    "interrupts.c"
+    "ledc_periph.c"
     "pcnt_periph.c"
     "rtc_io_periph.c"
     "rtc_periph.c"
-    "interrupts.c"
+    "soc_memory_layout.c"
     "spi_periph.c"
-    "ledc_periph.c"
-    "i2s_periph.c"
-    "i2c_periph.c"
+    "touch_sensor_periph.c"
     "uart_periph.c"
-    "usb_periph.c"
-    "touch_sensor_periph.c")
+    "usb_periph.c")
 
-target_include_directories(soc_esp32s2 PUBLIC include ../include private_include)
+add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
+
+target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")
+target_include_directories(${COMPONENT_LIB} PUBLIC . include)
diff --git a/components/soc/soc/esp32s2/adc_periph.c b/components/soc/esp32s2/adc_periph.c
similarity index 100%
rename from components/soc/soc/esp32s2/adc_periph.c
rename to components/soc/esp32s2/adc_periph.c
diff --git a/components/soc/soc/esp32s2/dac_periph.c b/components/soc/esp32s2/dac_periph.c
similarity index 100%
rename from components/soc/soc/esp32s2/dac_periph.c
rename to components/soc/esp32s2/dac_periph.c
diff --git a/components/soc/soc/esp32s2/dedic_gpio_periph.c b/components/soc/esp32s2/dedic_gpio_periph.c
similarity index 100%
rename from components/soc/soc/esp32s2/dedic_gpio_periph.c
rename to components/soc/esp32s2/dedic_gpio_periph.c
diff --git a/components/soc/soc/esp32s2/gpio_periph.c b/components/soc/esp32s2/gpio_periph.c
similarity index 100%
rename from components/soc/soc/esp32s2/gpio_periph.c
rename to components/soc/esp32s2/gpio_periph.c
diff --git a/components/soc/soc/esp32s2/i2c_periph.c b/components/soc/esp32s2/i2c_periph.c
similarity index 100%
rename from components/soc/soc/esp32s2/i2c_periph.c
rename to components/soc/esp32s2/i2c_periph.c
diff --git a/components/soc/soc/esp32s2/i2s_periph.c b/components/soc/esp32s2/i2s_periph.c
similarity index 100%
rename from components/soc/soc/esp32s2/i2s_periph.c
rename to components/soc/esp32s2/i2s_periph.c
diff --git a/components/soc/soc/esp32s2/include/soc/adc_channel.h b/components/soc/esp32s2/include/soc/adc_channel.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/adc_channel.h
rename to components/soc/esp32s2/include/soc/adc_channel.h
diff --git a/components/soc/soc/esp32s2/include/soc/apb_ctrl_reg.h b/components/soc/esp32s2/include/soc/apb_ctrl_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/apb_ctrl_reg.h
rename to components/soc/esp32s2/include/soc/apb_ctrl_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/apb_ctrl_struct.h b/components/soc/esp32s2/include/soc/apb_ctrl_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/apb_ctrl_struct.h
rename to components/soc/esp32s2/include/soc/apb_ctrl_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/apb_saradc_reg.h b/components/soc/esp32s2/include/soc/apb_saradc_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/apb_saradc_reg.h
rename to components/soc/esp32s2/include/soc/apb_saradc_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/apb_saradc_struct.h b/components/soc/esp32s2/include/soc/apb_saradc_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/apb_saradc_struct.h
rename to components/soc/esp32s2/include/soc/apb_saradc_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/assist_debug_reg.h b/components/soc/esp32s2/include/soc/assist_debug_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/assist_debug_reg.h
rename to components/soc/esp32s2/include/soc/assist_debug_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/bb_reg.h b/components/soc/esp32s2/include/soc/bb_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/bb_reg.h
rename to components/soc/esp32s2/include/soc/bb_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/boot_mode.h b/components/soc/esp32s2/include/soc/boot_mode.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/boot_mode.h
rename to components/soc/esp32s2/include/soc/boot_mode.h
diff --git a/components/soc/soc/esp32s2/include/soc/cache_memory.h b/components/soc/esp32s2/include/soc/cache_memory.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/cache_memory.h
rename to components/soc/esp32s2/include/soc/cache_memory.h
diff --git a/components/soc/soc/esp32s2/include/soc/clkout_channel.h b/components/soc/esp32s2/include/soc/clkout_channel.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/clkout_channel.h
rename to components/soc/esp32s2/include/soc/clkout_channel.h
diff --git a/components/soc/soc/esp32s2/include/soc/cp_dma_reg.h b/components/soc/esp32s2/include/soc/cp_dma_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/cp_dma_reg.h
rename to components/soc/esp32s2/include/soc/cp_dma_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/cp_dma_struct.h b/components/soc/esp32s2/include/soc/cp_dma_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/cp_dma_struct.h
rename to components/soc/esp32s2/include/soc/cp_dma_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/crypto_dma_reg.h b/components/soc/esp32s2/include/soc/crypto_dma_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/crypto_dma_reg.h
rename to components/soc/esp32s2/include/soc/crypto_dma_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/dac_channel.h b/components/soc/esp32s2/include/soc/dac_channel.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/dac_channel.h
rename to components/soc/esp32s2/include/soc/dac_channel.h
diff --git a/components/soc/soc/esp32s2/include/soc/dedic_gpio_reg.h b/components/soc/esp32s2/include/soc/dedic_gpio_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/dedic_gpio_reg.h
rename to components/soc/esp32s2/include/soc/dedic_gpio_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/dedic_gpio_struct.h b/components/soc/esp32s2/include/soc/dedic_gpio_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/dedic_gpio_struct.h
rename to components/soc/esp32s2/include/soc/dedic_gpio_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/dport_access.h b/components/soc/esp32s2/include/soc/dport_access.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/dport_access.h
rename to components/soc/esp32s2/include/soc/dport_access.h
diff --git a/components/soc/soc/esp32s2/include/soc/dport_reg.h b/components/soc/esp32s2/include/soc/dport_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/dport_reg.h
rename to components/soc/esp32s2/include/soc/dport_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/efuse_reg.h b/components/soc/esp32s2/include/soc/efuse_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/efuse_reg.h
rename to components/soc/esp32s2/include/soc/efuse_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/efuse_struct.h b/components/soc/esp32s2/include/soc/efuse_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/efuse_struct.h
rename to components/soc/esp32s2/include/soc/efuse_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/extmem_reg.h b/components/soc/esp32s2/include/soc/extmem_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/extmem_reg.h
rename to components/soc/esp32s2/include/soc/extmem_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/fe_reg.h b/components/soc/esp32s2/include/soc/fe_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/fe_reg.h
rename to components/soc/esp32s2/include/soc/fe_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/frc_timer_reg.h b/components/soc/esp32s2/include/soc/frc_timer_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/frc_timer_reg.h
rename to components/soc/esp32s2/include/soc/frc_timer_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/gpio_pins.h b/components/soc/esp32s2/include/soc/gpio_pins.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/gpio_pins.h
rename to components/soc/esp32s2/include/soc/gpio_pins.h
diff --git a/components/soc/soc/esp32s2/include/soc/gpio_reg.h b/components/soc/esp32s2/include/soc/gpio_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/gpio_reg.h
rename to components/soc/esp32s2/include/soc/gpio_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/gpio_sd_reg.h b/components/soc/esp32s2/include/soc/gpio_sd_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/gpio_sd_reg.h
rename to components/soc/esp32s2/include/soc/gpio_sd_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/gpio_sd_struct.h b/components/soc/esp32s2/include/soc/gpio_sd_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/gpio_sd_struct.h
rename to components/soc/esp32s2/include/soc/gpio_sd_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/gpio_sig_map.h b/components/soc/esp32s2/include/soc/gpio_sig_map.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/gpio_sig_map.h
rename to components/soc/esp32s2/include/soc/gpio_sig_map.h
diff --git a/components/soc/soc/esp32s2/include/soc/gpio_struct.h b/components/soc/esp32s2/include/soc/gpio_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/gpio_struct.h
rename to components/soc/esp32s2/include/soc/gpio_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/hwcrypto_reg.h b/components/soc/esp32s2/include/soc/hwcrypto_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/hwcrypto_reg.h
rename to components/soc/esp32s2/include/soc/hwcrypto_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/i2c_reg.h b/components/soc/esp32s2/include/soc/i2c_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/i2c_reg.h
rename to components/soc/esp32s2/include/soc/i2c_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/i2c_struct.h b/components/soc/esp32s2/include/soc/i2c_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/i2c_struct.h
rename to components/soc/esp32s2/include/soc/i2c_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/i2s_reg.h b/components/soc/esp32s2/include/soc/i2s_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/i2s_reg.h
rename to components/soc/esp32s2/include/soc/i2s_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/i2s_struct.h b/components/soc/esp32s2/include/soc/i2s_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/i2s_struct.h
rename to components/soc/esp32s2/include/soc/i2s_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/interrupt_reg.h b/components/soc/esp32s2/include/soc/interrupt_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/interrupt_reg.h
rename to components/soc/esp32s2/include/soc/interrupt_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/io_mux_reg.h b/components/soc/esp32s2/include/soc/io_mux_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/io_mux_reg.h
rename to components/soc/esp32s2/include/soc/io_mux_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/ledc_reg.h b/components/soc/esp32s2/include/soc/ledc_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/ledc_reg.h
rename to components/soc/esp32s2/include/soc/ledc_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/ledc_struct.h b/components/soc/esp32s2/include/soc/ledc_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/ledc_struct.h
rename to components/soc/esp32s2/include/soc/ledc_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/nrx_reg.h b/components/soc/esp32s2/include/soc/nrx_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/nrx_reg.h
rename to components/soc/esp32s2/include/soc/nrx_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/pcnt_reg.h b/components/soc/esp32s2/include/soc/pcnt_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/pcnt_reg.h
rename to components/soc/esp32s2/include/soc/pcnt_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/pcnt_struct.h b/components/soc/esp32s2/include/soc/pcnt_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/pcnt_struct.h
rename to components/soc/esp32s2/include/soc/pcnt_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/periph_defs.h b/components/soc/esp32s2/include/soc/periph_defs.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/periph_defs.h
rename to components/soc/esp32s2/include/soc/periph_defs.h
diff --git a/components/soc/soc/esp32s2/include/soc/rmt_reg.h b/components/soc/esp32s2/include/soc/rmt_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/rmt_reg.h
rename to components/soc/esp32s2/include/soc/rmt_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/rmt_struct.h b/components/soc/esp32s2/include/soc/rmt_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/rmt_struct.h
rename to components/soc/esp32s2/include/soc/rmt_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/rsa_caps.h b/components/soc/esp32s2/include/soc/rsa_caps.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/rsa_caps.h
rename to components/soc/esp32s2/include/soc/rsa_caps.h
diff --git a/components/soc/soc/esp32s2/include/soc/rtc.h b/components/soc/esp32s2/include/soc/rtc.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/rtc.h
rename to components/soc/esp32s2/include/soc/rtc.h
diff --git a/components/soc/soc/esp32s2/include/soc/rtc_cntl_reg.h b/components/soc/esp32s2/include/soc/rtc_cntl_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/rtc_cntl_reg.h
rename to components/soc/esp32s2/include/soc/rtc_cntl_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/rtc_cntl_struct.h b/components/soc/esp32s2/include/soc/rtc_cntl_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/rtc_cntl_struct.h
rename to components/soc/esp32s2/include/soc/rtc_cntl_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/rtc_i2c_reg.h b/components/soc/esp32s2/include/soc/rtc_i2c_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/rtc_i2c_reg.h
rename to components/soc/esp32s2/include/soc/rtc_i2c_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/rtc_i2c_struct.h b/components/soc/esp32s2/include/soc/rtc_i2c_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/rtc_i2c_struct.h
rename to components/soc/esp32s2/include/soc/rtc_i2c_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/rtc_io_channel.h b/components/soc/esp32s2/include/soc/rtc_io_channel.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/rtc_io_channel.h
rename to components/soc/esp32s2/include/soc/rtc_io_channel.h
diff --git a/components/soc/soc/esp32s2/include/soc/rtc_io_reg.h b/components/soc/esp32s2/include/soc/rtc_io_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/rtc_io_reg.h
rename to components/soc/esp32s2/include/soc/rtc_io_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/rtc_io_struct.h b/components/soc/esp32s2/include/soc/rtc_io_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/rtc_io_struct.h
rename to components/soc/esp32s2/include/soc/rtc_io_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/sdio_slave_pins.h b/components/soc/esp32s2/include/soc/sdio_slave_pins.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/sdio_slave_pins.h
rename to components/soc/esp32s2/include/soc/sdio_slave_pins.h
diff --git a/components/soc/soc/esp32s2/include/soc/sdmmc_pins.h b/components/soc/esp32s2/include/soc/sdmmc_pins.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/sdmmc_pins.h
rename to components/soc/esp32s2/include/soc/sdmmc_pins.h
diff --git a/components/soc/soc/esp32s2/include/soc/sdmmc_reg.h b/components/soc/esp32s2/include/soc/sdmmc_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/sdmmc_reg.h
rename to components/soc/esp32s2/include/soc/sdmmc_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/sdmmc_struct.h b/components/soc/esp32s2/include/soc/sdmmc_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/sdmmc_struct.h
rename to components/soc/esp32s2/include/soc/sdmmc_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/sens_reg.h b/components/soc/esp32s2/include/soc/sens_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/sens_reg.h
rename to components/soc/esp32s2/include/soc/sens_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/sens_struct.h b/components/soc/esp32s2/include/soc/sens_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/sens_struct.h
rename to components/soc/esp32s2/include/soc/sens_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/sensitive_reg.h b/components/soc/esp32s2/include/soc/sensitive_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/sensitive_reg.h
rename to components/soc/esp32s2/include/soc/sensitive_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/sha_caps.h b/components/soc/esp32s2/include/soc/sha_caps.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/sha_caps.h
rename to components/soc/esp32s2/include/soc/sha_caps.h
diff --git a/components/soc/soc/esp32s2/include/soc/soc.h b/components/soc/esp32s2/include/soc/soc.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/soc.h
rename to components/soc/esp32s2/include/soc/soc.h
diff --git a/components/soc/soc/esp32s2/include/soc/soc_caps.h b/components/soc/esp32s2/include/soc/soc_caps.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/soc_caps.h
rename to components/soc/esp32s2/include/soc/soc_caps.h
diff --git a/components/soc/soc/esp32s2/include/soc/soc_pins.h b/components/soc/esp32s2/include/soc/soc_pins.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/soc_pins.h
rename to components/soc/esp32s2/include/soc/soc_pins.h
diff --git a/components/soc/soc/esp32s2/include/soc/soc_ulp.h b/components/soc/esp32s2/include/soc/soc_ulp.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/soc_ulp.h
rename to components/soc/esp32s2/include/soc/soc_ulp.h
diff --git a/components/soc/soc/esp32s2/include/soc/spi_mem_reg.h b/components/soc/esp32s2/include/soc/spi_mem_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/spi_mem_reg.h
rename to components/soc/esp32s2/include/soc/spi_mem_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/spi_mem_struct.h b/components/soc/esp32s2/include/soc/spi_mem_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/spi_mem_struct.h
rename to components/soc/esp32s2/include/soc/spi_mem_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/spi_pins.h b/components/soc/esp32s2/include/soc/spi_pins.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/spi_pins.h
rename to components/soc/esp32s2/include/soc/spi_pins.h
diff --git a/components/soc/soc/esp32s2/include/soc/spi_reg.h b/components/soc/esp32s2/include/soc/spi_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/spi_reg.h
rename to components/soc/esp32s2/include/soc/spi_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/spi_struct.h b/components/soc/esp32s2/include/soc/spi_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/spi_struct.h
rename to components/soc/esp32s2/include/soc/spi_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/syscon_reg.h b/components/soc/esp32s2/include/soc/syscon_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/syscon_reg.h
rename to components/soc/esp32s2/include/soc/syscon_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/syscon_struct.h b/components/soc/esp32s2/include/soc/syscon_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/syscon_struct.h
rename to components/soc/esp32s2/include/soc/syscon_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/system_reg.h b/components/soc/esp32s2/include/soc/system_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/system_reg.h
rename to components/soc/esp32s2/include/soc/system_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/systimer_reg.h b/components/soc/esp32s2/include/soc/systimer_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/systimer_reg.h
rename to components/soc/esp32s2/include/soc/systimer_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/timer_group_reg.h b/components/soc/esp32s2/include/soc/timer_group_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/timer_group_reg.h
rename to components/soc/esp32s2/include/soc/timer_group_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/timer_group_struct.h b/components/soc/esp32s2/include/soc/timer_group_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/timer_group_struct.h
rename to components/soc/esp32s2/include/soc/timer_group_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/touch_sensor_channel.h b/components/soc/esp32s2/include/soc/touch_sensor_channel.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/touch_sensor_channel.h
rename to components/soc/esp32s2/include/soc/touch_sensor_channel.h
diff --git a/components/soc/soc/esp32s2/include/soc/touch_sensor_pins.h b/components/soc/esp32s2/include/soc/touch_sensor_pins.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/touch_sensor_pins.h
rename to components/soc/esp32s2/include/soc/touch_sensor_pins.h
diff --git a/components/soc/soc/esp32s2/include/soc/twai_struct.h b/components/soc/esp32s2/include/soc/twai_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/twai_struct.h
rename to components/soc/esp32s2/include/soc/twai_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/uart_channel.h b/components/soc/esp32s2/include/soc/uart_channel.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/uart_channel.h
rename to components/soc/esp32s2/include/soc/uart_channel.h
diff --git a/components/soc/soc/esp32s2/include/soc/uart_reg.h b/components/soc/esp32s2/include/soc/uart_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/uart_reg.h
rename to components/soc/esp32s2/include/soc/uart_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/uart_struct.h b/components/soc/esp32s2/include/soc/uart_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/uart_struct.h
rename to components/soc/esp32s2/include/soc/uart_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/uhci_reg.h b/components/soc/esp32s2/include/soc/uhci_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/uhci_reg.h
rename to components/soc/esp32s2/include/soc/uhci_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/uhci_struct.h b/components/soc/esp32s2/include/soc/uhci_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/uhci_struct.h
rename to components/soc/esp32s2/include/soc/uhci_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/usb_periph.h b/components/soc/esp32s2/include/soc/usb_periph.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/usb_periph.h
rename to components/soc/esp32s2/include/soc/usb_periph.h
diff --git a/components/soc/soc/esp32s2/include/soc/usb_pins.h b/components/soc/esp32s2/include/soc/usb_pins.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/usb_pins.h
rename to components/soc/esp32s2/include/soc/usb_pins.h
diff --git a/components/soc/soc/esp32s2/include/soc/usb_reg.h b/components/soc/esp32s2/include/soc/usb_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/usb_reg.h
rename to components/soc/esp32s2/include/soc/usb_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/usb_struct.h b/components/soc/esp32s2/include/soc/usb_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/usb_struct.h
rename to components/soc/esp32s2/include/soc/usb_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/usb_types.h b/components/soc/esp32s2/include/soc/usb_types.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/usb_types.h
rename to components/soc/esp32s2/include/soc/usb_types.h
diff --git a/components/soc/soc/esp32s2/include/soc/usb_wrap_reg.h b/components/soc/esp32s2/include/soc/usb_wrap_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/usb_wrap_reg.h
rename to components/soc/esp32s2/include/soc/usb_wrap_reg.h
diff --git a/components/soc/soc/esp32s2/include/soc/usb_wrap_struct.h b/components/soc/esp32s2/include/soc/usb_wrap_struct.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/usb_wrap_struct.h
rename to components/soc/esp32s2/include/soc/usb_wrap_struct.h
diff --git a/components/soc/soc/esp32s2/include/soc/wdev_reg.h b/components/soc/esp32s2/include/soc/wdev_reg.h
similarity index 100%
rename from components/soc/soc/esp32s2/include/soc/wdev_reg.h
rename to components/soc/esp32s2/include/soc/wdev_reg.h
diff --git a/components/soc/soc/esp32s2/interrupts.c b/components/soc/esp32s2/interrupts.c
similarity index 100%
rename from components/soc/soc/esp32s2/interrupts.c
rename to components/soc/esp32s2/interrupts.c
diff --git a/components/soc/soc/esp32s2/ledc_periph.c b/components/soc/esp32s2/ledc_periph.c
similarity index 100%
rename from components/soc/soc/esp32s2/ledc_periph.c
rename to components/soc/esp32s2/ledc_periph.c
diff --git a/components/soc/soc/esp32s2/pcnt_periph.c b/components/soc/esp32s2/pcnt_periph.c
similarity index 100%
rename from components/soc/soc/esp32s2/pcnt_periph.c
rename to components/soc/esp32s2/pcnt_periph.c
diff --git a/components/soc/soc/esp32s2/rtc_io_periph.c b/components/soc/esp32s2/rtc_io_periph.c
similarity index 100%
rename from components/soc/soc/esp32s2/rtc_io_periph.c
rename to components/soc/esp32s2/rtc_io_periph.c
diff --git a/components/soc/soc/esp32s2/rtc_periph.c b/components/soc/esp32s2/rtc_periph.c
similarity index 100%
rename from components/soc/soc/esp32s2/rtc_periph.c
rename to components/soc/esp32s2/rtc_periph.c
diff --git a/components/soc/src/esp32s2/soc_memory_layout.c b/components/soc/esp32s2/soc_memory_layout.c
similarity index 100%
rename from components/soc/src/esp32s2/soc_memory_layout.c
rename to components/soc/esp32s2/soc_memory_layout.c
diff --git a/components/soc/soc/esp32s2/spi_periph.c b/components/soc/esp32s2/spi_periph.c
similarity index 100%
rename from components/soc/soc/esp32s2/spi_periph.c
rename to components/soc/esp32s2/spi_periph.c
diff --git a/components/soc/soc/esp32s2/touch_sensor_periph.c b/components/soc/esp32s2/touch_sensor_periph.c
similarity index 100%
rename from components/soc/soc/esp32s2/touch_sensor_periph.c
rename to components/soc/esp32s2/touch_sensor_periph.c
diff --git a/components/soc/soc/esp32s2/uart_periph.c b/components/soc/esp32s2/uart_periph.c
similarity index 100%
rename from components/soc/soc/esp32s2/uart_periph.c
rename to components/soc/esp32s2/uart_periph.c
diff --git a/components/soc/soc/esp32s2/usb_periph.c b/components/soc/esp32s2/usb_periph.c
similarity index 100%
rename from components/soc/soc/esp32s2/usb_periph.c
rename to components/soc/esp32s2/usb_periph.c
diff --git a/components/soc/soc/esp32s3/CMakeLists.txt b/components/soc/esp32s3/CMakeLists.txt
similarity index 62%
rename from components/soc/soc/esp32s3/CMakeLists.txt
rename to components/soc/esp32s3/CMakeLists.txt
index 148a3177fb..86e7dc8597 100644
--- a/components/soc/soc/esp32s3/CMakeLists.txt
+++ b/components/soc/esp32s3/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(soc_esp32s3 STATIC
+set(srcs
     "adc_periph.c"
     "dac_periph.c"
     "dedic_gpio_periph.c"
@@ -12,8 +12,12 @@ add_library(soc_esp32s3 STATIC
     "rtc_periph.c"
     "sdio_slave_periph.c"
     "sdmmc_periph.c"
+    "soc_memory_layout.c"
     "spi_periph.c"
     "touch_sensor_periph.c"
     "uart_periph.c")
 
-target_include_directories(soc_esp32s3 PUBLIC include ../include private_include)
+add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
+
+target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")
+target_include_directories(${COMPONENT_LIB} PUBLIC . include)
diff --git a/components/soc/soc/esp32s3/adc_periph.c b/components/soc/esp32s3/adc_periph.c
similarity index 100%
rename from components/soc/soc/esp32s3/adc_periph.c
rename to components/soc/esp32s3/adc_periph.c
diff --git a/components/soc/soc/esp32s3/dac_periph.c b/components/soc/esp32s3/dac_periph.c
similarity index 100%
rename from components/soc/soc/esp32s3/dac_periph.c
rename to components/soc/esp32s3/dac_periph.c
diff --git a/components/soc/soc/esp32s3/dedic_gpio_periph.c b/components/soc/esp32s3/dedic_gpio_periph.c
similarity index 100%
rename from components/soc/soc/esp32s3/dedic_gpio_periph.c
rename to components/soc/esp32s3/dedic_gpio_periph.c
diff --git a/components/soc/soc/esp32s3/gpio_periph.c b/components/soc/esp32s3/gpio_periph.c
similarity index 100%
rename from components/soc/soc/esp32s3/gpio_periph.c
rename to components/soc/esp32s3/gpio_periph.c
diff --git a/components/soc/soc/esp32s3/i2c_periph.c b/components/soc/esp32s3/i2c_periph.c
similarity index 100%
rename from components/soc/soc/esp32s3/i2c_periph.c
rename to components/soc/esp32s3/i2c_periph.c
diff --git a/components/soc/soc/esp32s3/i2s_periph.c b/components/soc/esp32s3/i2s_periph.c
similarity index 100%
rename from components/soc/soc/esp32s3/i2s_periph.c
rename to components/soc/esp32s3/i2s_periph.c
diff --git a/components/soc/soc/esp32s3/include/soc/adc_caps.h b/components/soc/esp32s3/include/soc/adc_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/adc_caps.h
rename to components/soc/esp32s3/include/soc/adc_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/adc_channel.h b/components/soc/esp32s3/include/soc/adc_channel.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/adc_channel.h
rename to components/soc/esp32s3/include/soc/adc_channel.h
diff --git a/components/soc/soc/esp32s3/include/soc/apb_ctrl_reg.h b/components/soc/esp32s3/include/soc/apb_ctrl_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/apb_ctrl_reg.h
rename to components/soc/esp32s3/include/soc/apb_ctrl_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/apb_ctrl_struct.h b/components/soc/esp32s3/include/soc/apb_ctrl_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/apb_ctrl_struct.h
rename to components/soc/esp32s3/include/soc/apb_ctrl_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/apb_saradc_reg.h b/components/soc/esp32s3/include/soc/apb_saradc_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/apb_saradc_reg.h
rename to components/soc/esp32s3/include/soc/apb_saradc_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/apb_saradc_struct.h b/components/soc/esp32s3/include/soc/apb_saradc_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/apb_saradc_struct.h
rename to components/soc/esp32s3/include/soc/apb_saradc_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/assist_debug_reg.h b/components/soc/esp32s3/include/soc/assist_debug_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/assist_debug_reg.h
rename to components/soc/esp32s3/include/soc/assist_debug_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/assist_debug_struct.h b/components/soc/esp32s3/include/soc/assist_debug_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/assist_debug_struct.h
rename to components/soc/esp32s3/include/soc/assist_debug_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/bb_reg.h b/components/soc/esp32s3/include/soc/bb_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/bb_reg.h
rename to components/soc/esp32s3/include/soc/bb_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/boot_mode.h b/components/soc/esp32s3/include/soc/boot_mode.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/boot_mode.h
rename to components/soc/esp32s3/include/soc/boot_mode.h
diff --git a/components/soc/soc/esp32s3/include/soc/brownout_caps.h b/components/soc/esp32s3/include/soc/brownout_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/brownout_caps.h
rename to components/soc/esp32s3/include/soc/brownout_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/cache_memory.h b/components/soc/esp32s3/include/soc/cache_memory.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/cache_memory.h
rename to components/soc/esp32s3/include/soc/cache_memory.h
diff --git a/components/soc/soc/esp32s3/include/soc/clkout_channel.h b/components/soc/esp32s3/include/soc/clkout_channel.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/clkout_channel.h
rename to components/soc/esp32s3/include/soc/clkout_channel.h
diff --git a/components/soc/soc/esp32s3/include/soc/cpu_caps.h b/components/soc/esp32s3/include/soc/cpu_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/cpu_caps.h
rename to components/soc/esp32s3/include/soc/cpu_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/dac_caps.h b/components/soc/esp32s3/include/soc/dac_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/dac_caps.h
rename to components/soc/esp32s3/include/soc/dac_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/dac_channel.h b/components/soc/esp32s3/include/soc/dac_channel.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/dac_channel.h
rename to components/soc/esp32s3/include/soc/dac_channel.h
diff --git a/components/soc/soc/esp32s3/include/soc/dport_access.h b/components/soc/esp32s3/include/soc/dport_access.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/dport_access.h
rename to components/soc/esp32s3/include/soc/dport_access.h
diff --git a/components/soc/soc/esp32s3/include/soc/dport_reg.h b/components/soc/esp32s3/include/soc/dport_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/dport_reg.h
rename to components/soc/esp32s3/include/soc/dport_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/efuse_reg.h b/components/soc/esp32s3/include/soc/efuse_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/efuse_reg.h
rename to components/soc/esp32s3/include/soc/efuse_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/efuse_struct.h b/components/soc/esp32s3/include/soc/efuse_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/efuse_struct.h
rename to components/soc/esp32s3/include/soc/efuse_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/extmem_reg.h b/components/soc/esp32s3/include/soc/extmem_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/extmem_reg.h
rename to components/soc/esp32s3/include/soc/extmem_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/extmem_struct.h b/components/soc/esp32s3/include/soc/extmem_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/extmem_struct.h
rename to components/soc/esp32s3/include/soc/extmem_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/fe_reg.h b/components/soc/esp32s3/include/soc/fe_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/fe_reg.h
rename to components/soc/esp32s3/include/soc/fe_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/gdma_caps.h b/components/soc/esp32s3/include/soc/gdma_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/gdma_caps.h
rename to components/soc/esp32s3/include/soc/gdma_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/gdma_reg.h b/components/soc/esp32s3/include/soc/gdma_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/gdma_reg.h
rename to components/soc/esp32s3/include/soc/gdma_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/gdma_struct.h b/components/soc/esp32s3/include/soc/gdma_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/gdma_struct.h
rename to components/soc/esp32s3/include/soc/gdma_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/gpio_caps.h b/components/soc/esp32s3/include/soc/gpio_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/gpio_caps.h
rename to components/soc/esp32s3/include/soc/gpio_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/gpio_pins.h b/components/soc/esp32s3/include/soc/gpio_pins.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/gpio_pins.h
rename to components/soc/esp32s3/include/soc/gpio_pins.h
diff --git a/components/soc/soc/esp32s3/include/soc/gpio_reg.h b/components/soc/esp32s3/include/soc/gpio_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/gpio_reg.h
rename to components/soc/esp32s3/include/soc/gpio_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/gpio_sd_reg.h b/components/soc/esp32s3/include/soc/gpio_sd_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/gpio_sd_reg.h
rename to components/soc/esp32s3/include/soc/gpio_sd_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/gpio_sd_struct.h b/components/soc/esp32s3/include/soc/gpio_sd_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/gpio_sd_struct.h
rename to components/soc/esp32s3/include/soc/gpio_sd_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/gpio_sig_map.h b/components/soc/esp32s3/include/soc/gpio_sig_map.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/gpio_sig_map.h
rename to components/soc/esp32s3/include/soc/gpio_sig_map.h
diff --git a/components/soc/soc/esp32s3/include/soc/gpio_struct.h b/components/soc/esp32s3/include/soc/gpio_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/gpio_struct.h
rename to components/soc/esp32s3/include/soc/gpio_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/hinf_reg.h b/components/soc/esp32s3/include/soc/hinf_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/hinf_reg.h
rename to components/soc/esp32s3/include/soc/hinf_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/hinf_struct.h b/components/soc/esp32s3/include/soc/hinf_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/hinf_struct.h
rename to components/soc/esp32s3/include/soc/hinf_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/host_reg.h b/components/soc/esp32s3/include/soc/host_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/host_reg.h
rename to components/soc/esp32s3/include/soc/host_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/host_struct.h b/components/soc/esp32s3/include/soc/host_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/host_struct.h
rename to components/soc/esp32s3/include/soc/host_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/hwcrypto_reg.h b/components/soc/esp32s3/include/soc/hwcrypto_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/hwcrypto_reg.h
rename to components/soc/esp32s3/include/soc/hwcrypto_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/i2c_caps.h b/components/soc/esp32s3/include/soc/i2c_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/i2c_caps.h
rename to components/soc/esp32s3/include/soc/i2c_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/i2c_reg.h b/components/soc/esp32s3/include/soc/i2c_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/i2c_reg.h
rename to components/soc/esp32s3/include/soc/i2c_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/i2c_struct.h b/components/soc/esp32s3/include/soc/i2c_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/i2c_struct.h
rename to components/soc/esp32s3/include/soc/i2c_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/i2s_caps.h b/components/soc/esp32s3/include/soc/i2s_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/i2s_caps.h
rename to components/soc/esp32s3/include/soc/i2s_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/i2s_reg.h b/components/soc/esp32s3/include/soc/i2s_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/i2s_reg.h
rename to components/soc/esp32s3/include/soc/i2s_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/i2s_struct.h b/components/soc/esp32s3/include/soc/i2s_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/i2s_struct.h
rename to components/soc/esp32s3/include/soc/i2s_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/interrupt_core0_reg.h b/components/soc/esp32s3/include/soc/interrupt_core0_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/interrupt_core0_reg.h
rename to components/soc/esp32s3/include/soc/interrupt_core0_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/interrupt_core0_struct.h b/components/soc/esp32s3/include/soc/interrupt_core0_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/interrupt_core0_struct.h
rename to components/soc/esp32s3/include/soc/interrupt_core0_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/interrupt_core1_reg.h b/components/soc/esp32s3/include/soc/interrupt_core1_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/interrupt_core1_reg.h
rename to components/soc/esp32s3/include/soc/interrupt_core1_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/interrupt_core1_struct.h b/components/soc/esp32s3/include/soc/interrupt_core1_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/interrupt_core1_struct.h
rename to components/soc/esp32s3/include/soc/interrupt_core1_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/interrupt_reg.h b/components/soc/esp32s3/include/soc/interrupt_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/interrupt_reg.h
rename to components/soc/esp32s3/include/soc/interrupt_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/io_mux_reg.h b/components/soc/esp32s3/include/soc/io_mux_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/io_mux_reg.h
rename to components/soc/esp32s3/include/soc/io_mux_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/lcd_cam_reg.h b/components/soc/esp32s3/include/soc/lcd_cam_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/lcd_cam_reg.h
rename to components/soc/esp32s3/include/soc/lcd_cam_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/lcd_cam_struct.h b/components/soc/esp32s3/include/soc/lcd_cam_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/lcd_cam_struct.h
rename to components/soc/esp32s3/include/soc/lcd_cam_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/ledc_caps.h b/components/soc/esp32s3/include/soc/ledc_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/ledc_caps.h
rename to components/soc/esp32s3/include/soc/ledc_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/ledc_reg.h b/components/soc/esp32s3/include/soc/ledc_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/ledc_reg.h
rename to components/soc/esp32s3/include/soc/ledc_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/ledc_struct.h b/components/soc/esp32s3/include/soc/ledc_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/ledc_struct.h
rename to components/soc/esp32s3/include/soc/ledc_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/mcpwm_reg.h b/components/soc/esp32s3/include/soc/mcpwm_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/mcpwm_reg.h
rename to components/soc/esp32s3/include/soc/mcpwm_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/mcpwm_struct.h b/components/soc/esp32s3/include/soc/mcpwm_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/mcpwm_struct.h
rename to components/soc/esp32s3/include/soc/mcpwm_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/mpu_caps.h b/components/soc/esp32s3/include/soc/mpu_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/mpu_caps.h
rename to components/soc/esp32s3/include/soc/mpu_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/nrx_reg.h b/components/soc/esp32s3/include/soc/nrx_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/nrx_reg.h
rename to components/soc/esp32s3/include/soc/nrx_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/pcnt_reg.h b/components/soc/esp32s3/include/soc/pcnt_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/pcnt_reg.h
rename to components/soc/esp32s3/include/soc/pcnt_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/pcnt_struct.h b/components/soc/esp32s3/include/soc/pcnt_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/pcnt_struct.h
rename to components/soc/esp32s3/include/soc/pcnt_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/periph_defs.h b/components/soc/esp32s3/include/soc/periph_defs.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/periph_defs.h
rename to components/soc/esp32s3/include/soc/periph_defs.h
diff --git a/components/soc/soc/esp32s3/include/soc/rmt_caps.h b/components/soc/esp32s3/include/soc/rmt_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/rmt_caps.h
rename to components/soc/esp32s3/include/soc/rmt_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/rmt_reg.h b/components/soc/esp32s3/include/soc/rmt_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/rmt_reg.h
rename to components/soc/esp32s3/include/soc/rmt_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/rmt_struct.h b/components/soc/esp32s3/include/soc/rmt_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/rmt_struct.h
rename to components/soc/esp32s3/include/soc/rmt_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/rsa_caps.h b/components/soc/esp32s3/include/soc/rsa_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/rsa_caps.h
rename to components/soc/esp32s3/include/soc/rsa_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/rtc.h b/components/soc/esp32s3/include/soc/rtc.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/rtc.h
rename to components/soc/esp32s3/include/soc/rtc.h
diff --git a/components/soc/soc/esp32s3/include/soc/rtc_cntl_reg.h b/components/soc/esp32s3/include/soc/rtc_cntl_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/rtc_cntl_reg.h
rename to components/soc/esp32s3/include/soc/rtc_cntl_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/rtc_cntl_struct.h b/components/soc/esp32s3/include/soc/rtc_cntl_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/rtc_cntl_struct.h
rename to components/soc/esp32s3/include/soc/rtc_cntl_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/rtc_gpio_channel.h b/components/soc/esp32s3/include/soc/rtc_gpio_channel.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/rtc_gpio_channel.h
rename to components/soc/esp32s3/include/soc/rtc_gpio_channel.h
diff --git a/components/soc/soc/esp32s3/include/soc/rtc_i2c_reg.h b/components/soc/esp32s3/include/soc/rtc_i2c_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/rtc_i2c_reg.h
rename to components/soc/esp32s3/include/soc/rtc_i2c_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/rtc_i2c_struct.h b/components/soc/esp32s3/include/soc/rtc_i2c_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/rtc_i2c_struct.h
rename to components/soc/esp32s3/include/soc/rtc_i2c_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/rtc_io_caps.h b/components/soc/esp32s3/include/soc/rtc_io_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/rtc_io_caps.h
rename to components/soc/esp32s3/include/soc/rtc_io_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/rtc_io_channel.h b/components/soc/esp32s3/include/soc/rtc_io_channel.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/rtc_io_channel.h
rename to components/soc/esp32s3/include/soc/rtc_io_channel.h
diff --git a/components/soc/soc/esp32s3/include/soc/rtc_io_reg.h b/components/soc/esp32s3/include/soc/rtc_io_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/rtc_io_reg.h
rename to components/soc/esp32s3/include/soc/rtc_io_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/rtc_io_struct.h b/components/soc/esp32s3/include/soc/rtc_io_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/rtc_io_struct.h
rename to components/soc/esp32s3/include/soc/rtc_io_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/sdio_slave_pins.h b/components/soc/esp32s3/include/soc/sdio_slave_pins.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/sdio_slave_pins.h
rename to components/soc/esp32s3/include/soc/sdio_slave_pins.h
diff --git a/components/soc/soc/esp32s3/include/soc/sdmmc_pins.h b/components/soc/esp32s3/include/soc/sdmmc_pins.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/sdmmc_pins.h
rename to components/soc/esp32s3/include/soc/sdmmc_pins.h
diff --git a/components/soc/soc/esp32s3/include/soc/sdmmc_reg.h b/components/soc/esp32s3/include/soc/sdmmc_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/sdmmc_reg.h
rename to components/soc/esp32s3/include/soc/sdmmc_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/sdmmc_struct.h b/components/soc/esp32s3/include/soc/sdmmc_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/sdmmc_struct.h
rename to components/soc/esp32s3/include/soc/sdmmc_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/sens_reg.h b/components/soc/esp32s3/include/soc/sens_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/sens_reg.h
rename to components/soc/esp32s3/include/soc/sens_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/sens_struct.h b/components/soc/esp32s3/include/soc/sens_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/sens_struct.h
rename to components/soc/esp32s3/include/soc/sens_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/sensitive_reg.h b/components/soc/esp32s3/include/soc/sensitive_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/sensitive_reg.h
rename to components/soc/esp32s3/include/soc/sensitive_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/sensitive_struct.h b/components/soc/esp32s3/include/soc/sensitive_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/sensitive_struct.h
rename to components/soc/esp32s3/include/soc/sensitive_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/sha_caps.h b/components/soc/esp32s3/include/soc/sha_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/sha_caps.h
rename to components/soc/esp32s3/include/soc/sha_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/sigmadelta_caps.h b/components/soc/esp32s3/include/soc/sigmadelta_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/sigmadelta_caps.h
rename to components/soc/esp32s3/include/soc/sigmadelta_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/slc_reg.h b/components/soc/esp32s3/include/soc/slc_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/slc_reg.h
rename to components/soc/esp32s3/include/soc/slc_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/slc_struct.h b/components/soc/esp32s3/include/soc/slc_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/slc_struct.h
rename to components/soc/esp32s3/include/soc/slc_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/soc.h b/components/soc/esp32s3/include/soc/soc.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/soc.h
rename to components/soc/esp32s3/include/soc/soc.h
diff --git a/components/soc/soc/esp32s3/include/soc/soc_caps.h b/components/soc/esp32s3/include/soc/soc_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/soc_caps.h
rename to components/soc/esp32s3/include/soc/soc_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/soc_pins.h b/components/soc/esp32s3/include/soc/soc_pins.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/soc_pins.h
rename to components/soc/esp32s3/include/soc/soc_pins.h
diff --git a/components/soc/soc/esp32s3/include/soc/soc_ulp.h b/components/soc/esp32s3/include/soc/soc_ulp.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/soc_ulp.h
rename to components/soc/esp32s3/include/soc/soc_ulp.h
diff --git a/components/soc/soc/esp32s3/include/soc/spi_caps.h b/components/soc/esp32s3/include/soc/spi_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/spi_caps.h
rename to components/soc/esp32s3/include/soc/spi_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/spi_mem_reg.h b/components/soc/esp32s3/include/soc/spi_mem_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/spi_mem_reg.h
rename to components/soc/esp32s3/include/soc/spi_mem_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/spi_mem_struct.h b/components/soc/esp32s3/include/soc/spi_mem_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/spi_mem_struct.h
rename to components/soc/esp32s3/include/soc/spi_mem_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/spi_pins.h b/components/soc/esp32s3/include/soc/spi_pins.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/spi_pins.h
rename to components/soc/esp32s3/include/soc/spi_pins.h
diff --git a/components/soc/soc/esp32s3/include/soc/spi_reg.h b/components/soc/esp32s3/include/soc/spi_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/spi_reg.h
rename to components/soc/esp32s3/include/soc/spi_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/spi_struct.h b/components/soc/esp32s3/include/soc/spi_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/spi_struct.h
rename to components/soc/esp32s3/include/soc/spi_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/sys_timer_reg.h b/components/soc/esp32s3/include/soc/sys_timer_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/sys_timer_reg.h
rename to components/soc/esp32s3/include/soc/sys_timer_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/sys_timer_struct.h b/components/soc/esp32s3/include/soc/sys_timer_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/sys_timer_struct.h
rename to components/soc/esp32s3/include/soc/sys_timer_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/syscon_reg.h b/components/soc/esp32s3/include/soc/syscon_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/syscon_reg.h
rename to components/soc/esp32s3/include/soc/syscon_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/syscon_struct.h b/components/soc/esp32s3/include/soc/syscon_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/syscon_struct.h
rename to components/soc/esp32s3/include/soc/syscon_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/system_reg.h b/components/soc/esp32s3/include/soc/system_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/system_reg.h
rename to components/soc/esp32s3/include/soc/system_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/system_struct.h b/components/soc/esp32s3/include/soc/system_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/system_struct.h
rename to components/soc/esp32s3/include/soc/system_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/systimer_caps.h b/components/soc/esp32s3/include/soc/systimer_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/systimer_caps.h
rename to components/soc/esp32s3/include/soc/systimer_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/timer_group_caps.h b/components/soc/esp32s3/include/soc/timer_group_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/timer_group_caps.h
rename to components/soc/esp32s3/include/soc/timer_group_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/timer_group_reg.h b/components/soc/esp32s3/include/soc/timer_group_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/timer_group_reg.h
rename to components/soc/esp32s3/include/soc/timer_group_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/timer_group_struct.h b/components/soc/esp32s3/include/soc/timer_group_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/timer_group_struct.h
rename to components/soc/esp32s3/include/soc/timer_group_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/touch_channel.h b/components/soc/esp32s3/include/soc/touch_channel.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/touch_channel.h
rename to components/soc/esp32s3/include/soc/touch_channel.h
diff --git a/components/soc/soc/esp32s3/include/soc/touch_sensor_caps.h b/components/soc/esp32s3/include/soc/touch_sensor_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/touch_sensor_caps.h
rename to components/soc/esp32s3/include/soc/touch_sensor_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/touch_sensor_channel.h b/components/soc/esp32s3/include/soc/touch_sensor_channel.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/touch_sensor_channel.h
rename to components/soc/esp32s3/include/soc/touch_sensor_channel.h
diff --git a/components/soc/soc/esp32s3/include/soc/twai_caps.h b/components/soc/esp32s3/include/soc/twai_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/twai_caps.h
rename to components/soc/esp32s3/include/soc/twai_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/twai_struct.h b/components/soc/esp32s3/include/soc/twai_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/twai_struct.h
rename to components/soc/esp32s3/include/soc/twai_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/uart_caps.h b/components/soc/esp32s3/include/soc/uart_caps.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/uart_caps.h
rename to components/soc/esp32s3/include/soc/uart_caps.h
diff --git a/components/soc/soc/esp32s3/include/soc/uart_channel.h b/components/soc/esp32s3/include/soc/uart_channel.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/uart_channel.h
rename to components/soc/esp32s3/include/soc/uart_channel.h
diff --git a/components/soc/soc/esp32s3/include/soc/uart_reg.h b/components/soc/esp32s3/include/soc/uart_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/uart_reg.h
rename to components/soc/esp32s3/include/soc/uart_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/uart_struct.h b/components/soc/esp32s3/include/soc/uart_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/uart_struct.h
rename to components/soc/esp32s3/include/soc/uart_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/uhci_reg.h b/components/soc/esp32s3/include/soc/uhci_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/uhci_reg.h
rename to components/soc/esp32s3/include/soc/uhci_reg.h
diff --git a/components/soc/soc/esp32s3/include/soc/uhci_struct.h b/components/soc/esp32s3/include/soc/uhci_struct.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/uhci_struct.h
rename to components/soc/esp32s3/include/soc/uhci_struct.h
diff --git a/components/soc/soc/esp32s3/include/soc/wdev_reg.h b/components/soc/esp32s3/include/soc/wdev_reg.h
similarity index 100%
rename from components/soc/soc/esp32s3/include/soc/wdev_reg.h
rename to components/soc/esp32s3/include/soc/wdev_reg.h
diff --git a/components/soc/soc/esp32s3/interrupts.c b/components/soc/esp32s3/interrupts.c
similarity index 100%
rename from components/soc/soc/esp32s3/interrupts.c
rename to components/soc/esp32s3/interrupts.c
diff --git a/components/soc/soc/esp32s3/ledc_periph.c b/components/soc/esp32s3/ledc_periph.c
similarity index 100%
rename from components/soc/soc/esp32s3/ledc_periph.c
rename to components/soc/esp32s3/ledc_periph.c
diff --git a/components/soc/soc/esp32s3/pcnt_periph.c b/components/soc/esp32s3/pcnt_periph.c
similarity index 100%
rename from components/soc/soc/esp32s3/pcnt_periph.c
rename to components/soc/esp32s3/pcnt_periph.c
diff --git a/components/soc/soc/esp32s3/rtc_io_periph.c b/components/soc/esp32s3/rtc_io_periph.c
similarity index 100%
rename from components/soc/soc/esp32s3/rtc_io_periph.c
rename to components/soc/esp32s3/rtc_io_periph.c
diff --git a/components/soc/soc/esp32s3/rtc_periph.c b/components/soc/esp32s3/rtc_periph.c
similarity index 100%
rename from components/soc/soc/esp32s3/rtc_periph.c
rename to components/soc/esp32s3/rtc_periph.c
diff --git a/components/soc/soc/esp32s3/sdio_slave_periph.c b/components/soc/esp32s3/sdio_slave_periph.c
similarity index 100%
rename from components/soc/soc/esp32s3/sdio_slave_periph.c
rename to components/soc/esp32s3/sdio_slave_periph.c
diff --git a/components/soc/soc/esp32s3/sdmmc_periph.c b/components/soc/esp32s3/sdmmc_periph.c
similarity index 100%
rename from components/soc/soc/esp32s3/sdmmc_periph.c
rename to components/soc/esp32s3/sdmmc_periph.c
diff --git a/components/soc/src/esp32s3/soc_memory_layout.c b/components/soc/esp32s3/soc_memory_layout.c
similarity index 100%
rename from components/soc/src/esp32s3/soc_memory_layout.c
rename to components/soc/esp32s3/soc_memory_layout.c
diff --git a/components/soc/soc/esp32s3/spi_periph.c b/components/soc/esp32s3/spi_periph.c
similarity index 100%
rename from components/soc/soc/esp32s3/spi_periph.c
rename to components/soc/esp32s3/spi_periph.c
diff --git a/components/soc/soc/esp32s3/touch_sensor_periph.c b/components/soc/esp32s3/touch_sensor_periph.c
similarity index 100%
rename from components/soc/soc/esp32s3/touch_sensor_periph.c
rename to components/soc/esp32s3/touch_sensor_periph.c
diff --git a/components/soc/soc/esp32s3/uart_periph.c b/components/soc/esp32s3/uart_periph.c
similarity index 100%
rename from components/soc/soc/esp32s3/uart_periph.c
rename to components/soc/esp32s3/uart_periph.c
diff --git a/components/soc/soc/include/soc/adc_periph.h b/components/soc/include/soc/adc_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/adc_periph.h
rename to components/soc/include/soc/adc_periph.h
diff --git a/components/soc/soc/include/soc/dac_periph.h b/components/soc/include/soc/dac_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/dac_periph.h
rename to components/soc/include/soc/dac_periph.h
diff --git a/components/soc/soc/include/soc/dedic_gpio_periph.h b/components/soc/include/soc/dedic_gpio_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/dedic_gpio_periph.h
rename to components/soc/include/soc/dedic_gpio_periph.h
diff --git a/components/soc/soc/include/soc/efuse_periph.h b/components/soc/include/soc/efuse_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/efuse_periph.h
rename to components/soc/include/soc/efuse_periph.h
diff --git a/components/soc/soc/include/soc/emac_periph.h b/components/soc/include/soc/emac_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/emac_periph.h
rename to components/soc/include/soc/emac_periph.h
diff --git a/components/soc/soc/include/soc/gpio_periph.h b/components/soc/include/soc/gpio_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/gpio_periph.h
rename to components/soc/include/soc/gpio_periph.h
diff --git a/components/soc/soc/include/soc/hwcrypto_periph.h b/components/soc/include/soc/hwcrypto_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/hwcrypto_periph.h
rename to components/soc/include/soc/hwcrypto_periph.h
diff --git a/components/soc/soc/include/soc/i2c_periph.h b/components/soc/include/soc/i2c_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/i2c_periph.h
rename to components/soc/include/soc/i2c_periph.h
diff --git a/components/soc/soc/include/soc/i2s_periph.h b/components/soc/include/soc/i2s_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/i2s_periph.h
rename to components/soc/include/soc/i2s_periph.h
diff --git a/components/soc/soc/include/soc/interrupts.h b/components/soc/include/soc/interrupts.h
similarity index 100%
rename from components/soc/soc/include/soc/interrupts.h
rename to components/soc/include/soc/interrupts.h
diff --git a/components/soc/soc/include/soc/ledc_periph.h b/components/soc/include/soc/ledc_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/ledc_periph.h
rename to components/soc/include/soc/ledc_periph.h
diff --git a/components/soc/soc/include/soc/mcpwm_periph.h b/components/soc/include/soc/mcpwm_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/mcpwm_periph.h
rename to components/soc/include/soc/mcpwm_periph.h
diff --git a/components/soc/soc/include/soc/pcnt_periph.h b/components/soc/include/soc/pcnt_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/pcnt_periph.h
rename to components/soc/include/soc/pcnt_periph.h
diff --git a/components/soc/soc/include/soc/rmt_periph.h b/components/soc/include/soc/rmt_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/rmt_periph.h
rename to components/soc/include/soc/rmt_periph.h
diff --git a/components/soc/soc/include/soc/rtc_cntl_periph.h b/components/soc/include/soc/rtc_cntl_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/rtc_cntl_periph.h
rename to components/soc/include/soc/rtc_cntl_periph.h
diff --git a/components/soc/soc/include/soc/rtc_io_periph.h b/components/soc/include/soc/rtc_io_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/rtc_io_periph.h
rename to components/soc/include/soc/rtc_io_periph.h
diff --git a/components/soc/soc/include/soc/rtc_periph.h b/components/soc/include/soc/rtc_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/rtc_periph.h
rename to components/soc/include/soc/rtc_periph.h
diff --git a/components/soc/soc/include/soc/sdio_slave_periph.h b/components/soc/include/soc/sdio_slave_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/sdio_slave_periph.h
rename to components/soc/include/soc/sdio_slave_periph.h
diff --git a/components/soc/soc/include/soc/sdmmc_periph.h b/components/soc/include/soc/sdmmc_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/sdmmc_periph.h
rename to components/soc/include/soc/sdmmc_periph.h
diff --git a/components/soc/soc/include/soc/sens_periph.h b/components/soc/include/soc/sens_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/sens_periph.h
rename to components/soc/include/soc/sens_periph.h
diff --git a/components/soc/soc/include/soc/sigmadelta_periph.h b/components/soc/include/soc/sigmadelta_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/sigmadelta_periph.h
rename to components/soc/include/soc/sigmadelta_periph.h
diff --git a/components/soc/soc/include/soc/spi_periph.h b/components/soc/include/soc/spi_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/spi_periph.h
rename to components/soc/include/soc/spi_periph.h
diff --git a/components/soc/soc/include/soc/syscon_periph.h b/components/soc/include/soc/syscon_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/syscon_periph.h
rename to components/soc/include/soc/syscon_periph.h
diff --git a/components/soc/soc/include/soc/timer_periph.h b/components/soc/include/soc/timer_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/timer_periph.h
rename to components/soc/include/soc/timer_periph.h
diff --git a/components/soc/soc/include/soc/touch_sensor_periph.h b/components/soc/include/soc/touch_sensor_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/touch_sensor_periph.h
rename to components/soc/include/soc/touch_sensor_periph.h
diff --git a/components/soc/soc/include/soc/twai_periph.h b/components/soc/include/soc/twai_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/twai_periph.h
rename to components/soc/include/soc/twai_periph.h
diff --git a/components/soc/soc/include/soc/uart_periph.h b/components/soc/include/soc/uart_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/uart_periph.h
rename to components/soc/include/soc/uart_periph.h
diff --git a/components/soc/soc/include/soc/uhci_periph.h b/components/soc/include/soc/uhci_periph.h
similarity index 100%
rename from components/soc/soc/include/soc/uhci_periph.h
rename to components/soc/include/soc/uhci_periph.h
diff --git a/components/soc/linker.lf b/components/soc/linker.lf
index 19e55bbd89..592bc196c4 100644
--- a/components/soc/linker.lf
+++ b/components/soc/linker.lf
@@ -1,12 +1,4 @@
 [mapping:soc]
 archive: libsoc.a
 entries:
-    cpu_util (noflash_text)
-    rtc_clk (noflash)
-    rtc_init:rtc_vddsdio_set_config (noflash)
-    rtc_periph (noflash_text)
-    rtc_pm (noflash_text)
-    rtc_sleep (noflash_text)
-    rtc_time (noflash_text)
-    rtc_wdt (noflash_text)
     lldesc (noflash)
diff --git a/components/soc/src/lldesc.c b/components/soc/lldesc.c
similarity index 100%
rename from components/soc/src/lldesc.c
rename to components/soc/lldesc.c
diff --git a/components/soc/src/memory_layout_utils.c b/components/soc/memory_layout_utils.c
similarity index 100%
rename from components/soc/src/memory_layout_utils.c
rename to components/soc/memory_layout_utils.c
diff --git a/components/soc/soc/CMakeLists.txt b/components/soc/soc/CMakeLists.txt
deleted file mode 100644
index 0f0ee7f6cf..0000000000
--- a/components/soc/soc/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-idf_build_get_property(target IDF_TARGET)
-add_subdirectory(${target})
diff --git a/components/soc/soc/component.mk b/components/soc/soc/component.mk
deleted file mode 100644
index 8deea5253f..0000000000
--- a/components/soc/soc/component.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS += soc/include soc/$(SOC_NAME)/private_include soc/$(SOC_NAME)/include
-COMPONENT_SRCDIRS += soc/$(SOC_NAME)
diff --git a/components/soc/src/soc_include_legacy_warn.c b/components/soc/soc_include_legacy_warn.c
similarity index 100%
rename from components/soc/src/soc_include_legacy_warn.c
rename to components/soc/soc_include_legacy_warn.c
diff --git a/components/soc/src/esp32/component.mk b/components/soc/src/esp32/component.mk
deleted file mode 100644
index aea3541d82..0000000000
--- a/components/soc/src/esp32/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS += src/$(SOC_NAME) src/$(SOC_NAME)/include
-COMPONENT_SRCDIRS += src/$(SOC_NAME)
-
-ifndef CONFIG_ETH_USE_ESP32_EMAC
-    COMPONENT_OBJEXCLUDE += src/esp32/emac_hal.o
-endif
-
-src/esp32/rtc_clk.o: CFLAGS += -fno-jump-tables -fno-tree-switch-conversion
\ No newline at end of file
diff --git a/components/soc/test/CMakeLists.txt b/components/soc/test/CMakeLists.txt
deleted file mode 100644
index 52491e925a..0000000000
--- a/components/soc/test/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-idf_build_get_property(soc_name IDF_TARGET)
-
-idf_component_register(SRC_DIRS "."
-                    PRIV_INCLUDE_DIRS "${include_dirs}"
-                    PRIV_REQUIRES cmock test_utils)
diff --git a/components/spi_flash/sim/Makefile.files b/components/spi_flash/sim/Makefile.files
index 5c05144322..a66ca7733d 100644
--- a/components/spi_flash/sim/Makefile.files
+++ b/components/spi_flash/sim/Makefile.files
@@ -29,9 +29,8 @@ INCLUDE_DIRS := \
 	esp_system/include \
 	xtensa/include \
 	xtensa/esp32/include \
-	soc/soc/esp32/include \
+	soc/esp32/include \
 	soc/include \
-	soc/soc/include \
 	esp32/include \
 	esp_timer/include \
 	bootloader_support/include \
diff --git a/components/spi_flash/sim/stubs/Makefile.files b/components/spi_flash/sim/stubs/Makefile.files
index 9b63d80c97..f6275d7f23 100644
--- a/components/spi_flash/sim/stubs/Makefile.files
+++ b/components/spi_flash/sim/stubs/Makefile.files
@@ -21,9 +21,8 @@ INCLUDE_DIRS := \
 	$(addprefix ../../../../components/, \
 	esp_common/include \
 	esp_system/include \
-	soc/soc/esp32/include \
+	soc/esp32/include \
 	soc/include \
-	soc/soc/include \
 	xtensa/include \
 	xtensa/esp32/include \
 	esp32/include \
diff --git a/components/spiffs/test_spiffs_host/Makefile.files b/components/spiffs/test_spiffs_host/Makefile.files
index f5278d0002..924493e9e4 100644
--- a/components/spiffs/test_spiffs_host/Makefile.files
+++ b/components/spiffs/test_spiffs_host/Makefile.files
@@ -28,9 +28,8 @@ INCLUDE_DIRS := \
 	esp_system/include \
 	xtensa/include \
 	xtensa/esp32/include \
-	soc/soc/esp32/include \
+	soc/esp32/include \
 	soc/include \
-	soc/soc/include \
 	esp32/include \
 	bootloader_support/include \
 	app_update/include \
diff --git a/components/wear_levelling/test_wl_host/Makefile.files b/components/wear_levelling/test_wl_host/Makefile.files
index 93cd2bc722..47c365a4fc 100644
--- a/components/wear_levelling/test_wl_host/Makefile.files
+++ b/components/wear_levelling/test_wl_host/Makefile.files
@@ -27,9 +27,8 @@ INCLUDE_DIRS := \
 	esp_common/include \
 	xtensa/include \
 	xtensa/esp32/include \
-	soc/soc/esp32/include \
+	soc/esp32/include \
 	soc/include \
-	soc/soc/include \
 	esp32/include \
 	bootloader_support/include \
 	app_update/include \
diff --git a/docs/Doxyfile b/docs/Doxyfile
index 242214b14b..7345aa0c12 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -138,11 +138,11 @@ INPUT = \
     $(IDF_PATH)/components/hal/include/hal/adc_types.h \
     $(IDF_PATH)/components/hal/include/hal/twai_types.h \
     $(IDF_PATH)/components/hal/include/hal/touch_sensor_types.h \
-    $(IDF_PATH)/components/soc/soc/esp32/include/soc/adc_channel.h \
-    $(IDF_PATH)/components/soc/soc/esp32/include/soc/dac_channel.h \
-    $(IDF_PATH)/components/soc/soc/esp32/include/soc/touch_sensor_channel.h \
-    $(IDF_PATH)/components/soc/soc/esp32/include/soc/uart_channel.h \
-    $(IDF_PATH)/components/soc/soc/esp32/include/soc/rtc_io_channel.h \
+    $(IDF_PATH)/components/soc/esp32/include/soc/adc_channel.h \
+    $(IDF_PATH)/components/soc/esp32/include/soc/dac_channel.h \
+    $(IDF_PATH)/components/soc/esp32/include/soc/touch_sensor_channel.h \
+    $(IDF_PATH)/components/soc/esp32/include/soc/uart_channel.h \
+    $(IDF_PATH)/components/soc/esp32/include/soc/rtc_io_channel.h \
     ## esp_netif - API Reference
     $(IDF_PATH)/components/esp_netif/include/esp_netif.h \
     $(IDF_PATH)/components/esp_netif/include/esp_netif_net_stack.h \
diff --git a/docs/en/api-guides/freertos-smp.rst b/docs/en/api-guides/freertos-smp.rst
index 0d41d4061a..304fce38da 100644
--- a/docs/en/api-guides/freertos-smp.rst
+++ b/docs/en/api-guides/freertos-smp.rst
@@ -327,7 +327,7 @@ The ESP-IDF FreeRTOS critical section functions have been modified as follows…
    section functions (``port*_CRITICAL`` in Non-ISR and ``port*_CRITICAL_ISR`` in ISR)
    in order to be in compliance with Vanilla FreeRTOS.
 
-For more details see :component_file:`soc/include/soc/spinlock.h`
+For more details see :component_file:`esp_hw_support/include/soc/spinlock.h`
 and :component_file:`freertos/tasks.c`
 
 It should be noted that when modifying vanilla FreeRTOS code to be ESP-IDF
diff --git a/docs/en/api-reference/peripherals/rmt.rst b/docs/en/api-reference/peripherals/rmt.rst
index 0e66057b59..8420ee363a 100644
--- a/docs/en/api-reference/peripherals/rmt.rst
+++ b/docs/en/api-reference/peripherals/rmt.rst
@@ -269,11 +269,11 @@ Setting or clearing an interrupt enable mask for specific channels and events ma
 
 .. only:: esp32
 
-    When servicing an interrupt within an ISR, the interrupt need to explicitly cleared. To do so, set specific bits described as ``RMT.int_clr.val.chN_event_name`` and defined as a ``volatile struct`` in :component_file:`soc/soc/esp32/include/soc/rmt_struct.h`, where N is the RMT channel number [0, n] and the ``event_name`` is one of four events described above.
+    When servicing an interrupt within an ISR, the interrupt need to explicitly cleared. To do so, set specific bits described as ``RMT.int_clr.val.chN_event_name`` and defined as a ``volatile struct`` in :component_file:`soc/esp32/include/soc/rmt_struct.h`, where N is the RMT channel number [0, n] and the ``event_name`` is one of four events described above.
 
 .. only:: esp32s2
 
-    When servicing an interrupt within an ISR, the interrupt need to explicitly cleared. To do so, set specific bits described as ``RMT.int_clr.val.chN_event_name`` and defined as a ``volatile struct`` in :component_file:`soc/soc/esp32s2/include/soc/rmt_struct.h`, where N is the RMT channel number [0, n] and the ``event_name`` is one of four events described above.
+    When servicing an interrupt within an ISR, the interrupt need to explicitly cleared. To do so, set specific bits described as ``RMT.int_clr.val.chN_event_name`` and defined as a ``volatile struct`` in :component_file:`soc/esp32s2/include/soc/rmt_struct.h`, where N is the RMT channel number [0, n] and the ``event_name`` is one of four events described above.
 
 If you do not need an ISR anymore, you can deregister it by calling a function :cpp:func:`rmt_isr_deregister`.
 
diff --git a/docs/en/api-reference/peripherals/timer.rst b/docs/en/api-reference/peripherals/timer.rst
index 017ecab01f..94ecf5461d 100644
--- a/docs/en/api-reference/peripherals/timer.rst
+++ b/docs/en/api-reference/peripherals/timer.rst
@@ -91,7 +91,7 @@ Registration of the interrupt handler for a specific timer or a timer group can
 To enable interrupts for a timer group, call :cpp:func:`timer_group_intr_enable`, for a specific timer call :cpp:func:`timer_enable_intr`.
 To disable interrupts for a timer group, call :cpp:func:`timer_group_intr_disable`, for a specified timer, call :cpp:func:`timer_disable_intr`.
 
-When handling an interrupt within an interrupt serivce routine (ISR), the interrupt status bit needs to be explicitly cleared. To do that, set the ``TIMERGN.{IDF_TARGET_INT_CLR_REG}.tM`` structure, defined in :component_file:`soc/soc/{IDF_TARGET_PATH_NAME}/include/soc/timer_group_struct.h`. In this structure, ``N`` is the timer group number [0, 1], ``M`` is the timer number [0, 1]. For example, to clear an interrupt status bit for the timer 1 in the timer group 0, call the following::
+When handling an interrupt within an interrupt serivce routine (ISR), the interrupt status bit needs to be explicitly cleared. To do that, set the ``TIMERGN.{IDF_TARGET_INT_CLR_REG}.tM`` structure, defined in :component_file:`soc/{IDF_TARGET_PATH_NAME}/include/soc/timer_group_struct.h`. In this structure, ``N`` is the timer group number [0, 1], ``M`` is the timer number [0, 1]. For example, to clear an interrupt status bit for the timer 1 in the timer group 0, call the following::
 
     TIMERG0.{IDF_TARGET_INT_CLR_REG}.t1 = 1
 
diff --git a/docs/idf_extensions/gen_defines.py b/docs/idf_extensions/gen_defines.py
index da5f325f14..c067ce5a7d 100644
--- a/docs/idf_extensions/gen_defines.py
+++ b/docs/idf_extensions/gen_defines.py
@@ -26,7 +26,7 @@ def generate_defines(app, project_description):
     #
     # kind of a hack, be nicer to add a component info dict in project_description.json
     soc_path = [p for p in project_description["build_component_paths"] if p.endswith("/soc")][0]
-    soc_headers = glob.glob(os.path.join(soc_path, "soc", project_description["target"],
+    soc_headers = glob.glob(os.path.join(soc_path, project_description["target"],
                                          "include", "soc", "*_caps.h"))
     assert len(soc_headers) > 0
 
diff --git a/docs/zh_CN/api-reference/peripherals/timer.rst b/docs/zh_CN/api-reference/peripherals/timer.rst
index b9ea490b7e..bc61138967 100644
--- a/docs/zh_CN/api-reference/peripherals/timer.rst
+++ b/docs/zh_CN/api-reference/peripherals/timer.rst
@@ -89,7 +89,7 @@ ESP32 芯片提供两组硬件定时器，每组包含两个通用硬件定时
 
 调用 :cpp:func:`timer_group_intr_enable` 使能定时器组的中断程序，调用 :cpp:func:`timer_enable_intr` 使能某定时器的中断程序。调用 :cpp:func:`timer_group_intr_disable` 关闭定时器组的中断程序，调用 :cpp:func:`timer_disable_intr` 关闭某定时器的中断程序。
 
-在中断服务程序（ISR）中处理中断时，需要明确地清除中断状态位。为此，请设置定义在 :component_file:`soc/soc/esp32/include/soc/timer_group_struct.h` 中的 ``TIMERGN.int_clr_timers.tM`` 结构。该结构中 ``N`` 是定时器组别编号 [0, 1]，``M`` 是定时器编号 [0, 1]。例如，要清除定时器组别 0 中定时器 1 的中断状态位，请调用以下命令:: 
+在中断服务程序（ISR）中处理中断时，需要明确地清除中断状态位。为此，请设置定义在 :component_file:`soc/esp32/include/soc/timer_group_struct.h` 中的 ``TIMERGN.int_clr_timers.tM`` 结构。该结构中 ``N`` 是定时器组别编号 [0, 1]，``M`` 是定时器编号 [0, 1]。例如，要清除定时器组别 0 中定时器 1 的中断状态位，请调用以下命令:: 
 
     TIMERG0.int_clr_timers.t1 = 1
 
diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt
index a4ad7820bb..bb7e4d8443 100644
--- a/tools/ci/check_public_headers_exceptions.txt
+++ b/tools/ci/check_public_headers_exceptions.txt
@@ -108,7 +108,7 @@ components/esp_common/include/esp_compiler.h
 components/lwip/lwip/src/include/lwip/prot/nd6.h
 components/lwip/port/esp32/include/netif/dhcp_state.h
 components/soc/src/esp32/rtc_clk_common.h
-components/soc/src/esp32/i2c_rtc_clk.h
+components/esp_hw_support/port/esp32/regi2c_ctrl.h
 components/esp_rom/include/esp32/rom/sha.h
 components/esp_rom/include/esp32/rom/secure_boot.h
 components/esp_rom/include/esp32s2/rom/spi_flash.h
diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index e450aabaed..4b8cb9830a 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -479,7 +479,7 @@ UT_034:
 
 UT_035:
   extends: .unit_test_s2_template
-  parallel: 43
+  parallel: 44
   tags:
     - ESP32S2_IDF
     - UT_T1_1
diff --git a/tools/cmake/build.cmake b/tools/cmake/build.cmake
index 707a2e6a87..7560b0267b 100644
--- a/tools/cmake/build.cmake
+++ b/tools/cmake/build.cmake
@@ -154,7 +154,8 @@ function(__build_init idf_path)
     # Set components required by all other components in the build
     #
     # - lwip is here so that #include <sys/socket.h> works without any special provisions
-    set(requires_common cxx newlib freertos heap log lwip soc hal esp_rom esp_common esp_system xtensa)
+    # - esp_hw_support is here for backward compatibility
+    set(requires_common cxx newlib freertos esp_hw_support heap log lwip soc hal esp_rom esp_common esp_system xtensa)
     idf_build_set_property(__COMPONENT_REQUIRES_COMMON "${requires_common}")
 
     __build_get_idf_git_revision()