diff --git a/Marlin/src/HAL/DUE/eeprom_flash.cpp b/Marlin/src/HAL/DUE/eeprom/eeprom_flash.cpp
similarity index 99%
rename from Marlin/src/HAL/DUE/eeprom_flash.cpp
rename to Marlin/src/HAL/DUE/eeprom/eeprom_flash.cpp
index 55206a0f9d..b33d15e106 100644
--- a/Marlin/src/HAL/DUE/eeprom_flash.cpp
+++ b/Marlin/src/HAL/DUE/eeprom/eeprom_flash.cpp
@@ -21,7 +21,7 @@
  */
 #ifdef ARDUINO_ARCH_SAM
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
@@ -132,7 +132,7 @@ static uint8_t buffer[256] = {0},   // The RAM buffer to accumulate writes
                curGroup = 0xFF;     // Current FLASH group
 
 #define DEBUG_OUT ENABLED(EE_EMU_DEBUG)
-#include "../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 static void ee_Dump(const int page, const void *data) {
 
@@ -953,7 +953,7 @@ static void ee_Init() {
 
 /* PersistentStore -----------------------------------------------------------*/
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE 0x1000 // 4KB
diff --git a/Marlin/src/HAL/DUE/eeprom_wired.cpp b/Marlin/src/HAL/DUE/eeprom/eeprom_wired.cpp
similarity index 95%
rename from Marlin/src/HAL/DUE/eeprom_wired.cpp
rename to Marlin/src/HAL/DUE/eeprom/eeprom_wired.cpp
index 84338ccb4b..cf9233816c 100644
--- a/Marlin/src/HAL/DUE/eeprom_wired.cpp
+++ b/Marlin/src/HAL/DUE/eeprom/eeprom_wired.cpp
@@ -21,7 +21,7 @@
  */
 #ifdef ARDUINO_ARCH_SAM
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -30,8 +30,8 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for I2C / SPI EEPROM."
diff --git a/Marlin/src/HAL/GD32_MFL/eeprom_bl24cxx.cpp b/Marlin/src/HAL/GD32_MFL/eeprom/eeprom_bl24cxx.cpp
similarity index 94%
rename from Marlin/src/HAL/GD32_MFL/eeprom_bl24cxx.cpp
rename to Marlin/src/HAL/GD32_MFL/eeprom/eeprom_bl24cxx.cpp
index 2d3329c7f6..9c44933fe3 100644
--- a/Marlin/src/HAL/GD32_MFL/eeprom_bl24cxx.cpp
+++ b/Marlin/src/HAL/GD32_MFL/eeprom/eeprom_bl24cxx.cpp
@@ -25,16 +25,16 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef ARDUINO_ARCH_MFL
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for IIC_BL24CXX_EEPROM."
diff --git a/Marlin/src/HAL/GD32_MFL/eeprom_if_iic.cpp b/Marlin/src/HAL/GD32_MFL/eeprom/eeprom_if_iic.cpp
similarity index 91%
rename from Marlin/src/HAL/GD32_MFL/eeprom_if_iic.cpp
rename to Marlin/src/HAL/GD32_MFL/eeprom/eeprom_if_iic.cpp
index 96eebea122..ea563f742c 100644
--- a/Marlin/src/HAL/GD32_MFL/eeprom_if_iic.cpp
+++ b/Marlin/src/HAL/GD32_MFL/eeprom/eeprom_if_iic.cpp
@@ -25,16 +25,16 @@
  * Enable USE_SHARED_EEPROM if not supplied by the framework.
  */
 
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef ARDUINO_ARCH_MFL
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../../libs/BL24CXX.h"
-#include "../shared/eeprom_if.h"
+#include "../../../libs/BL24CXX.h"
+#include "../../shared/eeprom_if.h"
 
 void eeprom_init() {
   BL24CXX::init();
diff --git a/Marlin/src/HAL/GD32_MFL/eeprom_wired.cpp b/Marlin/src/HAL/GD32_MFL/eeprom/eeprom_wired.cpp
similarity index 94%
rename from Marlin/src/HAL/GD32_MFL/eeprom_wired.cpp
rename to Marlin/src/HAL/GD32_MFL/eeprom/eeprom_wired.cpp
index 58a6f85e7f..8860e53a62 100644
--- a/Marlin/src/HAL/GD32_MFL/eeprom_wired.cpp
+++ b/Marlin/src/HAL/GD32_MFL/eeprom/eeprom_wired.cpp
@@ -19,11 +19,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef ARDUINO_ARCH_MFL
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -32,8 +32,8 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE size_t(E2END + 1)
diff --git a/Marlin/src/HAL/HC32/eeprom_bl24cxx.cpp b/Marlin/src/HAL/HC32/eeprom/eeprom_bl24cxx.cpp
similarity index 95%
rename from Marlin/src/HAL/HC32/eeprom_bl24cxx.cpp
rename to Marlin/src/HAL/HC32/eeprom/eeprom_bl24cxx.cpp
index 59da99b3f5..a53a7c4062 100644
--- a/Marlin/src/HAL/HC32/eeprom_bl24cxx.cpp
+++ b/Marlin/src/HAL/HC32/eeprom/eeprom_bl24cxx.cpp
@@ -26,12 +26,12 @@
  */
 #ifdef ARDUINO_ARCH_HC32
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../shared/eeprom_api.h"
-#include "../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for IIC_BL24CXX_EEPROM."
diff --git a/Marlin/src/HAL/HC32/eeprom_if_iic.cpp b/Marlin/src/HAL/HC32/eeprom/eeprom_if_iic.cpp
similarity index 92%
rename from Marlin/src/HAL/HC32/eeprom_if_iic.cpp
rename to Marlin/src/HAL/HC32/eeprom/eeprom_if_iic.cpp
index 02b1d3fd54..85d21a972a 100644
--- a/Marlin/src/HAL/HC32/eeprom_if_iic.cpp
+++ b/Marlin/src/HAL/HC32/eeprom/eeprom_if_iic.cpp
@@ -26,12 +26,12 @@
  */
 #ifdef ARDUINO_ARCH_HC32
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../../libs/BL24CXX.h"
-#include "../shared/eeprom_if.h"
+#include "../../../libs/BL24CXX.h"
+#include "../../shared/eeprom_if.h"
 
 void eeprom_init() {
   BL24CXX::init();
diff --git a/Marlin/src/HAL/HC32/eeprom_sdcard.cpp b/Marlin/src/HAL/HC32/eeprom/eeprom_sdcard.cpp
similarity index 96%
rename from Marlin/src/HAL/HC32/eeprom_sdcard.cpp
rename to Marlin/src/HAL/HC32/eeprom/eeprom_sdcard.cpp
index 601e86dd30..45f3b01cf7 100644
--- a/Marlin/src/HAL/HC32/eeprom_sdcard.cpp
+++ b/Marlin/src/HAL/HC32/eeprom/eeprom_sdcard.cpp
@@ -25,12 +25,12 @@
  */
 #ifdef ARDUINO_ARCH_HC32
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(SDCARD_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
-#include "../../sd/cardreader.h"
+#include "../../shared/eeprom_api.h"
+#include "../../../sd/cardreader.h"
 
 #define EEPROM_FILENAME "eeprom.dat"
 
diff --git a/Marlin/src/HAL/HC32/eeprom_wired.cpp b/Marlin/src/HAL/HC32/eeprom/eeprom_wired.cpp
similarity index 95%
rename from Marlin/src/HAL/HC32/eeprom_wired.cpp
rename to Marlin/src/HAL/HC32/eeprom/eeprom_wired.cpp
index aea5fc87db..997180bd98 100644
--- a/Marlin/src/HAL/HC32/eeprom_wired.cpp
+++ b/Marlin/src/HAL/HC32/eeprom/eeprom_wired.cpp
@@ -21,7 +21,7 @@
  */
 #ifdef ARDUINO_ARCH_HC32
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -32,8 +32,8 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for I2C / SPI EEPROM."
diff --git a/Marlin/src/HAL/LPC1768/eeprom_flash.cpp b/Marlin/src/HAL/LPC1768/eeprom/eeprom_flash.cpp
similarity index 98%
rename from Marlin/src/HAL/LPC1768/eeprom_flash.cpp
rename to Marlin/src/HAL/LPC1768/eeprom/eeprom_flash.cpp
index 9f873d5774..3610f433eb 100644
--- a/Marlin/src/HAL/LPC1768/eeprom_flash.cpp
+++ b/Marlin/src/HAL/LPC1768/eeprom/eeprom_flash.cpp
@@ -36,11 +36,11 @@
  * 16Kb I/O buffers (intended to hold DMA USB and Ethernet data, but currently
  * unused).
  */
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 extern "C" {
   #include <lpc17xx_iap.h>
diff --git a/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp b/Marlin/src/HAL/LPC1768/eeprom/eeprom_sdcard.cpp
similarity index 98%
rename from Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
rename to Marlin/src/HAL/LPC1768/eeprom/eeprom_sdcard.cpp
index 30ecb01a09..3500f3e7cf 100644
--- a/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
+++ b/Marlin/src/HAL/LPC1768/eeprom/eeprom_sdcard.cpp
@@ -26,13 +26,13 @@
 
 #ifdef TARGET_LPC1768
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(SDCARD_EEPROM_EMULATION)
 
 //#define DEBUG_SD_EEPROM_EMULATION
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 #include <chanfs/diskio.h>
 #include <chanfs/ff.h>
diff --git a/Marlin/src/HAL/LPC1768/eeprom_wired.cpp b/Marlin/src/HAL/LPC1768/eeprom/eeprom_wired.cpp
similarity index 95%
rename from Marlin/src/HAL/LPC1768/eeprom_wired.cpp
rename to Marlin/src/HAL/LPC1768/eeprom/eeprom_wired.cpp
index 3230e29afc..6a5d90bd02 100644
--- a/Marlin/src/HAL/LPC1768/eeprom_wired.cpp
+++ b/Marlin/src/HAL/LPC1768/eeprom/eeprom_wired.cpp
@@ -21,7 +21,7 @@
  */
 #ifdef TARGET_LPC1768
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -30,8 +30,8 @@
  * with implementations supplied by the framework.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE           0x8000 // 32K
diff --git a/Marlin/src/HAL/RP2040/eeprom_flash.cpp b/Marlin/src/HAL/RP2040/eeprom/eeprom_flash.cpp
similarity index 95%
rename from Marlin/src/HAL/RP2040/eeprom_flash.cpp
rename to Marlin/src/HAL/RP2040/eeprom/eeprom_flash.cpp
index 5b1131ed43..89e882d77b 100644
--- a/Marlin/src/HAL/RP2040/eeprom_flash.cpp
+++ b/Marlin/src/HAL/RP2040/eeprom/eeprom_flash.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef __PLAT_RP2040__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 // NOTE: The Bigtreetech SKR Pico has an onboard W25Q16 flash module
 
diff --git a/Marlin/src/HAL/RP2040/eeprom_wired.cpp b/Marlin/src/HAL/RP2040/eeprom/eeprom_wired.cpp
similarity index 94%
rename from Marlin/src/HAL/RP2040/eeprom_wired.cpp
rename to Marlin/src/HAL/RP2040/eeprom/eeprom_wired.cpp
index 974f6f8dc1..7a5ca86c4c 100644
--- a/Marlin/src/HAL/RP2040/eeprom_wired.cpp
+++ b/Marlin/src/HAL/RP2040/eeprom/eeprom_wired.cpp
@@ -19,11 +19,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef __PLAT_RP2040__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -32,8 +32,8 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE size_t(E2END + 1)
diff --git a/Marlin/src/HAL/SAMD21/QSPIFlash.cpp b/Marlin/src/HAL/SAMD21/eeprom/QSPIFlash.cpp
similarity index 98%
rename from Marlin/src/HAL/SAMD21/QSPIFlash.cpp
rename to Marlin/src/HAL/SAMD21/eeprom/QSPIFlash.cpp
index fa54c62071..2a93226a6f 100644
--- a/Marlin/src/HAL/SAMD21/QSPIFlash.cpp
+++ b/Marlin/src/HAL/SAMD21/eeprom/QSPIFlash.cpp
@@ -24,7 +24,7 @@
  * SAMD21 HAL developed by Bart Meijer (brupje)
  * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
  */
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(QSPI_EEPROM)
 
diff --git a/Marlin/src/HAL/SAMD21/QSPIFlash.h b/Marlin/src/HAL/SAMD21/eeprom/QSPIFlash.h
similarity index 100%
rename from Marlin/src/HAL/SAMD21/QSPIFlash.h
rename to Marlin/src/HAL/SAMD21/eeprom/QSPIFlash.h
diff --git a/Marlin/src/HAL/SAMD21/eeprom_flash.cpp b/Marlin/src/HAL/SAMD21/eeprom/eeprom_flash.cpp
similarity index 98%
rename from Marlin/src/HAL/SAMD21/eeprom_flash.cpp
rename to Marlin/src/HAL/SAMD21/eeprom/eeprom_flash.cpp
index 66329bff19..1c190495de 100644
--- a/Marlin/src/HAL/SAMD21/eeprom_flash.cpp
+++ b/Marlin/src/HAL/SAMD21/eeprom/eeprom_flash.cpp
@@ -26,7 +26,7 @@
  */
 #ifdef __SAMD21__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
@@ -35,7 +35,7 @@
 /* reserve flash memory */
 static const uint8_t flashdata[TOTAL_FLASH_SIZE]  __attribute__((__aligned__(256))) { }; \
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE - eeprom_exclude_size; }
 
diff --git a/Marlin/src/HAL/SAMD21/eeprom_qspi.cpp b/Marlin/src/HAL/SAMD21/eeprom/eeprom_qspi.cpp
similarity index 96%
rename from Marlin/src/HAL/SAMD21/eeprom_qspi.cpp
rename to Marlin/src/HAL/SAMD21/eeprom/eeprom_qspi.cpp
index 12977a178c..8bd1bd3539 100644
--- a/Marlin/src/HAL/SAMD21/eeprom_qspi.cpp
+++ b/Marlin/src/HAL/SAMD21/eeprom/eeprom_qspi.cpp
@@ -26,13 +26,13 @@
  */
 #ifdef __SAMD21__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(QSPI_EEPROM)
 
 #error "QSPI_EEPROM emulation Not implemented on SAMD21"
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 #include "QSPIFlash.h"
 
diff --git a/Marlin/src/HAL/SAMD21/eeprom_wired.cpp b/Marlin/src/HAL/SAMD21/eeprom/eeprom_wired.cpp
similarity index 95%
rename from Marlin/src/HAL/SAMD21/eeprom_wired.cpp
rename to Marlin/src/HAL/SAMD21/eeprom/eeprom_wired.cpp
index da0eb1b0c8..82c701ebb1 100644
--- a/Marlin/src/HAL/SAMD21/eeprom_wired.cpp
+++ b/Marlin/src/HAL/SAMD21/eeprom/eeprom_wired.cpp
@@ -26,7 +26,7 @@
  */
 #ifdef __SAMD21__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -36,8 +36,8 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for I2C / SPI EEPROM."
diff --git a/Marlin/src/HAL/SAMD51/QSPIFlash.cpp b/Marlin/src/HAL/SAMD51/eeprom/QSPIFlash.cpp
similarity index 98%
rename from Marlin/src/HAL/SAMD51/QSPIFlash.cpp
rename to Marlin/src/HAL/SAMD51/eeprom/QSPIFlash.cpp
index fc21a1ad8c..191da1f30c 100644
--- a/Marlin/src/HAL/SAMD51/QSPIFlash.cpp
+++ b/Marlin/src/HAL/SAMD51/eeprom/QSPIFlash.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(QSPI_EEPROM)
 
diff --git a/Marlin/src/HAL/SAMD51/QSPIFlash.h b/Marlin/src/HAL/SAMD51/eeprom/QSPIFlash.h
similarity index 100%
rename from Marlin/src/HAL/SAMD51/QSPIFlash.h
rename to Marlin/src/HAL/SAMD51/eeprom/QSPIFlash.h
diff --git a/Marlin/src/HAL/SAMD51/eeprom_flash.cpp b/Marlin/src/HAL/SAMD51/eeprom/eeprom_flash.cpp
similarity index 97%
rename from Marlin/src/HAL/SAMD51/eeprom_flash.cpp
rename to Marlin/src/HAL/SAMD51/eeprom/eeprom_flash.cpp
index 7d5518956c..2387a0f99e 100644
--- a/Marlin/src/HAL/SAMD51/eeprom_flash.cpp
+++ b/Marlin/src/HAL/SAMD51/eeprom/eeprom_flash.cpp
@@ -25,11 +25,11 @@
  */
 #ifdef __SAMD51__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 #define NVMCTRL_CMD(c)    do{                                                 \
                             SYNC(!NVMCTRL->STATUS.bit.READY);                 \
diff --git a/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp b/Marlin/src/HAL/SAMD51/eeprom/eeprom_qspi.cpp
similarity index 96%
rename from Marlin/src/HAL/SAMD51/eeprom_qspi.cpp
rename to Marlin/src/HAL/SAMD51/eeprom/eeprom_qspi.cpp
index a39e4c4fa3..e829c28e26 100644
--- a/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp
+++ b/Marlin/src/HAL/SAMD51/eeprom/eeprom_qspi.cpp
@@ -25,11 +25,11 @@
  */
 #ifdef __SAMD51__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(QSPI_EEPROM)
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 #include "QSPIFlash.h"
 
diff --git a/Marlin/src/HAL/SAMD51/eeprom_wired.cpp b/Marlin/src/HAL/SAMD51/eeprom/eeprom_wired.cpp
similarity index 95%
rename from Marlin/src/HAL/SAMD51/eeprom_wired.cpp
rename to Marlin/src/HAL/SAMD51/eeprom/eeprom_wired.cpp
index 00a739a587..fc1eb09a0c 100644
--- a/Marlin/src/HAL/SAMD51/eeprom_wired.cpp
+++ b/Marlin/src/HAL/SAMD51/eeprom/eeprom_wired.cpp
@@ -25,7 +25,7 @@
  */
 #ifdef __SAMD51__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -34,8 +34,8 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for I2C / SPI EEPROM."
diff --git a/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp b/Marlin/src/HAL/STM32/eeprom/eeprom_bl24cxx.cpp
similarity index 94%
rename from Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp
rename to Marlin/src/HAL/STM32/eeprom/eeprom_bl24cxx.cpp
index 3e0bb58dad..8240f15d3a 100644
--- a/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp
+++ b/Marlin/src/HAL/STM32/eeprom/eeprom_bl24cxx.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef HAL_STM32
 
@@ -29,12 +29,12 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 //
 // PersistentStore
diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom/eeprom_flash.cpp
similarity index 98%
rename from Marlin/src/HAL/STM32/eeprom_flash.cpp
rename to Marlin/src/HAL/STM32/eeprom/eeprom_flash.cpp
index 14e6e4d854..9f1e49a4f6 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom/eeprom_flash.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef HAL_STM32
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 // Better: "utility/stm32_eeprom.h", but only after updating stm32duino to 2.0.0
 // Use EEPROM.h for compatibility, for now.
@@ -50,10 +50,10 @@
 
 #if ENABLED(FLASH_EEPROM_LEVELING)
 
-  #include "stm32_def.h"
+  #include <stm32_def.h>
 
   #define DEBUG_OUT ENABLED(EEPROM_CHITCHAT)
-  #include "../../core/debug_out.h"
+  #include "../../../core/debug_out.h"
 
   #ifndef MARLIN_EEPROM_SIZE
     #define MARLIN_EEPROM_SIZE    0x1000 // 4KB
diff --git a/Marlin/src/HAL/STM32/eeprom_if_iic.cpp b/Marlin/src/HAL/STM32/eeprom/eeprom_if_iic.cpp
similarity index 91%
rename from Marlin/src/HAL/STM32/eeprom_if_iic.cpp
rename to Marlin/src/HAL/STM32/eeprom/eeprom_if_iic.cpp
index ad8712c0c0..9cabdd681b 100644
--- a/Marlin/src/HAL/STM32/eeprom_if_iic.cpp
+++ b/Marlin/src/HAL/STM32/eeprom/eeprom_if_iic.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef HAL_STM32
 
@@ -29,12 +29,12 @@
  * Enable USE_SHARED_EEPROM if not supplied by the framework.
  */
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../../libs/BL24CXX.h"
-#include "../shared/eeprom_if.h"
+#include "../../../libs/BL24CXX.h"
+#include "../../shared/eeprom_if.h"
 
 void eeprom_init() { BL24CXX::init(); }
 
diff --git a/Marlin/src/HAL/STM32/eeprom_sdcard.cpp b/Marlin/src/HAL/STM32/eeprom/eeprom_sdcard.cpp
similarity index 94%
rename from Marlin/src/HAL/STM32/eeprom_sdcard.cpp
rename to Marlin/src/HAL/STM32/eeprom/eeprom_sdcard.cpp
index 071d0bac00..bcc76df813 100644
--- a/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
+++ b/Marlin/src/HAL/STM32/eeprom/eeprom_sdcard.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef HAL_STM32
 
@@ -28,12 +28,12 @@
  * Implementation of EEPROM settings in SD Card
  */
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(SDCARD_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
-#include "../../sd/cardreader.h"
+#include "../../shared/eeprom_api.h"
+#include "../../../sd/cardreader.h"
 
 #define EEPROM_FILENAME "eeprom.dat"
 
diff --git a/Marlin/src/HAL/STM32/eeprom_sram.cpp b/Marlin/src/HAL/STM32/eeprom/eeprom_sram.cpp
similarity index 93%
rename from Marlin/src/HAL/STM32/eeprom_sram.cpp
rename to Marlin/src/HAL/STM32/eeprom/eeprom_sram.cpp
index 58a67f1759..a9d62ec29c 100644
--- a/Marlin/src/HAL/STM32/eeprom_sram.cpp
+++ b/Marlin/src/HAL/STM32/eeprom/eeprom_sram.cpp
@@ -19,16 +19,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef HAL_STM32
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(SRAM_EEPROM_EMULATION)
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE 0x1000 // 4KB
diff --git a/Marlin/src/HAL/STM32/eeprom_wired.cpp b/Marlin/src/HAL/STM32/eeprom/eeprom_wired.cpp
similarity index 94%
rename from Marlin/src/HAL/STM32/eeprom_wired.cpp
rename to Marlin/src/HAL/STM32/eeprom/eeprom_wired.cpp
index 5440030bd4..fa45e6c40d 100644
--- a/Marlin/src/HAL/STM32/eeprom_wired.cpp
+++ b/Marlin/src/HAL/STM32/eeprom/eeprom_wired.cpp
@@ -19,11 +19,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef HAL_STM32
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -32,8 +32,8 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE size_t(E2END + 1)
diff --git a/Marlin/src/HAL/STM32F1/eeprom_bl24cxx.cpp b/Marlin/src/HAL/STM32F1/eeprom/eeprom_bl24cxx.cpp
similarity index 95%
rename from Marlin/src/HAL/STM32F1/eeprom_bl24cxx.cpp
rename to Marlin/src/HAL/STM32F1/eeprom/eeprom_bl24cxx.cpp
index 1252e77b0b..9e96a741bf 100644
--- a/Marlin/src/HAL/STM32F1/eeprom_bl24cxx.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom/eeprom_bl24cxx.cpp
@@ -26,12 +26,12 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 //
 // PersistentStore
diff --git a/Marlin/src/HAL/STM32F1/eeprom_flash.cpp b/Marlin/src/HAL/STM32F1/eeprom/eeprom_flash.cpp
similarity index 98%
rename from Marlin/src/HAL/STM32F1/eeprom_flash.cpp
rename to Marlin/src/HAL/STM32F1/eeprom/eeprom_flash.cpp
index 50d9cfc4f4..485bc4f1ba 100644
--- a/Marlin/src/HAL/STM32F1/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom/eeprom_flash.cpp
@@ -28,11 +28,11 @@
 
 #ifdef __STM32F1__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 #include <flash_stm32.h>
 #include <EEPROM.h>
diff --git a/Marlin/src/HAL/STM32F1/eeprom_if_iic.cpp b/Marlin/src/HAL/STM32F1/eeprom/eeprom_if_iic.cpp
similarity index 93%
rename from Marlin/src/HAL/STM32F1/eeprom_if_iic.cpp
rename to Marlin/src/HAL/STM32F1/eeprom/eeprom_if_iic.cpp
index 78b7af0b04..e1d5e06b68 100644
--- a/Marlin/src/HAL/STM32F1/eeprom_if_iic.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom/eeprom_if_iic.cpp
@@ -27,12 +27,12 @@
 
 #ifdef __STM32F1__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../../libs/BL24CXX.h"
-#include "../shared/eeprom_if.h"
+#include "../../../libs/BL24CXX.h"
+#include "../../shared/eeprom_if.h"
 
 void eeprom_init() { BL24CXX::init(); }
 
diff --git a/Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp b/Marlin/src/HAL/STM32F1/eeprom/eeprom_sdcard.cpp
similarity index 96%
rename from Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp
rename to Marlin/src/HAL/STM32F1/eeprom/eeprom_sdcard.cpp
index 6b72193422..4d28ce8e0a 100644
--- a/Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom/eeprom_sdcard.cpp
@@ -27,12 +27,12 @@
 
 #ifdef __STM32F1__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(SDCARD_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
-#include "../../sd/cardreader.h"
+#include "../../shared/eeprom_api.h"
+#include "../../../sd/cardreader.h"
 
 #define EEPROM_FILENAME "eeprom.dat"
 
diff --git a/Marlin/src/HAL/STM32F1/eeprom_wired.cpp b/Marlin/src/HAL/STM32F1/eeprom/eeprom_wired.cpp
similarity index 95%
rename from Marlin/src/HAL/STM32F1/eeprom_wired.cpp
rename to Marlin/src/HAL/STM32F1/eeprom/eeprom_wired.cpp
index bfb7718094..a1464ab983 100644
--- a/Marlin/src/HAL/STM32F1/eeprom_wired.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom/eeprom_wired.cpp
@@ -26,12 +26,12 @@
 
 #ifdef __STM32F1__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for I2C / SPI EEPROM."
diff --git a/platformio.ini b/platformio.ini
index d69fdc6cea..4d03696b5a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -78,6 +78,7 @@ default_src_filter = +<src/*> -<src/config> -<src/tests>
   -<src/gcode/host>
   -<src/gcode/lcd>
   -<src/gcode/motion>
+  -<src/gcode/ota>
   -<src/gcode/probe>
   -<src/gcode/scara>
   -<src/gcode/sd>