diff --git a/components/esp_hw_support/CMakeLists.txt b/components/esp_hw_support/CMakeLists.txt
index 4fe375d1bf..b780b4e519 100644
--- a/components/esp_hw_support/CMakeLists.txt
+++ b/components/esp_hw_support/CMakeLists.txt
@@ -135,13 +135,16 @@ if(NOT non_os_build)
     if(NOT CONFIG_APP_BUILD_TYPE_PURE_RAM_APP)
         list(APPEND srcs "mspi_timing_tuning/mspi_timing_tuning.c")
         if(CONFIG_SOC_MEMSPI_TIMING_TUNING_BY_MSPI_DELAY)
-            list(APPEND srcs "mspi_timing_tuning/mspi_timing_by_mspi_delay.c")
+            if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/mspi_timing_tuning/mspi_timing_by_mspi_delay.c")
+                list(APPEND srcs "mspi_timing_tuning/tuning_scheme_impl/mspi_timing_by_mspi_delay.c")
+            endif()
         endif()
+
         if(CONFIG_SOC_MEMSPI_TIMING_TUNING_BY_DQS)
-            list(APPEND srcs "mspi_timing_tuning/mspi_timing_by_dqs.c")
+            list(APPEND srcs "mspi_timing_tuning/tuning_scheme_impl/mspi_timing_by_dqs.c")
         endif()
         if(CONFIG_SOC_MEMSPI_TIMING_TUNING_BY_FLASH_DELAY)
-            list(APPEND srcs "mspi_timing_tuning/mspi_timing_by_flash_delay.c")
+            list(APPEND srcs "mspi_timing_tuning/tuning_scheme_impl/mspi_timing_by_flash_delay.c")
         endif()
     endif()
 
