diff --git a/components/soc/esp32c5/include/soc/soc.h b/components/soc/esp32c5/include/soc/soc.h
index 7134121e4b50..d03396f3c68d 100644
--- a/components/soc/esp32c5/include/soc/soc.h
+++ b/components/soc/esp32c5/include/soc/soc.h
@@ -12,7 +12,7 @@
 #endif
 
 #include "esp_bit_defs.h"
-#include "reg_base.h"
+#include "soc/reg_base.h"
 
 #define PRO_CPU_NUM (0)
 
diff --git a/components/soc/esp32c5/include/soc/system_reg.h b/components/soc/esp32c5/include/soc/system_reg.h
index 06daf4471320..939bf695f0bd 100644
--- a/components/soc/esp32c5/include/soc/system_reg.h
+++ b/components/soc/esp32c5/include/soc/system_reg.h
@@ -7,6 +7,6 @@
 #include "soc/hp_system_reg.h"
 
 // TODO: IDF-5720
-#include "intpri_reg.h"
+#include "soc/intpri_reg.h"
 #define SYSTEM_CPU_INTR_FROM_CPU_0_REG INTPRI_CPU_INTR_FROM_CPU_0_REG
 #define SYSTEM_CPU_INTR_FROM_CPU_0 INTPRI_CPU_INTR_FROM_CPU_0
