diff --git a/components/esp32/include/soc/apb_ctrl_reg.h b/components/soc/esp32/include/soc/apb_ctrl_reg.h
similarity index 100%
rename from components/esp32/include/soc/apb_ctrl_reg.h
rename to components/soc/esp32/include/soc/apb_ctrl_reg.h
diff --git a/components/esp32/include/soc/apb_ctrl_struct.h b/components/soc/esp32/include/soc/apb_ctrl_struct.h
similarity index 100%
rename from components/esp32/include/soc/apb_ctrl_struct.h
rename to components/soc/esp32/include/soc/apb_ctrl_struct.h
diff --git a/components/esp32/include/soc/bb_reg.h b/components/soc/esp32/include/soc/bb_reg.h
similarity index 100%
rename from components/esp32/include/soc/bb_reg.h
rename to components/soc/esp32/include/soc/bb_reg.h
diff --git a/components/esp32/include/soc/boot_mode.h b/components/soc/esp32/include/soc/boot_mode.h
similarity index 100%
rename from components/esp32/include/soc/boot_mode.h
rename to components/soc/esp32/include/soc/boot_mode.h
diff --git a/components/esp32/include/soc/cpu.h b/components/soc/esp32/include/soc/cpu.h
similarity index 100%
rename from components/esp32/include/soc/cpu.h
rename to components/soc/esp32/include/soc/cpu.h
diff --git a/components/esp32/include/soc/dport_reg.h b/components/soc/esp32/include/soc/dport_reg.h
similarity index 100%
rename from components/esp32/include/soc/dport_reg.h
rename to components/soc/esp32/include/soc/dport_reg.h
diff --git a/components/esp32/include/soc/efuse_reg.h b/components/soc/esp32/include/soc/efuse_reg.h
similarity index 100%
rename from components/esp32/include/soc/efuse_reg.h
rename to components/soc/esp32/include/soc/efuse_reg.h
diff --git a/components/esp32/include/soc/emac_ex_reg.h b/components/soc/esp32/include/soc/emac_ex_reg.h
similarity index 100%
rename from components/esp32/include/soc/emac_ex_reg.h
rename to components/soc/esp32/include/soc/emac_ex_reg.h
diff --git a/components/esp32/include/soc/emac_reg_v2.h b/components/soc/esp32/include/soc/emac_reg_v2.h
similarity index 100%
rename from components/esp32/include/soc/emac_reg_v2.h
rename to components/soc/esp32/include/soc/emac_reg_v2.h
diff --git a/components/esp32/include/soc/frc_timer_reg.h b/components/soc/esp32/include/soc/frc_timer_reg.h
similarity index 100%
rename from components/esp32/include/soc/frc_timer_reg.h
rename to components/soc/esp32/include/soc/frc_timer_reg.h
diff --git a/components/esp32/include/soc/gpio_reg.h b/components/soc/esp32/include/soc/gpio_reg.h
similarity index 100%
rename from components/esp32/include/soc/gpio_reg.h
rename to components/soc/esp32/include/soc/gpio_reg.h
diff --git a/components/esp32/include/soc/gpio_sd_reg.h b/components/soc/esp32/include/soc/gpio_sd_reg.h
similarity index 100%
rename from components/esp32/include/soc/gpio_sd_reg.h
rename to components/soc/esp32/include/soc/gpio_sd_reg.h
diff --git a/components/esp32/include/soc/gpio_sd_struct.h b/components/soc/esp32/include/soc/gpio_sd_struct.h
similarity index 100%
rename from components/esp32/include/soc/gpio_sd_struct.h
rename to components/soc/esp32/include/soc/gpio_sd_struct.h
diff --git a/components/esp32/include/soc/gpio_sig_map.h b/components/soc/esp32/include/soc/gpio_sig_map.h
similarity index 100%
rename from components/esp32/include/soc/gpio_sig_map.h
rename to components/soc/esp32/include/soc/gpio_sig_map.h
diff --git a/components/esp32/include/soc/gpio_struct.h b/components/soc/esp32/include/soc/gpio_struct.h
similarity index 100%
rename from components/esp32/include/soc/gpio_struct.h
rename to components/soc/esp32/include/soc/gpio_struct.h
diff --git a/components/esp32/include/soc/hwcrypto_reg.h b/components/soc/esp32/include/soc/hwcrypto_reg.h
similarity index 100%
rename from components/esp32/include/soc/hwcrypto_reg.h
rename to components/soc/esp32/include/soc/hwcrypto_reg.h
diff --git a/components/esp32/include/soc/i2c_reg.h b/components/soc/esp32/include/soc/i2c_reg.h
similarity index 100%
rename from components/esp32/include/soc/i2c_reg.h
rename to components/soc/esp32/include/soc/i2c_reg.h
diff --git a/components/esp32/include/soc/i2c_struct.h b/components/soc/esp32/include/soc/i2c_struct.h
similarity index 100%
rename from components/esp32/include/soc/i2c_struct.h
rename to components/soc/esp32/include/soc/i2c_struct.h
diff --git a/components/esp32/include/soc/i2s_reg.h b/components/soc/esp32/include/soc/i2s_reg.h
similarity index 100%
rename from components/esp32/include/soc/i2s_reg.h
rename to components/soc/esp32/include/soc/i2s_reg.h
diff --git a/components/esp32/include/soc/i2s_struct.h b/components/soc/esp32/include/soc/i2s_struct.h
similarity index 100%
rename from components/esp32/include/soc/i2s_struct.h
rename to components/soc/esp32/include/soc/i2s_struct.h
diff --git a/components/esp32/include/soc/io_mux_reg.h b/components/soc/esp32/include/soc/io_mux_reg.h
similarity index 100%
rename from components/esp32/include/soc/io_mux_reg.h
rename to components/soc/esp32/include/soc/io_mux_reg.h
diff --git a/components/esp32/include/soc/ledc_reg.h b/components/soc/esp32/include/soc/ledc_reg.h
similarity index 100%
rename from components/esp32/include/soc/ledc_reg.h
rename to components/soc/esp32/include/soc/ledc_reg.h
diff --git a/components/esp32/include/soc/ledc_struct.h b/components/soc/esp32/include/soc/ledc_struct.h
similarity index 100%
rename from components/esp32/include/soc/ledc_struct.h
rename to components/soc/esp32/include/soc/ledc_struct.h
diff --git a/components/esp32/include/soc/pcnt_reg.h b/components/soc/esp32/include/soc/pcnt_reg.h
similarity index 100%
rename from components/esp32/include/soc/pcnt_reg.h
rename to components/soc/esp32/include/soc/pcnt_reg.h
diff --git a/components/esp32/include/soc/pcnt_struct.h b/components/soc/esp32/include/soc/pcnt_struct.h
similarity index 100%
rename from components/esp32/include/soc/pcnt_struct.h
rename to components/soc/esp32/include/soc/pcnt_struct.h
diff --git a/components/esp32/include/soc/pid.h b/components/soc/esp32/include/soc/pid.h
similarity index 100%
rename from components/esp32/include/soc/pid.h
rename to components/soc/esp32/include/soc/pid.h
diff --git a/components/esp32/include/soc/rmt_reg.h b/components/soc/esp32/include/soc/rmt_reg.h
similarity index 100%
rename from components/esp32/include/soc/rmt_reg.h
rename to components/soc/esp32/include/soc/rmt_reg.h
diff --git a/components/esp32/include/soc/rmt_struct.h b/components/soc/esp32/include/soc/rmt_struct.h
similarity index 100%
rename from components/esp32/include/soc/rmt_struct.h
rename to components/soc/esp32/include/soc/rmt_struct.h
diff --git a/components/esp32/include/soc/rtc_cntl_reg.h b/components/soc/esp32/include/soc/rtc_cntl_reg.h
similarity index 100%
rename from components/esp32/include/soc/rtc_cntl_reg.h
rename to components/soc/esp32/include/soc/rtc_cntl_reg.h
diff --git a/components/esp32/include/soc/rtc_cntl_struct.h b/components/soc/esp32/include/soc/rtc_cntl_struct.h
similarity index 100%
rename from components/esp32/include/soc/rtc_cntl_struct.h
rename to components/soc/esp32/include/soc/rtc_cntl_struct.h
diff --git a/components/esp32/include/soc/rtc_io_reg.h b/components/soc/esp32/include/soc/rtc_io_reg.h
similarity index 100%
rename from components/esp32/include/soc/rtc_io_reg.h
rename to components/soc/esp32/include/soc/rtc_io_reg.h
diff --git a/components/esp32/include/soc/rtc_io_struct.h b/components/soc/esp32/include/soc/rtc_io_struct.h
similarity index 100%
rename from components/esp32/include/soc/rtc_io_struct.h
rename to components/soc/esp32/include/soc/rtc_io_struct.h
diff --git a/components/esp32/include/soc/sdmmc_reg.h b/components/soc/esp32/include/soc/sdmmc_reg.h
similarity index 100%
rename from components/esp32/include/soc/sdmmc_reg.h
rename to components/soc/esp32/include/soc/sdmmc_reg.h
diff --git a/components/esp32/include/soc/sdmmc_struct.h b/components/soc/esp32/include/soc/sdmmc_struct.h
similarity index 100%
rename from components/esp32/include/soc/sdmmc_struct.h
rename to components/soc/esp32/include/soc/sdmmc_struct.h
diff --git a/components/esp32/include/soc/sens_reg.h b/components/soc/esp32/include/soc/sens_reg.h
similarity index 100%
rename from components/esp32/include/soc/sens_reg.h
rename to components/soc/esp32/include/soc/sens_reg.h
diff --git a/components/esp32/include/soc/soc.h b/components/soc/esp32/include/soc/soc.h
similarity index 100%
rename from components/esp32/include/soc/soc.h
rename to components/soc/esp32/include/soc/soc.h
diff --git a/components/esp32/include/soc/soc_ulp.h b/components/soc/esp32/include/soc/soc_ulp.h
similarity index 100%
rename from components/esp32/include/soc/soc_ulp.h
rename to components/soc/esp32/include/soc/soc_ulp.h
diff --git a/components/esp32/include/soc/spi_reg.h b/components/soc/esp32/include/soc/spi_reg.h
similarity index 100%
rename from components/esp32/include/soc/spi_reg.h
rename to components/soc/esp32/include/soc/spi_reg.h
diff --git a/components/esp32/include/soc/spi_struct.h b/components/soc/esp32/include/soc/spi_struct.h
similarity index 100%
rename from components/esp32/include/soc/spi_struct.h
rename to components/soc/esp32/include/soc/spi_struct.h
diff --git a/components/esp32/include/soc/syscon_reg.h b/components/soc/esp32/include/soc/syscon_reg.h
similarity index 100%
rename from components/esp32/include/soc/syscon_reg.h
rename to components/soc/esp32/include/soc/syscon_reg.h
diff --git a/components/esp32/include/soc/syscon_struct.h b/components/soc/esp32/include/soc/syscon_struct.h
similarity index 100%
rename from components/esp32/include/soc/syscon_struct.h
rename to components/soc/esp32/include/soc/syscon_struct.h
diff --git a/components/esp32/include/soc/timer_group_reg.h b/components/soc/esp32/include/soc/timer_group_reg.h
similarity index 100%
rename from components/esp32/include/soc/timer_group_reg.h
rename to components/soc/esp32/include/soc/timer_group_reg.h
diff --git a/components/esp32/include/soc/timer_group_struct.h b/components/soc/esp32/include/soc/timer_group_struct.h
similarity index 100%
rename from components/esp32/include/soc/timer_group_struct.h
rename to components/soc/esp32/include/soc/timer_group_struct.h
diff --git a/components/esp32/include/soc/uart_reg.h b/components/soc/esp32/include/soc/uart_reg.h
similarity index 100%
rename from components/esp32/include/soc/uart_reg.h
rename to components/soc/esp32/include/soc/uart_reg.h
diff --git a/components/esp32/include/soc/uart_struct.h b/components/soc/esp32/include/soc/uart_struct.h
similarity index 100%
rename from components/esp32/include/soc/uart_struct.h
rename to components/soc/esp32/include/soc/uart_struct.h
diff --git a/components/esp32/include/soc/uhci_reg.h b/components/soc/esp32/include/soc/uhci_reg.h
similarity index 100%
rename from components/esp32/include/soc/uhci_reg.h
rename to components/soc/esp32/include/soc/uhci_reg.h
diff --git a/components/esp32/include/soc/uhci_struct.h b/components/soc/esp32/include/soc/uhci_struct.h
similarity index 100%
rename from components/esp32/include/soc/uhci_struct.h
rename to components/soc/esp32/include/soc/uhci_struct.h
diff --git a/components/esp32/include/soc/wdev_reg.h b/components/soc/esp32/include/soc/wdev_reg.h
similarity index 100%
rename from components/esp32/include/soc/wdev_reg.h
rename to components/soc/esp32/include/soc/wdev_reg.h