@@ -171,7 +174,8 @@ endif()
 
 set(public_include_dirs "include" "include/soc" "include/soc/${target}"
                         "dma/include" "ldo/include" "debug_probe/include"
-                        "mspi_timing_tuning/include" "power_supply/include")
+                        "mspi_timing_tuning/include" "mspi_timing_tuning/tuning_scheme_impl/include"
+                        "power_supply/include")
 
 if(CONFIG_IDF_TARGET_ESP32H4)
     list(REMOVE_ITEM srcs
diff --git a/components/esp_hw_support/mspi_timing_tuning/mspi_timing_tuning.c b/components/esp_hw_support/mspi_timing_tuning/mspi_timing_tuning.c
index e86694dcd2..1dcddd300d 100644
--- a/components/esp_hw_support/mspi_timing_tuning/mspi_timing_tuning.c
+++ b/components/esp_hw_support/mspi_timing_tuning/mspi_timing_tuning.c
@@ -18,9 +18,9 @@
 #include "esp_private/esp_cache_private.h"
 #include "esp_private/mspi_timing_tuning.h"
 #include "esp_private/mspi_timing_config.h"
-#include "mspi_timing_by_mspi_delay.h"
-#include "mspi_timing_by_dqs.h"
-#include "mspi_timing_by_flash_delay.h"
+#include "esp_private/mspi_timing_by_mspi_delay.h"
+#include "esp_private/mspi_timing_by_dqs.h"
+#include "esp_private/mspi_timing_by_flash_delay.h"
 #if SOC_MEMSPI_TIMING_TUNING_BY_MSPI_DELAY || SOC_MEMSPI_TIMING_TUNING_BY_DQS || SOC_MEMSPI_TIMING_TUNING_BY_FLASH_DELAY
 #include "mspi_timing_tuning_configs.h"
 #endif
diff --git a/components/esp_hw_support/mspi_timing_tuning/port/esp32s3/CMakeLists.txt b/components/esp_hw_support/mspi_timing_tuning/port/esp32s3/CMakeLists.txt
index 73aac5814e..e39412535c 100644
--- a/components/esp_hw_support/mspi_timing_tuning/port/esp32s3/CMakeLists.txt
+++ b/components/esp_hw_support/mspi_timing_tuning/port/esp32s3/CMakeLists.txt
@@ -4,8 +4,8 @@ set(srcs)
 
 if(NOT BOOTLOADER_BUILD)
     if(NOT CONFIG_APP_BUILD_TYPE_PURE_RAM_APP)
-        list(APPEND srcs "mspi_timing_config.c")
+        list(APPEND srcs "mspi_timing_config.c" "mspi_timing_by_mspi_delay.c")
     endif()
 endif()
 
-target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")
+target_sources(${COMPONENT_LIB} PRIVATE ${srcs})
diff --git a/components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_mspi_delay.c b/components/esp_hw_support/mspi_timing_tuning/port/esp32s3/mspi_timing_by_mspi_delay.c
similarity index 99%
rename from components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_mspi_delay.c
rename to components/esp_hw_support/mspi_timing_tuning/port/esp32s3/mspi_timing_by_mspi_delay.c
index d48b856d73..cde0bafafa 100644
--- a/components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_mspi_delay.c
+++ b/components/esp_hw_support/mspi_timing_tuning/port/esp32s3/mspi_timing_by_mspi_delay.c
@@ -23,7 +23,7 @@
 #include "hal/clk_tree_ll.h"
 #include "hal/regi2c_ctrl_ll.h"
 #include "esp_private/mspi_timing_config.h"
-#include "mspi_timing_by_mspi_delay.h"
+#include "esp_private/mspi_timing_by_mspi_delay.h"
 #include "bootloader_flash.h"
 #include "esp32s3/rom/spi_flash.h"
 #include "esp32s3/rom/opi_flash.h"
diff --git a/components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_dqs.h b/components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/include/esp_private/mspi_timing_by_dqs.h
similarity index 99%
rename from components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_dqs.h
rename to components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/include/esp_private/mspi_timing_by_dqs.h
index 935d78f575..aa73031da9 100644
--- a/components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_dqs.h
+++ b/components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/include/esp_private/mspi_timing_by_dqs.h
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 #if SOC_MEMSPI_TIMING_TUNING_BY_DQS
-#include "mspi_timing_types.h"
+#include "esp_private/mspi_timing_impl_types.h"
 #include "mspi_timing_tuning_configs.h"
 #include "hal/mspi_ll.h"
 #endif
diff --git a/components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_flash_delay.h b/components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/include/esp_private/mspi_timing_by_flash_delay.h
similarity index 98%
rename from components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_flash_delay.h
rename to components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/include/esp_private/mspi_timing_by_flash_delay.h
index 2457c7e857..e8ea3d9f97 100644
--- a/components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_flash_delay.h
+++ b/components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/include/esp_private/mspi_timing_by_flash_delay.h
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 #if SOC_MEMSPI_TIMING_TUNING_BY_FLASH_DELAY
-#include "mspi_timing_types.h"
+#include "esp_private/mspi_timing_impl_types.h"
 #include "mspi_timing_tuning_configs.h"
 #endif
 
diff --git a/components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_mspi_delay.h b/components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/include/esp_private/mspi_timing_by_mspi_delay.h
similarity index 99%
rename from components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_mspi_delay.h
rename to components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/include/esp_private/mspi_timing_by_mspi_delay.h
index bb3e27d2af..948e085aa3 100644
--- a/components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_mspi_delay.h
+++ b/components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/include/esp_private/mspi_timing_by_mspi_delay.h
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 #if SOC_MEMSPI_TIMING_TUNING_BY_MSPI_DELAY
-#include "mspi_timing_types.h"
+#include "esp_private/mspi_timing_impl_types.h"
 #include "mspi_timing_tuning_configs.h"
 #endif
 
diff --git a/components/esp_hw_support/mspi_timing_tuning/mspi_timing_types.h b/components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/include/esp_private/mspi_timing_impl_types.h
similarity index 100%
rename from components/esp_hw_support/mspi_timing_tuning/mspi_timing_types.h
rename to components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/include/esp_private/mspi_timing_impl_types.h
diff --git a/components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_dqs.c b/components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/mspi_timing_by_dqs.c
similarity index 99%
rename from components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_dqs.c
rename to components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/mspi_timing_by_dqs.c
index 703d955777..78a09d422f 100644
--- a/components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_dqs.c
+++ b/components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/mspi_timing_by_dqs.c
@@ -19,7 +19,7 @@
 #include "esp_err.h"
 #include "esp_types.h"
 #include "esp_log.h"
-#include "mspi_timing_by_dqs.h"
+#include "esp_private/mspi_timing_by_dqs.h"
 #include "mspi_timing_tuning_configs.h"
 #include "esp_private/mspi_timing_config.h"
 #include "esp_private/rtc_clk.h"
diff --git a/components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_flash_delay.c b/components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/mspi_timing_by_flash_delay.c
similarity index 99%
rename from components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_flash_delay.c
rename to components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/mspi_timing_by_flash_delay.c
index bce343255b..d3c7fd60b9 100644
--- a/components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_flash_delay.c
+++ b/components/esp_hw_support/mspi_timing_tuning/tuning_scheme_impl/mspi_timing_by_flash_delay.c
@@ -19,7 +19,7 @@
 #include "esp_err.h"
 #include "esp_types.h"
 #include "esp_log.h"
-#include "mspi_timing_by_flash_delay.h"
+#include "esp_private/mspi_timing_by_flash_delay.h"
 #include "mspi_timing_tuning_configs.h"
 #include "esp_private/mspi_timing_config.h"
 #include "hal/mspi_ll.h"
diff --git a/components/esp_system/system_init_fn.txt b/components/esp_system/system_init_fn.txt
index 5f2a9ad79b..7f4b2d06fd 100644
--- a/components/esp_system/system_init_fn.txt
+++ b/components/esp_system/system_init_fn.txt
@@ -120,7 +120,7 @@ SECONDARY: 230: usb_serial_jtag_conn_status_init in components/esp_driver_usb_se
 
 # psram adjust timing point need a separate task which should be created at startup.
 # Valid only `CONFIG_SPIRAM_TIMING_TUNING_POINT_VIA_TEMPERATURE_SENSOR` is enabled.
-SECONDARY: 240: psram_adjust_timing_point_via_temperature in components/esp_hw_support/mspi_timing_tuning/mspi_timing_by_mspi_delay.c on BIT(0)
+SECONDARY: 240: psram_adjust_timing_point_via_temperature in components/esp_hw_support/mspi_timing_tuning/port/esp32s3/mspi_timing_by_mspi_delay.c on BIT(0)
 
 # Has to be the last step!
 # Now that the application is about to start, disable boot watchdog