diff --git a/components/soc/esp32c5/register/soc/.gitkeep b/components/soc/esp32c5/register/soc/.gitkeep
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/components/soc/esp32c5/include/soc/aes_reg.h b/components/soc/esp32c5/register/soc/aes_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/aes_reg.h
rename to components/soc/esp32c5/register/soc/aes_reg.h
diff --git a/components/soc/esp32c5/include/soc/aes_struct.h b/components/soc/esp32c5/register/soc/aes_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/aes_struct.h
rename to components/soc/esp32c5/register/soc/aes_struct.h
diff --git a/components/soc/esp32c5/include/soc/ahb_dma_reg.h b/components/soc/esp32c5/register/soc/ahb_dma_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/ahb_dma_reg.h
rename to components/soc/esp32c5/register/soc/ahb_dma_reg.h
diff --git a/components/soc/esp32c5/include/soc/ahb_dma_struct.h b/components/soc/esp32c5/register/soc/ahb_dma_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/ahb_dma_struct.h
rename to components/soc/esp32c5/register/soc/ahb_dma_struct.h
diff --git a/components/soc/esp32c5/include/soc/apb_saradc_reg.h b/components/soc/esp32c5/register/soc/apb_saradc_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/apb_saradc_reg.h
rename to components/soc/esp32c5/register/soc/apb_saradc_reg.h
diff --git a/components/soc/esp32c5/include/soc/apb_saradc_struct.h b/components/soc/esp32c5/register/soc/apb_saradc_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/apb_saradc_struct.h
rename to components/soc/esp32c5/register/soc/apb_saradc_struct.h
diff --git a/components/soc/esp32c5/include/soc/assist_debug_reg.h b/components/soc/esp32c5/register/soc/assist_debug_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/assist_debug_reg.h
rename to components/soc/esp32c5/register/soc/assist_debug_reg.h
diff --git a/components/soc/esp32c5/include/soc/assist_debug_struct.h b/components/soc/esp32c5/register/soc/assist_debug_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/assist_debug_struct.h
rename to components/soc/esp32c5/register/soc/assist_debug_struct.h
diff --git a/components/soc/esp32c5/include/soc/bitscrambler_reg.h b/components/soc/esp32c5/register/soc/bitscrambler_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/bitscrambler_reg.h
rename to components/soc/esp32c5/register/soc/bitscrambler_reg.h
diff --git a/components/soc/esp32c5/include/soc/bitscrambler_struct.h b/components/soc/esp32c5/register/soc/bitscrambler_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/bitscrambler_struct.h
rename to components/soc/esp32c5/register/soc/bitscrambler_struct.h
diff --git a/components/soc/esp32c5/include/soc/cache_reg.h b/components/soc/esp32c5/register/soc/cache_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/cache_reg.h
rename to components/soc/esp32c5/register/soc/cache_reg.h
diff --git a/components/soc/esp32c5/include/soc/cache_struct.h b/components/soc/esp32c5/register/soc/cache_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/cache_struct.h
rename to components/soc/esp32c5/register/soc/cache_struct.h
diff --git a/components/soc/esp32c5/include/soc/ds_reg.h b/components/soc/esp32c5/register/soc/ds_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/ds_reg.h
rename to components/soc/esp32c5/register/soc/ds_reg.h
diff --git a/components/soc/esp32c5/include/soc/ds_struct.h b/components/soc/esp32c5/register/soc/ds_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/ds_struct.h
rename to components/soc/esp32c5/register/soc/ds_struct.h
diff --git a/components/soc/esp32c5/include/soc/ecc_mult_reg.h b/components/soc/esp32c5/register/soc/ecc_mult_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/ecc_mult_reg.h
rename to components/soc/esp32c5/register/soc/ecc_mult_reg.h
diff --git a/components/soc/esp32c5/include/soc/ecc_mult_struct.h b/components/soc/esp32c5/register/soc/ecc_mult_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/ecc_mult_struct.h
rename to components/soc/esp32c5/register/soc/ecc_mult_struct.h
diff --git a/components/soc/esp32c5/include/soc/ecdsa_reg.h b/components/soc/esp32c5/register/soc/ecdsa_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/ecdsa_reg.h
rename to components/soc/esp32c5/register/soc/ecdsa_reg.h
diff --git a/components/soc/esp32c5/include/soc/ecdsa_struct.h b/components/soc/esp32c5/register/soc/ecdsa_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/ecdsa_struct.h
rename to components/soc/esp32c5/register/soc/ecdsa_struct.h
diff --git a/components/soc/esp32c5/include/soc/efuse_reg.h b/components/soc/esp32c5/register/soc/efuse_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/efuse_reg.h
rename to components/soc/esp32c5/register/soc/efuse_reg.h
diff --git a/components/soc/esp32c5/include/soc/efuse_struct.h b/components/soc/esp32c5/register/soc/efuse_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/efuse_struct.h
rename to components/soc/esp32c5/register/soc/efuse_struct.h
diff --git a/components/soc/esp32c5/include/soc/gpio_reg.h b/components/soc/esp32c5/register/soc/gpio_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/gpio_reg.h
rename to components/soc/esp32c5/register/soc/gpio_reg.h
diff --git a/components/soc/esp32c5/include/soc/gpio_struct.h b/components/soc/esp32c5/register/soc/gpio_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/gpio_struct.h
rename to components/soc/esp32c5/register/soc/gpio_struct.h
diff --git a/components/soc/esp32c5/include/soc/hmac_reg.h b/components/soc/esp32c5/register/soc/hmac_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/hmac_reg.h
rename to components/soc/esp32c5/register/soc/hmac_reg.h
diff --git a/components/soc/esp32c5/include/soc/hmac_struct.h b/components/soc/esp32c5/register/soc/hmac_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/hmac_struct.h
rename to components/soc/esp32c5/register/soc/hmac_struct.h
diff --git a/components/soc/esp32c5/include/soc/hp_apm_reg.h b/components/soc/esp32c5/register/soc/hp_apm_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/hp_apm_reg.h
rename to components/soc/esp32c5/register/soc/hp_apm_reg.h
diff --git a/components/soc/esp32c5/include/soc/hp_apm_struct.h b/components/soc/esp32c5/register/soc/hp_apm_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/hp_apm_struct.h
rename to components/soc/esp32c5/register/soc/hp_apm_struct.h
diff --git a/components/soc/esp32c5/include/soc/hp_system_reg.h b/components/soc/esp32c5/register/soc/hp_system_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/hp_system_reg.h
rename to components/soc/esp32c5/register/soc/hp_system_reg.h
diff --git a/components/soc/esp32c5/include/soc/hp_system_struct.h b/components/soc/esp32c5/register/soc/hp_system_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/hp_system_struct.h
rename to components/soc/esp32c5/register/soc/hp_system_struct.h
diff --git a/components/soc/esp32c5/include/soc/huk_reg.h b/components/soc/esp32c5/register/soc/huk_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/huk_reg.h
rename to components/soc/esp32c5/register/soc/huk_reg.h
diff --git a/components/soc/esp32c5/include/soc/huk_struct.h b/components/soc/esp32c5/register/soc/huk_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/huk_struct.h
rename to components/soc/esp32c5/register/soc/huk_struct.h
diff --git a/components/soc/esp32c5/include/soc/i2c_ana_mst_reg.h b/components/soc/esp32c5/register/soc/i2c_ana_mst_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/i2c_ana_mst_reg.h
rename to components/soc/esp32c5/register/soc/i2c_ana_mst_reg.h
diff --git a/components/soc/esp32c5/include/soc/i2c_reg.h b/components/soc/esp32c5/register/soc/i2c_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/i2c_reg.h
rename to components/soc/esp32c5/register/soc/i2c_reg.h
diff --git a/components/soc/esp32c5/include/soc/i2c_struct.h b/components/soc/esp32c5/register/soc/i2c_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/i2c_struct.h
rename to components/soc/esp32c5/register/soc/i2c_struct.h
diff --git a/components/soc/esp32c5/include/soc/i2s_reg.h b/components/soc/esp32c5/register/soc/i2s_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/i2s_reg.h
rename to components/soc/esp32c5/register/soc/i2s_reg.h
diff --git a/components/soc/esp32c5/include/soc/i2s_struct.h b/components/soc/esp32c5/register/soc/i2s_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/i2s_struct.h
rename to components/soc/esp32c5/register/soc/i2s_struct.h
diff --git a/components/soc/esp32c5/include/soc/ieee802154_reg.h b/components/soc/esp32c5/register/soc/ieee802154_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/ieee802154_reg.h
rename to components/soc/esp32c5/register/soc/ieee802154_reg.h
diff --git a/components/soc/esp32c5/include/soc/ieee802154_struct.h b/components/soc/esp32c5/register/soc/ieee802154_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/ieee802154_struct.h
rename to components/soc/esp32c5/register/soc/ieee802154_struct.h
diff --git a/components/soc/esp32c5/include/soc/interrupt_matrix_reg.h b/components/soc/esp32c5/register/soc/interrupt_matrix_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/interrupt_matrix_reg.h
rename to components/soc/esp32c5/register/soc/interrupt_matrix_reg.h
diff --git a/components/soc/esp32c5/include/soc/interrupt_matrix_struct.h b/components/soc/esp32c5/register/soc/interrupt_matrix_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/interrupt_matrix_struct.h
rename to components/soc/esp32c5/register/soc/interrupt_matrix_struct.h
diff --git a/components/soc/esp32c5/include/soc/intpri_reg.h b/components/soc/esp32c5/register/soc/intpri_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/intpri_reg.h
rename to components/soc/esp32c5/register/soc/intpri_reg.h
diff --git a/components/soc/esp32c5/include/soc/intpri_struct.h b/components/soc/esp32c5/register/soc/intpri_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/intpri_struct.h
rename to components/soc/esp32c5/register/soc/intpri_struct.h
diff --git a/components/soc/esp32c5/include/soc/io_mux_reg.h b/components/soc/esp32c5/register/soc/io_mux_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/io_mux_reg.h
rename to components/soc/esp32c5/register/soc/io_mux_reg.h
diff --git a/components/soc/esp32c5/include/soc/io_mux_struct.h b/components/soc/esp32c5/register/soc/io_mux_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/io_mux_struct.h
rename to components/soc/esp32c5/register/soc/io_mux_struct.h
diff --git a/components/soc/esp32c5/include/soc/keymng_reg.h b/components/soc/esp32c5/register/soc/keymng_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/keymng_reg.h
rename to components/soc/esp32c5/register/soc/keymng_reg.h
diff --git a/components/soc/esp32c5/include/soc/keymng_struct.h b/components/soc/esp32c5/register/soc/keymng_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/keymng_struct.h
rename to components/soc/esp32c5/register/soc/keymng_struct.h
diff --git a/components/soc/esp32c5/include/soc/ledc_reg.h b/components/soc/esp32c5/register/soc/ledc_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/ledc_reg.h
rename to components/soc/esp32c5/register/soc/ledc_reg.h
diff --git a/components/soc/esp32c5/include/soc/ledc_struct.h b/components/soc/esp32c5/register/soc/ledc_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/ledc_struct.h
rename to components/soc/esp32c5/register/soc/ledc_struct.h
diff --git a/components/soc/esp32c5/include/soc/lp_analog_peri_reg.h b/components/soc/esp32c5/register/soc/lp_analog_peri_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_analog_peri_reg.h
rename to components/soc/esp32c5/register/soc/lp_analog_peri_reg.h
diff --git a/components/soc/esp32c5/include/soc/lp_analog_peri_struct.h b/components/soc/esp32c5/register/soc/lp_analog_peri_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_analog_peri_struct.h
rename to components/soc/esp32c5/register/soc/lp_analog_peri_struct.h
diff --git a/components/soc/esp32c5/include/soc/lp_aon_reg.h b/components/soc/esp32c5/register/soc/lp_aon_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_aon_reg.h
rename to components/soc/esp32c5/register/soc/lp_aon_reg.h
diff --git a/components/soc/esp32c5/include/soc/lp_aon_struct.h b/components/soc/esp32c5/register/soc/lp_aon_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_aon_struct.h
rename to components/soc/esp32c5/register/soc/lp_aon_struct.h
diff --git a/components/soc/esp32c5/include/soc/lp_apm0_reg.h b/components/soc/esp32c5/register/soc/lp_apm0_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_apm0_reg.h
rename to components/soc/esp32c5/register/soc/lp_apm0_reg.h
diff --git a/components/soc/esp32c5/include/soc/lp_apm0_struct.h b/components/soc/esp32c5/register/soc/lp_apm0_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_apm0_struct.h
rename to components/soc/esp32c5/register/soc/lp_apm0_struct.h
diff --git a/components/soc/esp32c5/include/soc/lp_apm_reg.h b/components/soc/esp32c5/register/soc/lp_apm_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_apm_reg.h
rename to components/soc/esp32c5/register/soc/lp_apm_reg.h
diff --git a/components/soc/esp32c5/include/soc/lp_apm_struct.h b/components/soc/esp32c5/register/soc/lp_apm_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_apm_struct.h
rename to components/soc/esp32c5/register/soc/lp_apm_struct.h
diff --git a/components/soc/esp32c5/include/soc/lp_clkrst_reg.h b/components/soc/esp32c5/register/soc/lp_clkrst_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_clkrst_reg.h
rename to components/soc/esp32c5/register/soc/lp_clkrst_reg.h
diff --git a/components/soc/esp32c5/include/soc/lp_clkrst_struct.h b/components/soc/esp32c5/register/soc/lp_clkrst_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_clkrst_struct.h
rename to components/soc/esp32c5/register/soc/lp_clkrst_struct.h
diff --git a/components/soc/esp32c5/include/soc/lp_gpio_reg.h b/components/soc/esp32c5/register/soc/lp_gpio_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_gpio_reg.h
rename to components/soc/esp32c5/register/soc/lp_gpio_reg.h
diff --git a/components/soc/esp32c5/include/soc/lp_gpio_struct.h b/components/soc/esp32c5/register/soc/lp_gpio_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_gpio_struct.h
rename to components/soc/esp32c5/register/soc/lp_gpio_struct.h
diff --git a/components/soc/esp32c5/include/soc/lp_i2c_ana_mst_reg.h b/components/soc/esp32c5/register/soc/lp_i2c_ana_mst_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_i2c_ana_mst_reg.h
rename to components/soc/esp32c5/register/soc/lp_i2c_ana_mst_reg.h
diff --git a/components/soc/esp32c5/include/soc/lp_i2c_ana_mst_struct.h b/components/soc/esp32c5/register/soc/lp_i2c_ana_mst_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_i2c_ana_mst_struct.h
rename to components/soc/esp32c5/register/soc/lp_i2c_ana_mst_struct.h
diff --git a/components/soc/esp32c5/include/soc/lp_i2c_reg.h b/components/soc/esp32c5/register/soc/lp_i2c_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_i2c_reg.h
rename to components/soc/esp32c5/register/soc/lp_i2c_reg.h
diff --git a/components/soc/esp32c5/include/soc/lp_i2c_struct.h b/components/soc/esp32c5/register/soc/lp_i2c_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_i2c_struct.h
rename to components/soc/esp32c5/register/soc/lp_i2c_struct.h
diff --git a/components/soc/esp32c5/include/soc/lp_iomux_reg.h b/components/soc/esp32c5/register/soc/lp_iomux_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_iomux_reg.h
rename to components/soc/esp32c5/register/soc/lp_iomux_reg.h
diff --git a/components/soc/esp32c5/include/soc/lp_iomux_struct.h b/components/soc/esp32c5/register/soc/lp_iomux_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_iomux_struct.h
rename to components/soc/esp32c5/register/soc/lp_iomux_struct.h
diff --git a/components/soc/esp32c5/include/soc/lp_tee_reg.h b/components/soc/esp32c5/register/soc/lp_tee_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_tee_reg.h
rename to components/soc/esp32c5/register/soc/lp_tee_reg.h
diff --git a/components/soc/esp32c5/include/soc/lp_tee_struct.h b/components/soc/esp32c5/register/soc/lp_tee_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_tee_struct.h
rename to components/soc/esp32c5/register/soc/lp_tee_struct.h
diff --git a/components/soc/esp32c5/include/soc/lp_timer_reg.h b/components/soc/esp32c5/register/soc/lp_timer_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_timer_reg.h
rename to components/soc/esp32c5/register/soc/lp_timer_reg.h
diff --git a/components/soc/esp32c5/include/soc/lp_timer_struct.h b/components/soc/esp32c5/register/soc/lp_timer_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_timer_struct.h
rename to components/soc/esp32c5/register/soc/lp_timer_struct.h
diff --git a/components/soc/esp32c5/include/soc/lp_uart_reg.h b/components/soc/esp32c5/register/soc/lp_uart_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_uart_reg.h
rename to components/soc/esp32c5/register/soc/lp_uart_reg.h
diff --git a/components/soc/esp32c5/include/soc/lp_uart_struct.h b/components/soc/esp32c5/register/soc/lp_uart_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_uart_struct.h
rename to components/soc/esp32c5/register/soc/lp_uart_struct.h
diff --git a/components/soc/esp32c5/include/soc/lp_wdt_reg.h b/components/soc/esp32c5/register/soc/lp_wdt_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_wdt_reg.h
rename to components/soc/esp32c5/register/soc/lp_wdt_reg.h
diff --git a/components/soc/esp32c5/include/soc/lp_wdt_struct.h b/components/soc/esp32c5/register/soc/lp_wdt_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lp_wdt_struct.h
rename to components/soc/esp32c5/register/soc/lp_wdt_struct.h
diff --git a/components/soc/esp32c5/include/soc/lpperi_reg.h b/components/soc/esp32c5/register/soc/lpperi_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lpperi_reg.h
rename to components/soc/esp32c5/register/soc/lpperi_reg.h
diff --git a/components/soc/esp32c5/include/soc/lpperi_struct.h b/components/soc/esp32c5/register/soc/lpperi_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/lpperi_struct.h
rename to components/soc/esp32c5/register/soc/lpperi_struct.h
diff --git a/components/soc/esp32c5/include/soc/mcpwm_reg.h b/components/soc/esp32c5/register/soc/mcpwm_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/mcpwm_reg.h
rename to components/soc/esp32c5/register/soc/mcpwm_reg.h
diff --git a/components/soc/esp32c5/include/soc/mcpwm_struct.h b/components/soc/esp32c5/register/soc/mcpwm_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/mcpwm_struct.h
rename to components/soc/esp32c5/register/soc/mcpwm_struct.h
diff --git a/components/soc/esp32c5/include/soc/mem_monitor_reg.h b/components/soc/esp32c5/register/soc/mem_monitor_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/mem_monitor_reg.h
rename to components/soc/esp32c5/register/soc/mem_monitor_reg.h
diff --git a/components/soc/esp32c5/include/soc/mem_monitor_struct.h b/components/soc/esp32c5/register/soc/mem_monitor_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/mem_monitor_struct.h
rename to components/soc/esp32c5/register/soc/mem_monitor_struct.h
diff --git a/components/soc/esp32c5/include/soc/parl_io_reg.h b/components/soc/esp32c5/register/soc/parl_io_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/parl_io_reg.h
rename to components/soc/esp32c5/register/soc/parl_io_reg.h
diff --git a/components/soc/esp32c5/include/soc/parl_io_struct.h b/components/soc/esp32c5/register/soc/parl_io_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/parl_io_struct.h
rename to components/soc/esp32c5/register/soc/parl_io_struct.h
diff --git a/components/soc/esp32c5/include/soc/pau_reg.h b/components/soc/esp32c5/register/soc/pau_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/pau_reg.h
rename to components/soc/esp32c5/register/soc/pau_reg.h
diff --git a/components/soc/esp32c5/include/soc/pau_struct.h b/components/soc/esp32c5/register/soc/pau_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/pau_struct.h
rename to components/soc/esp32c5/register/soc/pau_struct.h
diff --git a/components/soc/esp32c5/include/soc/pcnt_reg.h b/components/soc/esp32c5/register/soc/pcnt_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/pcnt_reg.h
rename to components/soc/esp32c5/register/soc/pcnt_reg.h
diff --git a/components/soc/esp32c5/include/soc/pcnt_struct.h b/components/soc/esp32c5/register/soc/pcnt_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/pcnt_struct.h
rename to components/soc/esp32c5/register/soc/pcnt_struct.h
diff --git a/components/soc/esp32c5/include/soc/pcr_reg.h b/components/soc/esp32c5/register/soc/pcr_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/pcr_reg.h
rename to components/soc/esp32c5/register/soc/pcr_reg.h
diff --git a/components/soc/esp32c5/include/soc/pcr_struct.h b/components/soc/esp32c5/register/soc/pcr_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/pcr_struct.h
rename to components/soc/esp32c5/register/soc/pcr_struct.h
diff --git a/components/soc/esp32c5/include/soc/pmu_reg.h b/components/soc/esp32c5/register/soc/pmu_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/pmu_reg.h
rename to components/soc/esp32c5/register/soc/pmu_reg.h
diff --git a/components/soc/esp32c5/include/soc/pmu_struct.h b/components/soc/esp32c5/register/soc/pmu_struct.h
similarity index 99%
rename from components/soc/esp32c5/include/soc/pmu_struct.h
rename to components/soc/esp32c5/register/soc/pmu_struct.h
index 67f6269fc32f..ad7fc03d016e 100644
--- a/components/soc/esp32c5/include/soc/pmu_struct.h
+++ b/components/soc/esp32c5/register/soc/pmu_struct.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "soc.h"
+#include "soc/soc.h"
 #include "soc/pmu_reg.h"
 
 typedef union {
diff --git a/components/soc/esp32c5/include/soc/pvt_reg.h b/components/soc/esp32c5/register/soc/pvt_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/pvt_reg.h
rename to components/soc/esp32c5/register/soc/pvt_reg.h
diff --git a/components/soc/esp32c5/include/soc/pvt_struct.h b/components/soc/esp32c5/register/soc/pvt_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/pvt_struct.h
rename to components/soc/esp32c5/register/soc/pvt_struct.h
diff --git a/components/soc/esp32c5/include/soc/reg_base.h b/components/soc/esp32c5/register/soc/reg_base.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/reg_base.h
rename to components/soc/esp32c5/register/soc/reg_base.h
diff --git a/components/soc/esp32c5/include/soc/rmt_reg.h b/components/soc/esp32c5/register/soc/rmt_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/rmt_reg.h
rename to components/soc/esp32c5/register/soc/rmt_reg.h
diff --git a/components/soc/esp32c5/include/soc/rmt_struct.h b/components/soc/esp32c5/register/soc/rmt_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/rmt_struct.h
rename to components/soc/esp32c5/register/soc/rmt_struct.h
diff --git a/components/soc/esp32c5/include/soc/rsa_reg.h b/components/soc/esp32c5/register/soc/rsa_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/rsa_reg.h
rename to components/soc/esp32c5/register/soc/rsa_reg.h
diff --git a/components/soc/esp32c5/include/soc/rsa_struct.h b/components/soc/esp32c5/register/soc/rsa_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/rsa_struct.h
rename to components/soc/esp32c5/register/soc/rsa_struct.h
diff --git a/components/soc/esp32c5/include/soc/sha_reg.h b/components/soc/esp32c5/register/soc/sha_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/sha_reg.h
rename to components/soc/esp32c5/register/soc/sha_reg.h
diff --git a/components/soc/esp32c5/include/soc/sha_struct.h b/components/soc/esp32c5/register/soc/sha_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/sha_struct.h
rename to components/soc/esp32c5/register/soc/sha_struct.h
diff --git a/components/soc/esp32c5/include/soc/soc_etm_reg.h b/components/soc/esp32c5/register/soc/soc_etm_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/soc_etm_reg.h
rename to components/soc/esp32c5/register/soc/soc_etm_reg.h
diff --git a/components/soc/esp32c5/include/soc/soc_etm_struct.h b/components/soc/esp32c5/register/soc/soc_etm_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/soc_etm_struct.h
rename to components/soc/esp32c5/register/soc/soc_etm_struct.h
diff --git a/components/soc/esp32c5/include/soc/spi1_mem_reg.h b/components/soc/esp32c5/register/soc/spi1_mem_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/spi1_mem_reg.h
rename to components/soc/esp32c5/register/soc/spi1_mem_reg.h
diff --git a/components/soc/esp32c5/include/soc/spi1_mem_struct.h b/components/soc/esp32c5/register/soc/spi1_mem_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/spi1_mem_struct.h
rename to components/soc/esp32c5/register/soc/spi1_mem_struct.h
diff --git a/components/soc/esp32c5/include/soc/spi_mem_c_reg.h b/components/soc/esp32c5/register/soc/spi_mem_c_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/spi_mem_c_reg.h
rename to components/soc/esp32c5/register/soc/spi_mem_c_reg.h
diff --git a/components/soc/esp32c5/include/soc/spi_mem_c_struct.h b/components/soc/esp32c5/register/soc/spi_mem_c_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/spi_mem_c_struct.h
rename to components/soc/esp32c5/register/soc/spi_mem_c_struct.h
diff --git a/components/soc/esp32c5/include/soc/spi_reg.h b/components/soc/esp32c5/register/soc/spi_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/spi_reg.h
rename to components/soc/esp32c5/register/soc/spi_reg.h
diff --git a/components/soc/esp32c5/include/soc/spi_struct.h b/components/soc/esp32c5/register/soc/spi_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/spi_struct.h
rename to components/soc/esp32c5/register/soc/spi_struct.h
diff --git a/components/soc/esp32c5/include/soc/systimer_reg.h b/components/soc/esp32c5/register/soc/systimer_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/systimer_reg.h
rename to components/soc/esp32c5/register/soc/systimer_reg.h
diff --git a/components/soc/esp32c5/include/soc/systimer_struct.h b/components/soc/esp32c5/register/soc/systimer_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/systimer_struct.h
rename to components/soc/esp32c5/register/soc/systimer_struct.h
diff --git a/components/soc/esp32c5/include/soc/tee_reg.h b/components/soc/esp32c5/register/soc/tee_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/tee_reg.h
rename to components/soc/esp32c5/register/soc/tee_reg.h
diff --git a/components/soc/esp32c5/include/soc/tee_struct.h b/components/soc/esp32c5/register/soc/tee_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/tee_struct.h
rename to components/soc/esp32c5/register/soc/tee_struct.h
diff --git a/components/soc/esp32c5/include/soc/timer_group_reg.h b/components/soc/esp32c5/register/soc/timer_group_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/timer_group_reg.h
rename to components/soc/esp32c5/register/soc/timer_group_reg.h
diff --git a/components/soc/esp32c5/include/soc/timer_group_struct.h b/components/soc/esp32c5/register/soc/timer_group_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/timer_group_struct.h
rename to components/soc/esp32c5/register/soc/timer_group_struct.h
diff --git a/components/soc/esp32c5/include/soc/trace_reg.h b/components/soc/esp32c5/register/soc/trace_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/trace_reg.h
rename to components/soc/esp32c5/register/soc/trace_reg.h
diff --git a/components/soc/esp32c5/include/soc/trace_struct.h b/components/soc/esp32c5/register/soc/trace_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/trace_struct.h
rename to components/soc/esp32c5/register/soc/trace_struct.h
diff --git a/components/soc/esp32c5/include/soc/twaifd_reg.h b/components/soc/esp32c5/register/soc/twaifd_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/twaifd_reg.h
rename to components/soc/esp32c5/register/soc/twaifd_reg.h
diff --git a/components/soc/esp32c5/include/soc/twaifd_struct.h b/components/soc/esp32c5/register/soc/twaifd_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/twaifd_struct.h
rename to components/soc/esp32c5/register/soc/twaifd_struct.h
diff --git a/components/soc/esp32c5/include/soc/uart_reg.h b/components/soc/esp32c5/register/soc/uart_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/uart_reg.h
rename to components/soc/esp32c5/register/soc/uart_reg.h
diff --git a/components/soc/esp32c5/include/soc/uart_struct.h b/components/soc/esp32c5/register/soc/uart_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/uart_struct.h
rename to components/soc/esp32c5/register/soc/uart_struct.h
diff --git a/components/soc/esp32c5/include/soc/uhci_reg.h b/components/soc/esp32c5/register/soc/uhci_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/uhci_reg.h
rename to components/soc/esp32c5/register/soc/uhci_reg.h
diff --git a/components/soc/esp32c5/include/soc/uhci_struct.h b/components/soc/esp32c5/register/soc/uhci_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/uhci_struct.h
rename to components/soc/esp32c5/register/soc/uhci_struct.h
diff --git a/components/soc/esp32c5/include/soc/usb_serial_jtag_reg.h b/components/soc/esp32c5/register/soc/usb_serial_jtag_reg.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/usb_serial_jtag_reg.h
rename to components/soc/esp32c5/register/soc/usb_serial_jtag_reg.h
diff --git a/components/soc/esp32c5/include/soc/usb_serial_jtag_struct.h b/components/soc/esp32c5/register/soc/usb_serial_jtag_struct.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/usb_serial_jtag_struct.h
rename to components/soc/esp32c5/register/soc/usb_serial_jtag_struct.h