diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index d448b2febed..053256b7436 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -68,9 +68,9 @@
 #endif
 
 #if HAS_TFT_LVGL_UI
-  #include "lcd/extui/lib/mks_ui/tft_lvgl_configuration.h"
-  #include "lcd/extui/lib/mks_ui/draw_ui.h"
-  #include "lcd/extui/lib/mks_ui/mks_hardware_test.h"
+  #include "lcd/extui/mks_ui/tft_lvgl_configuration.h"
+  #include "lcd/extui/mks_ui/draw_ui.h"
+  #include "lcd/extui/mks_ui/mks_hardware_test.h"
   #include <lvgl.h>
 #endif
 
@@ -229,7 +229,7 @@
 #endif
 
 #if ENABLED(DGUS_LCD_UI_MKS)
-  #include "lcd/extui/lib/dgus/DGUSScreenHandler.h"
+  #include "lcd/extui/dgus/DGUSScreenHandler.h"
 #endif
 
 #if HAS_DRIVER_SAFE_POWER_PROTECT
diff --git a/Marlin/src/gcode/lcd/M995.cpp b/Marlin/src/gcode/lcd/M995.cpp
index bc8dc35d4e0..5e9fddbe8c3 100644
--- a/Marlin/src/gcode/lcd/M995.cpp
+++ b/Marlin/src/gcode/lcd/M995.cpp
@@ -27,7 +27,7 @@
 #include "../gcode.h"
 
 #if ENABLED(TFT_LVGL_UI)
-  #include "../../lcd/extui/lib/mks_ui/draw_touch_calibration.h"
+  #include "../../lcd/extui/mks_ui/draw_touch_calibration.h"
 #else
   #include "../../lcd/menu/menu.h"
 #endif
diff --git a/Marlin/src/gcode/sd/M24_M25.cpp b/Marlin/src/gcode/sd/M24_M25.cpp
index 1c98791bce7..89b166f9085 100644
--- a/Marlin/src/gcode/sd/M24_M25.cpp
+++ b/Marlin/src/gcode/sd/M24_M25.cpp
@@ -42,7 +42,7 @@
 #endif
 
 #if ENABLED(DGUS_LCD_UI_MKS)
-  #include "../../lcd/extui/lib/dgus/DGUSDisplayDef.h"
+  #include "../../lcd/extui/dgus/DGUSDisplayDef.h"
 #endif
 
 #include "../../MarlinCore.h" // for startOrResumeJob
diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.cpp b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.cpp
rename to Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
index 01a871a5426..9a7086bb511 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * lcd/extui/lib/FileNavigator.cpp
+ * lcd/extui/anycubic_chiron/FileNavigator.cpp
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@@ -46,7 +46,7 @@
  *
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
 #include "FileNavigator.h"
@@ -55,7 +55,7 @@
 using namespace ExtUI;
 
 #define DEBUG_OUT ACDEBUG(AC_FILE)
-#include "../../../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 namespace Anycubic {
 
diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.h b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.h
similarity index 96%
rename from Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.h
rename to Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.h
index 0d55eb47b73..ca4283f54ba 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.h
+++ b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * lcd/extui/lib/FileNavigator.h
+ * lcd/extui/anycubic_chiron/FileNavigator.h
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@@ -30,7 +30,7 @@
  */
 
 #include "chiron_tft_defs.h"
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
 using namespace ExtUI;
 
diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/Tunes.cpp b/Marlin/src/lcd/extui/anycubic_chiron/Tunes.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/lib/anycubic_chiron/Tunes.cpp
rename to Marlin/src/lcd/extui/anycubic_chiron/Tunes.cpp
index f09c4db3f28..f228c471c9c 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_chiron/Tunes.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/Tunes.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * lcd/extui/lib/Tunes.cpp
+ * lcd/extui/anycubic_chiron/Tunes.cpp
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@@ -33,12 +33,12 @@
  * See Tunes.h for note and tune definitions.                          *
  ***********************************************************************/
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
 
 #include "Tunes.h"
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
 namespace Anycubic {
 
diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/Tunes.h b/Marlin/src/lcd/extui/anycubic_chiron/Tunes.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/anycubic_chiron/Tunes.h
rename to Marlin/src/lcd/extui/anycubic_chiron/Tunes.h
index 1bafec43adf..bf2e92d03e5 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_chiron/Tunes.h
+++ b/Marlin/src/lcd/extui/anycubic_chiron/Tunes.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * lcd/extui/lib/Tunes.h
+ * lcd/extui/anycubic_chiron/Tunes.h
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
diff --git a/Marlin/src/lcd/extui/anycubic_chiron_lcd.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/anycubic_chiron_lcd.cpp
rename to Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
index 2ec51043101..0f6f8abe384 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
@@ -21,17 +21,17 @@
  */
 
 /**
- * lcd/extui/anycubic_chiron_lcd.cpp
+ * lcd/extui/anycubic_chiron/chiron_extui.cpp
  *
  * Anycubic Chiron TFT support for Marlin
  */
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
 
-#include "ui_api.h"
-#include "lib/anycubic_chiron/chiron_tft.h"
+#include "../ui_api.h"
+#include "chiron_tft.h"
 
 using namespace Anycubic;
 
diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp
rename to Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index 5ad3895da01..14d394db72c 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -21,14 +21,14 @@
  */
 
 /**
- * lcd/extui/lib/chiron_tft.cpp
+ * lcd/extui/anycubic_chiron/chiron_tft.cpp
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
  *  (not affiliated with Anycubic, Ltd.)
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
 
@@ -36,10 +36,10 @@
 #include "Tunes.h"
 #include "FileNavigator.h"
 
-#include "../../../../gcode/queue.h"
-#include "../../../../sd/cardreader.h"
-#include "../../../../libs/numtostr.h"
-#include "../../../../MarlinCore.h"
+#include "../../../gcode/queue.h"
+#include "../../../sd/cardreader.h"
+#include "../../../libs/numtostr.h"
+#include "../../../MarlinCore.h"
 
 namespace Anycubic {
 
diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.h b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
similarity index 96%
rename from Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.h
rename to Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
index aeef12afc61..7eb0049993f 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.h
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * lcd/extui/lib/chiron_tft.h
+ * lcd/extui/anycubic_chiron/chiron_tft.h
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@@ -30,8 +30,8 @@
  */
 
 #include "chiron_tft_defs.h"
-#include "../../../../inc/MarlinConfigPre.h"
-#include "../../ui_api.h"
+#include "../../../inc/MarlinConfigPre.h"
+#include "../ui_api.h"
 
 #if NONE(CHIRON_TFT_STANDARD, CHIRON_TFT_NEW)
   #define AUTO_DETECT_CHIRON_TFT 1
diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft_defs.h b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
similarity index 98%
rename from Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft_defs.h
rename to Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
index 83e64e7973c..70ac1490dfa 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft_defs.h
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
@@ -21,7 +21,7 @@
  */
 
 /**
- * lcd/extui/lib/chiron_defs.h
+ * lcd/extui/anycubic_chiron/chiron_defs.h
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@@ -29,7 +29,7 @@
  */
 
 #pragma once
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 //#define ACDEBUGLEVEL 4
 
 #if ACDEBUGLEVEL
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp
rename to Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
index 9055e7b430d..33e7e84a819 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
@@ -21,15 +21,15 @@
  */
 
 /**
- * anycubic_i3mega_lcd.cpp
+ * lcd/extui/anycubic_i3mega/anycubic_extui.cpp
  */
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_I3MEGA)
 
-#include "lib/anycubic_i3mega/anycubic_i3mega_lcd.h"
-#include "ui_api.h"
+#include "anycubic_i3mega_lcd.h"
+#include "../ui_api.h"
 
 #include <Arduino.h>    // for the ::tone() call
 
diff --git a/Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.cpp
rename to Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
index f3a9472c204..3277ad4fb49 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
@@ -19,17 +19,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_I3MEGA)
 
 #include "anycubic_i3mega_lcd.h"
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
-#include "../../../../libs/numtostr.h"
-#include "../../../../module/motion.h"  // for quickstop_stepper, A20 read printing speed, feedrate_percentage
-#include "../../../../MarlinCore.h"     // for disable_steppers
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../libs/numtostr.h"
+#include "../../../module/motion.h"  // for quickstop_stepper, A20 read printing speed, feedrate_percentage
+#include "../../../MarlinCore.h"     // for disable_steppers
+#include "../../../inc/MarlinConfig.h"
 
 // command sending macro's with debugging capability
 #define SEND_PGM(x)       send_P(PSTR(x))
diff --git a/Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.h b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.h
similarity index 96%
rename from Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.h
rename to Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.h
index e34cb2fe692..fa62b545dcd 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.h
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.h
@@ -20,8 +20,8 @@
  */
 #pragma once
 
-#include "../../../../inc/MarlinConfigPre.h"
-#include "../../../../sd/SdFatConfig.h"   // for the FILENAME_LENGTH macro
+#include "../../../inc/MarlinConfigPre.h"
+#include "../../../sd/SdFatConfig.h"   // for the FILENAME_LENGTH macro
 
 #define TFTBUFSIZE 4
 #define TFT_MAX_CMD_SIZE 96
diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
rename to Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
index 2f33768655b..c2390d63a66 100644
--- a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_DGUS_LCD
 
@@ -28,16 +28,16 @@
   #warning "More than 2 hotends not implemented on DGUS Display UI."
 #endif
 
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
-#include "../../../../MarlinCore.h"
-#include "../../../../module/motion.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../module/planner.h"
-#include "../../../../libs/duration_t.h"
-#include "../../../../module/printcounter.h"
+#include "../../../MarlinCore.h"
+#include "../../../module/motion.h"
+#include "../../../gcode/queue.h"
+#include "../../../module/planner.h"
+#include "../../../libs/duration_t.h"
+#include "../../../module/printcounter.h"
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 #include "DGUSDisplay.h"
diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
similarity index 96%
rename from Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
rename to Marlin/src/lcd/extui/dgus/DGUSDisplay.h
index f33935a269f..f1071f6b0a1 100644
--- a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
@@ -22,15 +22,15 @@
 #pragma once
 
 /**
- * lcd/extui/lib/dgus/DGUSDisplay.h
+ * lcd/extui/dgus/DGUSDisplay.h
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #include <stdlib.h>    // size_t
 
 #if HAS_BED_PROBE
-  #include "../../../../module/probe.h"
+  #include "../../../module/probe.h"
 #endif
 #include "DGUSVPVariable.h"
 
@@ -38,7 +38,7 @@ enum DGUSLCD_Screens : uint8_t;
 
 //#define DEBUG_DGUSLCD
 #define DEBUG_OUT ENABLED(DEBUG_DGUSLCD)
-#include "../../../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 typedef enum : uint8_t {
   DGUS_IDLE,           //< waiting for DGUS_HEADER1.
diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/DGUSDisplayDef.h
similarity index 95%
rename from Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h
rename to Marlin/src/lcd/extui/dgus/DGUSDisplayDef.h
index 0b689435933..9cbcf0dd7b1 100644
--- a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplayDef.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * lcd/extui/lib/dgus/DGUSDisplayDef.h
+ * lcd/extui/dgus/DGUSDisplayDef.h
  * Defines the interaction between Marlin and the display firmware
  */
 
@@ -44,7 +44,7 @@ extern const struct VPMapping VPMap[];
 // List of VPs handled by Marlin / The Display.
 extern const struct DGUS_VP_Variable ListOfVP[];
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(DGUS_LCD_UI_ORIGIN)
   #include "origin/DGUSDisplayDef.h"
diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.cpp
rename to Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 067ea482c78..5b3bb9e0f39 100644
--- a/Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -20,24 +20,24 @@
  *
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_DGUS_LCD
 
 #include "DGUSScreenHandler.h"
 
-#include "../../../../MarlinCore.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../libs/duration_t.h"
-#include "../../../../module/settings.h"
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
-#include "../../../../module/printcounter.h"
-#include "../../../../sd/cardreader.h"
+#include "../../../MarlinCore.h"
+#include "../../../gcode/queue.h"
+#include "../../../libs/duration_t.h"
+#include "../../../module/settings.h"
+#include "../../../module/temperature.h"
+#include "../../../module/motion.h"
+#include "../../../module/planner.h"
+#include "../../../module/printcounter.h"
+#include "../../../sd/cardreader.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 DGUSScreenHandler ScreenHandler;
diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h
similarity index 93%
rename from Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.h
rename to Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h
index 21e25b3b885..9aeb5b73b1c 100644
--- a/Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h
@@ -22,12 +22,12 @@
 #pragma once
 
 /**
- * lcd/extui/lib/dgus/DGUSScreenHandler.h
+ * lcd/extui/dgus/DGUSScreenHandler.h
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
 #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
 
diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSVPVariable.h b/Marlin/src/lcd/extui/dgus/DGUSVPVariable.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/dgus/DGUSVPVariable.h
rename to Marlin/src/lcd/extui/dgus/DGUSVPVariable.h
diff --git a/Marlin/src/lcd/extui/dgus_lcd.cpp b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/dgus_lcd.cpp
rename to Marlin/src/lcd/extui/dgus/dgus_extui.cpp
index 4776ceb1542..b3892941756 100644
--- a/Marlin/src/lcd/extui/dgus_lcd.cpp
+++ b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
@@ -21,17 +21,17 @@
  */
 
 /**
- * lcd/extui/dgus_lcd.cpp
+ * lcd/extui/dgus/dgus_extui.cpp
  */
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_DGUS_LCD
 
-#include "ui_api.h"
-#include "lib/dgus/DGUSDisplay.h"
-#include "lib/dgus/DGUSDisplayDef.h"
-#include "lib/dgus/DGUSScreenHandler.h"
+#include "../ui_api.h"
+#include "DGUSDisplay.h"
+#include "DGUSDisplayDef.h"
+#include "DGUSScreenHandler.h"
 
 namespace ExtUI {
 
diff --git a/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
rename to Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
index ee0a1c749fa..5e164d289ee 100644
--- a/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
@@ -22,7 +22,7 @@
 
 /* DGUS VPs changed by George Fu in 2019 for Marlin */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_FYSETC)
 
@@ -30,12 +30,12 @@
 #include "../DGUSDisplay.h"
 #include "../DGUSScreenHandler.h"
 
-#include "../../../../../module/temperature.h"
-#include "../../../../../module/motion.h"
-#include "../../../../../module/planner.h"
+#include "../../../../module/temperature.h"
+#include "../../../../module/motion.h"
+#include "../../../../module/planner.h"
 
-#include "../../../ui_api.h"
-#include "../../../../marlinui.h"
+#include "../../ui_api.h"
+#include "../../../marlinui.h"
 
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 10;
diff --git a/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h
rename to Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.h
diff --git a/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSScreenHandler.cpp
rename to Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
index 26dafeaaab2..8b97003f6fc 100644
--- a/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
@@ -20,24 +20,24 @@
  *
  */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_FYSETC)
 
 #include "../DGUSScreenHandler.h"
 
-#include "../../../../../MarlinCore.h"
-#include "../../../../../gcode/queue.h"
-#include "../../../../../libs/duration_t.h"
-#include "../../../../../module/settings.h"
-#include "../../../../../module/temperature.h"
-#include "../../../../../module/motion.h"
-#include "../../../../../module/planner.h"
-#include "../../../../../module/printcounter.h"
-#include "../../../../../sd/cardreader.h"
+#include "../../../../MarlinCore.h"
+#include "../../../../gcode/queue.h"
+#include "../../../../libs/duration_t.h"
+#include "../../../../module/settings.h"
+#include "../../../../module/temperature.h"
+#include "../../../../module/motion.h"
+#include "../../../../module/planner.h"
+#include "../../../../module/printcounter.h"
+#include "../../../../sd/cardreader.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../../feature/powerloss.h"
+  #include "../../../../feature/powerloss.h"
 #endif
 
 #if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSScreenHandler.h
rename to Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
index 24965597a58..d8e25a8f774 100644
--- a/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
@@ -25,7 +25,7 @@
 #include "../DGUSVPVariable.h"
 #include "../DGUSDisplayDef.h"
 
-#include "../../../../../inc/MarlinConfig.h"
+#include "../../../../inc/MarlinConfig.h"
 
 enum DGUSLCD_Screens : uint8_t;
 
diff --git a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
rename to Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
index d3c4510fb35..a9fa407dd3e 100644
--- a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
@@ -22,7 +22,7 @@
 
 /* DGUS VPs changed by George Fu in 2019 for Marlin */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_HIPRECY)
 
@@ -30,12 +30,12 @@
 #include "../DGUSDisplay.h"
 #include "../DGUSScreenHandler.h"
 
-#include "../../../../../module/temperature.h"
-#include "../../../../../module/motion.h"
-#include "../../../../../module/planner.h"
+#include "../../../../module/temperature.h"
+#include "../../../../module/motion.h"
+#include "../../../../module/planner.h"
 
-#include "../../../ui_api.h"
-#include "../../../../marlinui.h"
+#include "../../ui_api.h"
+#include "../../../marlinui.h"
 
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 10;
diff --git a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h
rename to Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.h
diff --git a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSScreenHandler.cpp
rename to Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
index f91c2737e0c..f3729d12534 100644
--- a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
@@ -20,24 +20,24 @@
  *
  */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_HYPRECY)
 
 #include "../DGUSScreenHandler.h"
 
-#include "../../../../../MarlinCore.h"
-#include "../../../../../gcode/queue.h"
-#include "../../../../../libs/duration_t.h"
-#include "../../../../../module/settings.h"
-#include "../../../../../module/temperature.h"
-#include "../../../../../module/motion.h"
-#include "../../../../../module/planner.h"
-#include "../../../../../module/printcounter.h"
-#include "../../../../../sd/cardreader.h"
+#include "../../../../MarlinCore.h"
+#include "../../../../gcode/queue.h"
+#include "../../../../libs/duration_t.h"
+#include "../../../../module/settings.h"
+#include "../../../../module/temperature.h"
+#include "../../../../module/motion.h"
+#include "../../../../module/planner.h"
+#include "../../../../module/printcounter.h"
+#include "../../../../sd/cardreader.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../../feature/powerloss.h"
+  #include "../../../../feature/powerloss.h"
 #endif
 
 #if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSScreenHandler.h
rename to Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
index 24965597a58..d8e25a8f774 100644
--- a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
@@ -25,7 +25,7 @@
 #include "../DGUSVPVariable.h"
 #include "../DGUSDisplayDef.h"
 
-#include "../../../../../inc/MarlinConfig.h"
+#include "../../../../inc/MarlinConfig.h"
 
 enum DGUSLCD_Screens : uint8_t;
 
diff --git a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/dgus/mks/DGUSDisplayDef.cpp
rename to Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
index 667442b31c2..7d98b64991e 100644
--- a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_MKS)
 
@@ -28,15 +28,15 @@
 #include "../DGUSDisplay.h"
 #include "../DGUSScreenHandler.h"
 
-#include "../../../../../module/temperature.h"
-#include "../../../../../module/motion.h"
-#include "../../../../../module/planner.h"
+#include "../../../../module/temperature.h"
+#include "../../../../module/motion.h"
+#include "../../../../module/planner.h"
 
-#include "../../../ui_api.h"
-#include "../../../../marlinui.h"
+#include "../../ui_api.h"
+#include "../../../marlinui.h"
 
 #if ENABLED(HAS_STEALTHCHOP)
-  #include "../../../../../module/stepper/trinamic.h"
+  #include "../../../../module/stepper/trinamic.h"
 #endif
 
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
diff --git a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/dgus/mks/DGUSDisplayDef.h
rename to Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
diff --git a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp
rename to Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 2abec905cbd..d31a1dcacd6 100644
--- a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -20,31 +20,31 @@
  *
  */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_MKS)
 
 #include "../DGUSScreenHandler.h"
 
-#include "../../../../../inc/MarlinConfig.h"
+#include "../../../../inc/MarlinConfig.h"
 
-#include "../../../../../MarlinCore.h"
-#include "../../../../../module/settings.h"
-#include "../../../../../module/temperature.h"
-#include "../../../../../module/motion.h"
-#include "../../../../../module/planner.h"
-#include "../../../../../module/printcounter.h"
+#include "../../../../MarlinCore.h"
+#include "../../../../module/settings.h"
+#include "../../../../module/temperature.h"
+#include "../../../../module/motion.h"
+#include "../../../../module/planner.h"
+#include "../../../../module/printcounter.h"
 
-#include "../../../../../gcode/gcode.h"
+#include "../../../../gcode/gcode.h"
 
 #if ENABLED(HAS_STEALTHCHOP)
-  #include "../../../../../module/stepper/trinamic.h"
-  #include "../../../../../module/stepper/indirection.h"
+  #include "../../../../module/stepper/trinamic.h"
+  #include "../../../../module/stepper/indirection.h"
 #endif
-#include "../../../../../module/probe.h"
+#include "../../../../module/probe.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../../feature/powerloss.h"
+  #include "../../../../feature/powerloss.h"
 #endif
 
 #if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.h
rename to Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
index ef67635f8d5..6713debd83a 100644
--- a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
@@ -25,7 +25,7 @@
 #include "../DGUSVPVariable.h"
 #include "../DGUSDisplayDef.h"
 
-#include "../../../../../inc/MarlinConfig.h"
+#include "../../../../inc/MarlinConfig.h"
 
 enum DGUSLCD_Screens : uint8_t;
 
diff --git a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
rename to Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
index e232bf9b969..1c2944bb4f0 100644
--- a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
@@ -21,10 +21,10 @@
  */
 
 /**
- * lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
+ * lcd/extui/dgus/origin/DGUSDisplayDef.cpp
  */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_ORIGIN)
 
@@ -32,12 +32,12 @@
 #include "../DGUSDisplay.h"
 #include "../DGUSScreenHandler.h"
 
-#include "../../../../../module/temperature.h"
-#include "../../../../../module/motion.h"
-#include "../../../../../module/planner.h"
+#include "../../../../module/temperature.h"
+#include "../../../../module/motion.h"
+#include "../../../../module/planner.h"
 
-#include "../../../../marlinui.h"
-#include "../../../ui_api.h"
+#include "../../../marlinui.h"
+#include "../../ui_api.h"
 
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 10;
diff --git a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h
rename to Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h
diff --git a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.cpp
rename to Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
index 73e2f4f6f0a..f05dfc6f70c 100644
--- a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
@@ -20,24 +20,24 @@
  *
  */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_ORIGIN)
 
 #include "../DGUSScreenHandler.h"
 
-#include "../../../../../MarlinCore.h"
-#include "../../../../../gcode/queue.h"
-#include "../../../../../libs/duration_t.h"
-#include "../../../../../module/settings.h"
-#include "../../../../../module/temperature.h"
-#include "../../../../../module/motion.h"
-#include "../../../../../module/planner.h"
-#include "../../../../../module/printcounter.h"
-#include "../../../../../sd/cardreader.h"
+#include "../../../../MarlinCore.h"
+#include "../../../../gcode/queue.h"
+#include "../../../../libs/duration_t.h"
+#include "../../../../module/settings.h"
+#include "../../../../module/temperature.h"
+#include "../../../../module/motion.h"
+#include "../../../../module/planner.h"
+#include "../../../../module/printcounter.h"
+#include "../../../../sd/cardreader.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../../feature/powerloss.h"
+  #include "../../../../feature/powerloss.h"
 #endif
 
 #if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.h
rename to Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
index 24965597a58..d8e25a8f774 100644
--- a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
@@ -25,7 +25,7 @@
 #include "../DGUSVPVariable.h"
 #include "../DGUSDisplayDef.h"
 
-#include "../../../../../inc/MarlinConfig.h"
+#include "../../../../inc/MarlinConfig.h"
 
 enum DGUSLCD_Screens : uint8_t;
 
diff --git a/Marlin/src/lcd/extui/example.cpp b/Marlin/src/lcd/extui/example/example.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/example.cpp
rename to Marlin/src/lcd/extui/example/example.cpp
index 8f00d26fd82..959d7508725 100644
--- a/Marlin/src/lcd/extui/example.cpp
+++ b/Marlin/src/lcd/extui/example/example.cpp
@@ -19,11 +19,11 @@
  *   location: <https://www.gnu.org/licenses/>.                             *
  ****************************************************************************/
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(EXTUI_EXAMPLE, EXTENSIBLE_UI)
 
-#include "ui_api.h"
+#include "../ui_api.h"
 
 // To implement a new UI, complete the functions below and
 // read or update Marlin's state using the methods in the
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
similarity index 93%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
index 3528dd9e155..249c57b9c65 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
@@ -22,11 +22,11 @@
 
 #pragma once
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(SDSUPPORT)
-  #include "../../../../../sd/SdFile.h"
-  #include "../../../../../sd/cardreader.h"
+  #include "../../../../sd/SdFile.h"
+  #include "../../../../sd/cardreader.h"
 #endif
 
 class MediaFileReader {
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/compat.h
similarity index 95%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/compat.h
index c01d45ed7c5..dd25af1e74b 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/compat.h
@@ -27,11 +27,11 @@
  */
 
 #ifdef __has_include
-  #if __has_include("../../ui_api.h")
-    #include "../../ui_api.h"
+  #if __has_include("../ui_api.h")
+    #include "../ui_api.h"
   #endif
 #else
-  #include "../../ui_api.h"
+  #include "../ui_api.h"
 #endif
 
 #ifdef __MARLIN_FIRMWARE__
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/config.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/config.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/config.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/config.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
similarity index 57%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
index b3a9e42766f..08faaa3b6ad 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
@@ -1,26 +1,30 @@
-/*********************
- * marlin_events.cpp *
- *********************/
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
-/****************************************************************************
- *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
- *   Written By Marcio Teixeira 2018 - Aleph Objects, Inc.                  *
- *                                                                          *
- *   This program is free software: you can redistribute it and/or modify   *
- *   it under the terms of the GNU General Public License as published by   *
- *   the Free Software Foundation, either version 3 of the License, or      *
- *   (at your option) any later version.                                    *
- *                                                                          *
- *   This program is distributed in the hope that it will be useful,        *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
- *   GNU General Public License for more details.                           *
- *                                                                          *
- *   To view a copy of the GNU General Public License, go to the following  *
- *   location: <https://www.gnu.org/licenses/>.                             *
- ****************************************************************************/
+/**
+ * lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
+ */
 
-#include "compat.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 
@@ -30,13 +34,9 @@ namespace ExtUI {
   using namespace Theme;
   using namespace FTDI;
 
-  void onStartup() {
-    EventLoop::setup();
-  }
+  void onStartup() { EventLoop::setup(); }
 
-  void onIdle() {
-    EventLoop::loop();
-  }
+  void onIdle() { EventLoop::loop(); }
 
   void onPrinterKilled(PGM_P const error, PGM_P const component) {
     char str[strlen_P(error) + strlen_P(component) + 3];
@@ -71,24 +71,17 @@ namespace ExtUI {
     AlertDialogBox::showError(F("Unable to read media."));
   }
 
-  void onStatusChanged(const char *lcd_msg) {
-    StatusScreen::setStatusMessage(lcd_msg);
-  }
-
-  void onStatusChanged(progmem_str lcd_msg) {
-    StatusScreen::setStatusMessage(lcd_msg);
-  }
+  void onStatusChanged(const char *lcd_msg) { StatusScreen::setStatusMessage(lcd_msg); }
+  void onStatusChanged(progmem_str lcd_msg) { StatusScreen::setStatusMessage(lcd_msg); }
 
   void onPrintTimerStarted() {
     InterfaceSoundsScreen::playEventSound(InterfaceSoundsScreen::PRINTING_STARTED);
   }
-
   void onPrintTimerStopped() {
     InterfaceSoundsScreen::playEventSound(InterfaceSoundsScreen::PRINTING_FINISHED);
   }
 
   void onPrintTimerPaused() {}
-
   void onPrintFinished() {}
 
   void onFilamentRunout(const extruder_t extruder) {
@@ -101,38 +94,23 @@ namespace ExtUI {
   void onHomingStart() {}
   void onHomingComplete() {}
 
-  void onFactoryReset() {
-    InterfaceSettingsScreen::defaultSettings();
-  }
-
-  void onStoreSettings(char *buff) {
-    InterfaceSettingsScreen::saveSettings(buff);
-  }
-
-  void onLoadSettings(const char *buff) {
-    InterfaceSettingsScreen::loadSettings(buff);
-  }
-
-  void onPostprocessSettings() {
-    // Called after loading or resetting stored settings
-  }
+  void onFactoryReset() { InterfaceSettingsScreen::defaultSettings(); }
+  void onStoreSettings(char *buff) { InterfaceSettingsScreen::saveSettings(buff); }
+  void onLoadSettings(const char *buff) { InterfaceSettingsScreen::loadSettings(buff); }
+  void onPostprocessSettings() {} // Called after loading or resetting stored settings
 
   void onConfigurationStoreWritten(bool success) {
     #ifdef ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
       if (success && InterfaceSettingsScreen::backupEEPROM()) {
-        SERIAL_ECHOLNPGM("Made backup of EEPROM to SPI Flash");
+        SERIAL_ECHOLNPGM("EEPROM backed up to SPI Flash");
       }
     #else
       UNUSED(success);
     #endif
   }
+  void onConfigurationStoreRead(bool) {}
 
-  void onConfigurationStoreRead(bool) {
-  }
-
-  void onPlayTone(const uint16_t frequency, const uint16_t duration) {
-    sound.play_tone(frequency, duration);
-  }
+  void onPlayTone(const uint16_t frequency, const uint16_t duration) { sound.play_tone(frequency, duration); }
 
   void onUserConfirmRequired(const char * const msg) {
     if (msg)
@@ -143,20 +121,12 @@ namespace ExtUI {
 
   #if HAS_LEVELING && HAS_MESH
     void onMeshLevelingStart() {}
-
-    void onMeshUpdate(const int8_t x, const int8_t y, const_float_t val) {
-      BedMeshViewScreen::onMeshUpdate(x, y, val);
-    }
-
-    void onMeshUpdate(const int8_t x, const int8_t y, const ExtUI::probe_state_t state) {
-      BedMeshViewScreen::onMeshUpdate(x, y, state);
-    }
+    void onMeshUpdate(const int8_t x, const int8_t y, const_float_t val) { BedMeshViewScreen::onMeshUpdate(x, y, val); }
+    void onMeshUpdate(const int8_t x, const int8_t y, const ExtUI::probe_state_t state) { BedMeshViewScreen::onMeshUpdate(x, y, state); }
   #endif
 
   #if ENABLED(POWER_LOSS_RECOVERY)
-    void onPowerLossResume() {
-      // Called on resume from power-loss
-    }
+    void onPowerLossResume() {} // Called on resume from power-loss
   #endif
 
   #if HAS_PID_HEATING
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/README.md
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/README.md
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set_bitmap_31.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set_bitmap_31.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set_bitmap_31.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set_bitmap_31.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.png b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.png
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.png
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.png
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.svg b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.svg
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.svg
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.svg
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.png b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.png
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.png
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.png
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/bitmap2cpp.py b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/bitmap2cpp.py
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/bitmap2cpp.py
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/bitmap2cpp.py
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.cpp
index e4ecdc8b490..d9097675265 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.cpp
@@ -20,7 +20,7 @@
  ****************************************************************************/
 
 
-#include "../../../../../MarlinCore.h"
+#include "../../../../MarlinCore.h"
 
 #include "language.h"
 
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
index ae95a647091..04cdbe96db9 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
@@ -27,7 +27,7 @@
  * without adding new pin definitions to the board.
  */
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(F6_TFT_PINMAP)              // FYSETC F6 - ATmega2560
 
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_base.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_base.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_ui.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_ui.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_ui.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_ui.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
index dba565189a7..46b27062bfe 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
@@ -25,7 +25,7 @@
 
 #ifdef FTDI_CONFIRM_ABORT_PRINT_DIALOG_BOX
 
-#include "../../../../../feature/host_actions.h"
+#include "../../../../feature/host_actions.h"
 
 using namespace ExtUI;
 
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/custom_user_menus.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/custom_user_menus.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/custom_user_menus.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/custom_user_menus.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/flow_percent_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/flow_percent_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
index 2566a960e1a..56f0fbdc3cc 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
@@ -28,10 +28,10 @@
 
 #include "../archim2-flash/flash_storage.h"
 
-#include "../../../../../module/settings.h"
+#include "../../../../module/settings.h"
 
 #if ENABLED(LULZBOT_PRINTCOUNTER)
-  #include "../../../../../module/printcounter.h"
+  #include "../../../../module/printcounter.h"
 #endif
 
 bool restoreEEPROM();
@@ -258,7 +258,7 @@ void InterfaceSettingsScreen::loadSettings(const char *buff) {
 }
 
 #ifdef ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
-  #include "../../../../../HAL/shared/eeprom_api.h"
+  #include "../../../../HAL/shared/eeprom_api.h"
 
   bool restoreEEPROM() {
     uint8_t data[ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE];
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/leveling_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.cpp
index 752b17ee004..1309ab5c096 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.cpp
@@ -26,7 +26,7 @@
 #ifdef FTDI_LEVELING_MENU
 
 #if BOTH(HAS_BED_PROBE,BLTOUCH)
-  #include "../../../../../feature/bltouch.h"
+  #include "../../../../feature/bltouch.h"
 #endif
 
 using namespace FTDI;
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/leveling_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/leveling_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screen_data.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screen_data.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screen_data.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screen_data.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.h
index a0cb71a6a6b..316896c3602 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.h
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include "../compat.h"
+
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 
 #include "../ftdi_eve_lib/ftdi_eve_lib.h"
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.cpp
index df31c0ec6f5..5403b4004e3 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.cpp
@@ -25,7 +25,7 @@
 
 #ifdef FTDI_TUNE_MENU
 
-#include "../../../../../feature/host_actions.h"
+#include "../../../../feature/host_actions.h"
 
 using namespace FTDI;
 using namespace Theme;
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bitmaps.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bitmaps.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/colors.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/colors.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/fonts.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/fonts.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/theme.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/theme.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/theme.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/theme.h
diff --git a/Marlin/src/lcd/extui/malyan_lcd.cpp b/Marlin/src/lcd/extui/malyan/malyan.cpp
similarity index 75%
rename from Marlin/src/lcd/extui/malyan_lcd.cpp
rename to Marlin/src/lcd/extui/malyan/malyan.cpp
index b4e2e328e4c..12cdcdf004a 100644
--- a/Marlin/src/lcd/extui/malyan_lcd.cpp
+++ b/Marlin/src/lcd/extui/malyan/malyan.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * malyan_lcd.cpp
+ * lcd/extui/malyan/malyan.cpp
  *
  * LCD implementation for Malyan's LCD, a separate ESP8266 MCU running
  * on Serial1 for the M200 board. This module outputs a pseudo-gcode
@@ -41,25 +41,26 @@
  * Copyright (c) 2017 Jason Nelson (xC0000005)
  */
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(MALYAN_LCD)
 
 //#define DEBUG_MALYAN_LCD
 
-#include "ui_api.h"
+#include "malyan.h"
+#include "../ui_api.h"
+#include "../../marlinui.h"
 
-#include "../marlinui.h"
-#include "../../sd/cardreader.h"
-#include "../../module/temperature.h"
-#include "../../module/stepper.h"
-#include "../../module/motion.h"
-#include "../../libs/duration_t.h"
-#include "../../module/printcounter.h"
-#include "../../gcode/queue.h"
+#include "../../../sd/cardreader.h"
+#include "../../../module/temperature.h"
+#include "../../../module/stepper.h"
+#include "../../../module/motion.h"
+#include "../../../libs/duration_t.h"
+#include "../../../module/printcounter.h"
+#include "../../../gcode/queue.h"
 
 #define DEBUG_OUT ENABLED(DEBUG_MALYAN_LCD)
-#include "../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 // This is based on longest sys command + a filename, plus some buffer
 // in case we encounter some data we don't recognize
@@ -94,7 +95,7 @@ void write_to_lcd(const char * const message) {
 }
 
 // {E:<msg>} is for error states.
-void set_lcd_error_P(PGM_P const error, PGM_P const component=nullptr) {
+void set_lcd_error_P(PGM_P const error, PGM_P const component/*=nullptr*/) {
   write_to_lcd_P(PSTR("{E:"));
   write_to_lcd_P(error);
   if (component) {
@@ -416,125 +417,4 @@ void update_usb_status(const bool forceUpdate) {
   }
 }
 
-namespace ExtUI {
-  void onStartup() {
-    /**
-     * The Malyan LCD actually runs as a separate MCU on Serial 1.
-     * This code's job is to siphon the weird curly-brace commands from
-     * it and translate into ExtUI operations where possible.
-     */
-    inbound_count = 0;
-
-    #ifndef LCD_BAUDRATE
-      #define LCD_BAUDRATE 500000
-    #endif
-    LCD_SERIAL.begin(LCD_BAUDRATE);
-
-    // Signal init
-    write_to_lcd_P(PSTR("{SYS:STARTED}\r\n"));
-
-    // send a version that says "unsupported"
-    write_to_lcd_P(PSTR("{VER:99}\r\n"));
-
-    // No idea why it does this twice.
-    write_to_lcd_P(PSTR("{SYS:STARTED}\r\n"));
-    update_usb_status(true);
-  }
-
-  void onIdle() {
-    /**
-     * - from printer on startup:
-     * {SYS:STARTED}{VER:29}{SYS:STARTED}{R:UD}
-     */
-
-    // First report USB status.
-    update_usb_status(false);
-
-    // now drain commands...
-    while (LCD_SERIAL.available())
-      parse_lcd_byte((byte)LCD_SERIAL.read());
-
-    #if ENABLED(SDSUPPORT)
-      // The way last printing status works is simple:
-      // The UI needs to see at least one TQ which is not 100%
-      // and then when the print is complete, one which is.
-      static uint8_t last_percent_done = 100;
-
-      // If there was a print in progress, we need to emit the final
-      // print status as {TQ:100}. Reset last percent done so a new print will
-      // issue a percent of 0.
-      const uint8_t percent_done = (ExtUI::isPrinting() || ExtUI::isPrintingFromMediaPaused()) ? ExtUI::getProgress_percent() : last_printing_status ? 100 : 0;
-      if (percent_done != last_percent_done) {
-        char message_buffer[16];
-        sprintf_P(message_buffer, PSTR("{TQ:%03i}"), percent_done);
-        write_to_lcd(message_buffer);
-        last_percent_done = percent_done;
-        last_printing_status = ExtUI::isPrinting();
-      }
-    #endif
-  }
-
-  void onPrinterKilled(PGM_P const error, PGM_P const component) {
-    set_lcd_error_P(error, component);
-  }
-
-  #if HAS_PID_HEATING
-
-    void onPidTuning(const result_t rst) {
-      // Called for temperature PID tuning result
-      //SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
-      switch (rst) {
-        case PID_BAD_EXTRUDER_NUM:
-          set_lcd_error_P(GET_TEXT(MSG_PID_BAD_EXTRUDER_NUM));
-          break;
-        case PID_TEMP_TOO_HIGH:
-          set_lcd_error_P(GET_TEXT(MSG_PID_TEMP_TOO_HIGH));
-          break;
-        case PID_TUNING_TIMEOUT:
-          set_lcd_error_P(GET_TEXT(MSG_PID_TIMEOUT));
-          break;
-        case PID_DONE:
-          set_lcd_error_P(GET_TEXT(MSG_PID_AUTOTUNE_DONE));
-          break;
-      }
-    }
-
-  #endif
-
-  void onPrintTimerStarted() { write_to_lcd_P(PSTR("{SYS:BUILD}")); }
-  void onPrintTimerPaused() {}
-  void onPrintTimerStopped() { write_to_lcd_P(PSTR("{TQ:100}")); }
-
-  // Not needed for Malyan LCD
-  void onStatusChanged(const char * const) {}
-  void onMediaInserted() {}
-  void onMediaError() {}
-  void onMediaRemoved() {}
-  void onPlayTone(const uint16_t, const uint16_t) {}
-  void onFilamentRunout(const extruder_t extruder) {}
-  void onUserConfirmRequired(const char * const) {}
-  void onHomingStart() {}
-  void onHomingComplete() {}
-  void onPrintFinished() {}
-  void onFactoryReset() {}
-  void onStoreSettings(char*) {}
-  void onLoadSettings(const char*) {}
-  void onPostprocessSettings() {}
-  void onConfigurationStoreWritten(bool) {}
-  void onConfigurationStoreRead(bool) {}
-
-  #if HAS_MESH
-    void onMeshLevelingStart() {}
-    void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {}
-    void onMeshUpdate(const int8_t xpos, const int8_t ypos, const ExtUI::probe_state_t state) {}
-  #endif
-
-  #if ENABLED(POWER_LOSS_RECOVERY)
-    void onPowerLossResume() {}
-  #endif
-
-  void onSteppersDisabled() {}
-  void onSteppersEnabled()  {}
-}
-
 #endif // MALYAN_LCD
diff --git a/Marlin/src/lcd/extui/malyan/malyan.h b/Marlin/src/lcd/extui/malyan/malyan.h
new file mode 100644
index 00000000000..e8afbd4a59b
--- /dev/null
+++ b/Marlin/src/lcd/extui/malyan/malyan.h
@@ -0,0 +1,53 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * lcd/extui/malyan/malyan.h
+ */
+
+#include "../../../HAL/shared/Marduino.h"
+
+// Track incoming command bytes from the LCD
+extern uint16_t inbound_count;
+
+// For sending print completion messages
+extern bool last_printing_status;
+
+void write_to_lcd_P(PGM_P const message);
+void write_to_lcd(const char * const message);
+
+void set_lcd_error_P(PGM_P const error, PGM_P const component=nullptr);
+
+void process_lcd_c_command(const char *command);
+void process_lcd_eb_command(const char *command);
+
+template<typename T>
+void j_move_axis(const char *command, const T axis);
+
+void process_lcd_j_command(const char *command);
+void process_lcd_p_command(const char *command);
+void process_lcd_s_command(const char *command);
+void process_lcd_command(const char *command);
+
+void parse_lcd_byte(const byte b);
+void update_usb_status(const bool forceUpdate);
diff --git a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
new file mode 100644
index 00000000000..5815522afca
--- /dev/null
+++ b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
@@ -0,0 +1,164 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * lcd/extui/malyan/malyan_extui.cpp
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(MALYAN_LCD)
+
+#include "../ui_api.h"
+#include "malyan.h"
+
+//#include "../../marlinui.h"
+//#include "../../../sd/cardreader.h"
+//#include "../../../module/temperature.h"
+//#include "../../../module/stepper.h"
+//#include "../../../module/motion.h"
+//#include "../../../libs/duration_t.h"
+//#include "../../../module/printcounter.h"
+//#include "../../../gcode/queue.h"
+
+namespace ExtUI {
+  void onStartup() {
+    /**
+     * The Malyan LCD actually runs as a separate MCU on Serial 1.
+     * This code's job is to siphon the weird curly-brace commands from
+     * it and translate into ExtUI operations where possible.
+     */
+    inbound_count = 0;
+
+    #ifndef LCD_BAUDRATE
+      #define LCD_BAUDRATE 500000
+    #endif
+    LCD_SERIAL.begin(LCD_BAUDRATE);
+
+    // Signal init
+    write_to_lcd_P(PSTR("{SYS:STARTED}\r\n"));
+
+    // send a version that says "unsupported"
+    write_to_lcd_P(PSTR("{VER:99}\r\n"));
+
+    // No idea why it does this twice.
+    write_to_lcd_P(PSTR("{SYS:STARTED}\r\n"));
+    update_usb_status(true);
+  }
+
+  void onIdle() {
+    /**
+     * - from printer on startup:
+     * {SYS:STARTED}{VER:29}{SYS:STARTED}{R:UD}
+     */
+
+    // First report USB status.
+    update_usb_status(false);
+
+    // now drain commands...
+    while (LCD_SERIAL.available())
+      parse_lcd_byte((byte)LCD_SERIAL.read());
+
+    #if ENABLED(SDSUPPORT)
+      // The way last printing status works is simple:
+      // The UI needs to see at least one TQ which is not 100%
+      // and then when the print is complete, one which is.
+      static uint8_t last_percent_done = 100;
+
+      // If there was a print in progress, we need to emit the final
+      // print status as {TQ:100}. Reset last percent done so a new print will
+      // issue a percent of 0.
+      const uint8_t percent_done = (ExtUI::isPrinting() || ExtUI::isPrintingFromMediaPaused()) ? ExtUI::getProgress_percent() : last_printing_status ? 100 : 0;
+      if (percent_done != last_percent_done) {
+        char message_buffer[16];
+        sprintf_P(message_buffer, PSTR("{TQ:%03i}"), percent_done);
+        write_to_lcd(message_buffer);
+        last_percent_done = percent_done;
+        last_printing_status = ExtUI::isPrinting();
+      }
+    #endif
+  }
+
+  void onPrinterKilled(PGM_P const error, PGM_P const component) {
+    set_lcd_error_P(error, component);
+  }
+
+  #if HAS_PID_HEATING
+
+    void onPidTuning(const result_t rst) {
+      // Called for temperature PID tuning result
+      //SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
+      switch (rst) {
+        case PID_BAD_EXTRUDER_NUM:
+          set_lcd_error_P(GET_TEXT(MSG_PID_BAD_EXTRUDER_NUM));
+          break;
+        case PID_TEMP_TOO_HIGH:
+          set_lcd_error_P(GET_TEXT(MSG_PID_TEMP_TOO_HIGH));
+          break;
+        case PID_TUNING_TIMEOUT:
+          set_lcd_error_P(GET_TEXT(MSG_PID_TIMEOUT));
+          break;
+        case PID_DONE:
+          set_lcd_error_P(GET_TEXT(MSG_PID_AUTOTUNE_DONE));
+          break;
+      }
+    }
+
+  #endif
+
+  void onPrintTimerStarted() { write_to_lcd_P(PSTR("{SYS:BUILD}")); }
+  void onPrintTimerPaused() {}
+  void onPrintTimerStopped() { write_to_lcd_P(PSTR("{TQ:100}")); }
+
+  // Not needed for Malyan LCD
+  void onStatusChanged(const char * const) {}
+  void onMediaInserted() {}
+  void onMediaError() {}
+  void onMediaRemoved() {}
+  void onPlayTone(const uint16_t, const uint16_t) {}
+  void onFilamentRunout(const extruder_t extruder) {}
+  void onUserConfirmRequired(const char * const) {}
+  void onHomingStart() {}
+  void onHomingComplete() {}
+  void onPrintFinished() {}
+  void onFactoryReset() {}
+  void onStoreSettings(char*) {}
+  void onLoadSettings(const char*) {}
+  void onPostprocessSettings() {}
+  void onConfigurationStoreWritten(bool) {}
+  void onConfigurationStoreRead(bool) {}
+
+  #if HAS_MESH
+    void onMeshLevelingStart() {}
+    void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {}
+    void onMeshUpdate(const int8_t xpos, const int8_t ypos, const ExtUI::probe_state_t state) {}
+  #endif
+
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    void onPowerLossResume() {}
+  #endif
+
+  void onSteppersDisabled() {}
+  void onSteppersEnabled()  {}
+}
+
+#endif // MALYAN_LCD
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/SPIFlashStorage.cpp b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/SPIFlashStorage.cpp
rename to Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
index 3ad1ac2bb1b..5f5608472c7 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/SPIFlashStorage.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
@@ -20,11 +20,11 @@
  *
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 #include "SPIFlashStorage.h"
 
 extern W25QXXFlash W25QXX;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/SPIFlashStorage.h b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/SPIFlashStorage.h
rename to Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h
index 113814d6c8e..f2ce8e44bac 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/SPIFlashStorage.h
+++ b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#include "../../../../libs/W25Qxx.h"
+#include "../../../libs/W25Qxx.h"
 
 #define HAS_SPI_FLASH_COMPRESSION 1
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/SPI_TFT.cpp b/Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/SPI_TFT.cpp
rename to Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp
index 76a4de35618..68e4d9de042 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/SPI_TFT.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -28,7 +28,7 @@
 #include "pic_manager.h"
 #include "tft_lvgl_configuration.h"
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #include <SPI.h>
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/SPI_TFT.h b/Marlin/src/lcd/extui/mks_ui/SPI_TFT.h
similarity index 90%
rename from Marlin/src/lcd/extui/lib/mks_ui/SPI_TFT.h
rename to Marlin/src/lcd/extui/mks_ui/SPI_TFT.h
index f3be3dc0baa..62a084fb119 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/SPI_TFT.h
+++ b/Marlin/src/lcd/extui/mks_ui/SPI_TFT.h
@@ -21,11 +21,8 @@
  */
 #pragma once
 
-#include "../../../../inc/MarlinConfigPre.h"
-
-#if HAS_TFT_LVGL_UI
-
-#include "../../../tft_io/tft_io.h"
+#include "../../tft_io/tft_io.h"
+#include <stdint.h>
 
 class TFT {
 public:
@@ -39,5 +36,3 @@ public:
 };
 
 extern TFT SPI_TFT;
-
-#endif // HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_about.cpp b/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_about.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_about.cpp
index a57dfc504b0..54a8ede64e0 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_about.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_about.h b/Marlin/src/lcd/extui/mks_ui/draw_about.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_about.h
rename to Marlin/src/lcd/extui/mks_ui/draw_about.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
index 8137c3a909b..22196a28b8f 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_advance_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_advance_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
index feefc4107c9..a564d86cc10 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_advance_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_advance_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_advance_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_advance_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_auto_level_offset_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_auto_level_offset_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
index 3de078f3757..d52abcff23b 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_auto_level_offset_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_BED_PROBE)
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/probe.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/probe.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_auto_level_offset_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_auto_level_offset_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_baby_stepping.cpp b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_baby_stepping.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
index 1e268c9e826..312353f47ed 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_baby_stepping.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
@@ -19,23 +19,23 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../gcode/queue.h"
-#include "../../../../gcode/gcode.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../gcode/queue.h"
+#include "../../../gcode/gcode.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(EEPROM_SETTINGS)
-  #include "../../../../module/settings.h"
+  #include "../../../module/settings.h"
 #endif
 
 #if HAS_BED_PROBE
-  #include "../../../../module/probe.h"
+  #include "../../../module/probe.h"
 #endif
 
 extern lv_group_t *g;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_baby_stepping.h b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_baby_stepping.h
rename to Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_change_speed.cpp b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_change_speed.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
index 635625950b3..645cd2e6e3c 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_change_speed.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_change_speed.h b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_change_speed.h
rename to Marlin/src/lcd/extui/mks_ui/draw_change_speed.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_cloud_bind.cpp b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_cloud_bind.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
index c6752939dde..55cfe4491d4 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_cloud_bind.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
 
 #include "lv_conf.h"
 #include "draw_ui.h"
 
-#include "../../../../MarlinCore.h"
-#include "../../../../module/temperature.h"
+#include "../../../MarlinCore.h"
+#include "../../../module/temperature.h"
 
 #include "QR_Encode.h"
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_cloud_bind.h b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_cloud_bind.h
rename to Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.cpp b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
index b4ebc97db3e..ff642be2940 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
@@ -24,34 +24,34 @@
  * draw_dialog.cpp
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../sd/cardreader.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../module/temperature.h"
-#include "../../../../module/planner.h"
-#include "../../../../gcode/gcode.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../sd/cardreader.h"
+#include "../../../gcode/queue.h"
+#include "../../../module/temperature.h"
+#include "../../../module/planner.h"
+#include "../../../gcode/gcode.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(EEPROM_SETTINGS)
-  #include "../../../../module/settings.h"
+  #include "../../../module/settings.h"
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 #if ENABLED(PARK_HEAD_ON_PAUSE)
-  #include "../../../../feature/pause.h"
+  #include "../../../feature/pause.h"
 #endif
 
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
-  #include "../../../tft_io/touch_calibration.h"
+  #include "../../tft_io/touch_calibration.h"
   #include "draw_touch_calibration.h"
 #endif
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.h b/Marlin/src/lcd/extui/mks_ui/draw_dialog.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.h
rename to Marlin/src/lcd/extui/mks_ui/draw_dialog.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_eeprom_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_eeprom_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
index 15e319f4a69..b96c65e5478 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_eeprom_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_eeprom_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_eeprom_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_encoder_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_encoder_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
index e090c6a3b59..4c56205465c 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_encoder_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if BUTTONS_EXIST(EN1, EN2)
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_encoder_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_encoder_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.cpp b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
index bdae725cbb2..3297b9da277 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -30,7 +30,7 @@
 
 #include "SPI_TFT.h"
 #include "mks_hardware_test.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 static lv_obj_t *scr;
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.h b/Marlin/src/lcd/extui/mks_ui/draw_error_message.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.h
rename to Marlin/src/lcd/extui/mks_ui/draw_error_message.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_extrusion.cpp b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_extrusion.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
index 77ec61c4b7d..d070d249f39 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_extrusion.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
@@ -19,16 +19,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/temperature.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/temperature.h"
+#include "../../../gcode/queue.h"
+#include "../../../inc/MarlinConfig.h"
 
 static lv_obj_t *scr;
 extern lv_group_t *g;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_extrusion.h b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_extrusion.h
rename to Marlin/src/lcd/extui/mks_ui/draw_extrusion.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_fan.cpp b/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_fan.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
index 700471b4a30..ce804e615dd 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_fan.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
@@ -19,17 +19,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/temperature.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../gcode/gcode.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/temperature.h"
+#include "../../../gcode/queue.h"
+#include "../../../gcode/gcode.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr, *fanText;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_fan.h b/Marlin/src/lcd/extui/mks_ui/draw_fan.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_fan.h
rename to Marlin/src/lcd/extui/mks_ui/draw_fan.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_filament_change.cpp b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_filament_change.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
index e3cfde30116..a3da638be62 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_filament_change.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
@@ -19,18 +19,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/temperature.h"
-#include "../../../../gcode/gcode.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/temperature.h"
+#include "../../../gcode/gcode.h"
+#include "../../../module/motion.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_filament_change.h b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_filament_change.h
rename to Marlin/src/lcd/extui/mks_ui/draw_filament_change.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_filament_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_filament_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
index d78c9ed0cb1..97680f3a0cb 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_filament_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_filament_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_filament_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_filament_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_gcode.cpp b/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_gcode.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
index 17c625b7010..bded5df7e7f 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_gcode.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr,*outL,*outV = 0;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_gcode.h b/Marlin/src/lcd/extui/mks_ui/draw_gcode.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_gcode.h
rename to Marlin/src/lcd/extui/mks_ui/draw_gcode.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_home.cpp b/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_home.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_home.cpp
index 588b940bb64..447fadd55dc 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_home.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -28,8 +28,8 @@
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../gcode/queue.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../gcode/queue.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_home.h b/Marlin/src/lcd/extui/mks_ui/draw_home.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_home.h
rename to Marlin/src/lcd/extui/mks_ui/draw_home.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_homing_sensitivity_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_homing_sensitivity_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
index 696463d3ebb..e1ab58ee7bc 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_homing_sensitivity_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
@@ -19,17 +19,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if HAS_TFT_LVGL_UI && USE_SENSORLESS
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../module/probe.h"
-#include "../../../../module/stepper/indirection.h"
-#include "../../../../feature/tmc_util.h"
+#include "../../../module/planner.h"
+#include "../../../module/probe.h"
+#include "../../../module/stepper/indirection.h"
+#include "../../../feature/tmc_util.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_homing_sensitivity_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_homing_sensitivity_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_jerk_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_jerk_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
index 4067262f200..8a97e304674 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_jerk_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_CLASSIC_JERK)
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_jerk_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_jerk_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_keyboard.cpp b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_keyboard.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
index 3572991813a..671939cbff9 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_keyboard.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
-#include "../../../../gcode/queue.h"
+#include "../../../inc/MarlinConfig.h"
+#include "../../../gcode/queue.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_keyboard.h b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_keyboard.h
rename to Marlin/src/lcd/extui/mks_ui/draw_keyboard.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_language.cpp b/Marlin/src/lcd/extui/mks_ui/draw_language.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_language.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_language.cpp
index 5953d041840..3db22583aae 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_language.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_language.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 #include <string.h>
 
 enum {
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_language.h b/Marlin/src/lcd/extui/mks_ui/draw_language.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_language.h
rename to Marlin/src/lcd/extui/mks_ui/draw_language.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_level_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_level_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
index 015c95a68f3..8c8dec89138 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_level_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_level_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_level_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_level_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_machine_para.cpp b/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_machine_para.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
index 971ea8a69e0..890db3b5cd0 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_machine_para.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_machine_para.h b/Marlin/src/lcd/extui/mks_ui/draw_machine_para.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_machine_para.h
rename to Marlin/src/lcd/extui/mks_ui/draw_machine_para.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_machine_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_machine_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
index b79605d74fc..3f43da992ca 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_machine_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_machine_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_machine_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_machine_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_manuaLevel.cpp b/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_manuaLevel.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp
index f25c7c0c257..b927b99b76f 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_manuaLevel.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../gcode/queue.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../gcode/queue.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern const char G28_STR[];
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_manuaLevel.h b/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_manuaLevel.h
rename to Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_max_feedrate_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_max_feedrate_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
index 238a9af6ae9..2cccf899b45 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_max_feedrate_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_max_feedrate_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_max_feedrate_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_media_select.cpp b/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_media_select.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp
index 6dc816cc234..6fa5cefef0a 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_media_select.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, MULTI_VOLUME)
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
-#include "../../../../sd/cardreader.h"
+#include "../../../inc/MarlinConfig.h"
+#include "../../../sd/cardreader.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_media_select.h b/Marlin/src/lcd/extui/mks_ui/draw_media_select.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_media_select.h
rename to Marlin/src/lcd/extui/mks_ui/draw_media_select.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_more.cpp b/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_more.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_more.cpp
index 1eb54d231e9..d6f1c9ccca0 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_more.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
@@ -19,16 +19,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
-#include "../../../../MarlinCore.h"
+#include "../../../MarlinCore.h"
 #include "draw_ready_print.h"
 #include "draw_set.h"
 #include "lv_conf.h"
 #include "draw_ui.h"
-#include "../../../../gcode/queue.h"
+#include "../../../gcode/queue.h"
 
 extern lv_group_t * g;
 static lv_obj_t * scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_more.h b/Marlin/src/lcd/extui/mks_ui/draw_more.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_more.h
rename to Marlin/src/lcd/extui/mks_ui/draw_more.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_motor_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_motor_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
index ec948f10be8..b86370e35a4 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_motor_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_motor_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_motor_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_motor_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_move_motor.cpp b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_move_motor.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
index 34c71613000..4b413c5c621 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_move_motor.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
@@ -19,16 +19,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../gcode/queue.h"
-#include "../../../../module/motion.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../gcode/queue.h"
+#include "../../../module/motion.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_move_motor.h b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_move_motor.h
rename to Marlin/src/lcd/extui/mks_ui/draw_move_motor.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.cpp b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
index 70e1bba9909..ae770a8925c 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
@@ -19,29 +19,29 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../gcode/gcode.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../gcode/gcode.h"
+#include "../../../gcode/queue.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 #if HAS_TRINAMIC_CONFIG
-  #include "../../../../module/stepper/indirection.h"
-  #include "../../../../feature/tmc_util.h"
+  #include "../../../module/stepper/indirection.h"
+  #include "../../../feature/tmc_util.h"
 #endif
 
 #if HAS_BED_PROBE
-  #include "../../../../module/probe.h"
+  #include "../../../module/probe.h"
 #endif
 
 extern lv_group_t *g;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.h b/Marlin/src/lcd/extui/mks_ui/draw_number_key.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.h
rename to Marlin/src/lcd/extui/mks_ui/draw_number_key.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_operation.cpp b/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_operation.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
index cd77db8ae18..9b87df1fdfe 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_operation.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
@@ -19,17 +19,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../sd/cardreader.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/temperature.h"
+#include "../../../module/motion.h"
+#include "../../../sd/cardreader.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_operation.h b/Marlin/src/lcd/extui/mks_ui/draw_operation.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_operation.h
rename to Marlin/src/lcd/extui/mks_ui/draw_operation.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_pause_message.cpp b/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_pause_message.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp
index 3eb717b7123..608b3366b19 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_pause_message.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, ADVANCED_PAUSE_FEATURE)
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../feature/pause.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../feature/pause.h"
+#include "../../../inc/MarlinConfig.h"
 
 void lv_draw_pause_message(const PauseMessage msg) {
   switch (msg) {
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_pause_message.h b/Marlin/src/lcd/extui/mks_ui/draw_pause_message.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_pause_message.h
rename to Marlin/src/lcd/extui/mks_ui/draw_pause_message.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_pause_position.cpp b/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_pause_position.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
index 2f60bc66859..771a98c11fd 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_pause_position.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_pause_position.h b/Marlin/src/lcd/extui/mks_ui/draw_pause_position.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_pause_position.h
rename to Marlin/src/lcd/extui/mks_ui/draw_pause_position.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_preHeat.cpp b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_preHeat.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
index 5fcfec15345..54f09177741 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_preHeat.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/temperature.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/temperature.h"
+#include "../../../inc/MarlinConfig.h"
 
 static lv_obj_t *scr;
 extern lv_group_t*  g;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_preHeat.h b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_preHeat.h
rename to Marlin/src/lcd/extui/mks_ui/draw_preHeat.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.cpp b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
index 17f5d95d2ae..6b973241fe1 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -30,8 +30,8 @@
 //#include "../lvgl/src/lv_core/lv_disp.h"
 //#include "../lvgl/src/lv_core/lv_refr.h"
 
-#include "../../../../sd/cardreader.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../sd/cardreader.h"
+#include "../../../inc/MarlinConfig.h"
 
 static lv_obj_t *scr;
 extern lv_group_t*  g;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.h b/Marlin/src/lcd/extui/mks_ui/draw_print_file.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.h
rename to Marlin/src/lcd/extui/mks_ui/draw_print_file.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_printing.cpp b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_printing.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
index f752d605ede..c9172d5887d 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_printing.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
@@ -19,27 +19,27 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../MarlinCore.h" // for marlin_state
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../sd/cardreader.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../gcode/gcode.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../MarlinCore.h" // for marlin_state
+#include "../../../module/temperature.h"
+#include "../../../module/motion.h"
+#include "../../../sd/cardreader.h"
+#include "../../../gcode/queue.h"
+#include "../../../gcode/gcode.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 #if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
-  #include "../../../marlinui.h"
+  #include "../../marlinui.h"
 #endif
 
 extern lv_group_t *g;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_printing.h b/Marlin/src/lcd/extui/mks_ui/draw_printing.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_printing.h
rename to Marlin/src/lcd/extui/mks_ui/draw_printing.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_ready_print.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_ready_print.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
index 26cd55d7f5f..18f125b57d3 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_ready_print.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -32,11 +32,11 @@
 
 #include <lvgl.h>
 
-#include "../../../../module/temperature.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/temperature.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
-  #include "../../../tft_io/touch_calibration.h"
+  #include "../../tft_io/touch_calibration.h"
   #include "draw_touch_calibration.h"
 #endif
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_ready_print.h b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_ready_print.h
rename to Marlin/src/lcd/extui/mks_ui/draw_ready_print.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_set.cpp b/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_set.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_set.cpp
index 6b06793f281..a765d0e58ab 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_set.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -30,11 +30,11 @@
 
 #include "pic_manager.h"
 
-#include "../../../../gcode/queue.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../gcode/queue.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if HAS_SUICIDE
-  #include "../../../../MarlinCore.h"
+  #include "../../../MarlinCore.h"
 #endif
 
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_set.h b/Marlin/src/lcd/extui/mks_ui/draw_set.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_set.h
rename to Marlin/src/lcd/extui/mks_ui/draw_set.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_step_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_step_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
index f48d533691e..d4ab028eec1 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_step_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_step_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_step_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_step_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_step_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
index 7c0fc97c931..5117bd4802f 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
@@ -19,16 +19,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_TRINAMIC_CONFIG)
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/stepper/indirection.h"
-#include "../../../../feature/tmc_util.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/stepper/indirection.h"
+#include "../../../feature/tmc_util.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
index 08d442f8a36..b0f55a1d45c 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
@@ -19,19 +19,19 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_STEALTHCHOP)
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/stepper/indirection.h"
-#include "../../../../feature/tmc_util.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/stepper/indirection.h"
+#include "../../../feature/tmc_util.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(EEPROM_SETTINGS)
-  #include "../../../../module/settings.h"
+  #include "../../../module/settings.h"
 #endif
 
 extern lv_group_t *g;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tool.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tool.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
index 8e9e5d59fa1..16c1448b3ca 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_tool.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
@@ -19,16 +19,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../gcode/queue.h"
-#include "../../../../module/temperature.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../gcode/queue.h"
+#include "../../../module/temperature.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tool.h b/Marlin/src/lcd/extui/mks_ui/draw_tool.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tool.h
rename to Marlin/src/lcd/extui/mks_ui/draw_tool.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.cpp b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
index 8b9371fbe79..a4470a4c877 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, TOUCH_SCREEN_CALIBRATION)
 
@@ -27,8 +27,8 @@
 #include "draw_touch_calibration.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
-#include "../../../tft_io/touch_calibration.h"
+#include "../../../inc/MarlinConfig.h"
+#include "../../tft_io/touch_calibration.h"
 #include "SPI_TFT.h"
 
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.h b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.h
rename to Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tramming_pos_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tramming_pos_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
index c87de7caa0b..c4a21542e2a 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_tramming_pos_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tramming_pos_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tramming_pos_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index 0a99df08e5a..c5ae77dd616 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -34,18 +34,18 @@
 
 #include <SPI.h>
 
-#include "../../../../MarlinCore.h" // for marlin_state
-#include "../../../../sd/cardreader.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../MarlinCore.h" // for marlin_state
+#include "../../../sd/cardreader.h"
+#include "../../../module/motion.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 #if ENABLED(PARK_HEAD_ON_PAUSE)
-  #include "../../../../feature/pause.h"
+  #include "../../../feature/pause.h"
 #endif
 
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.h b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_ui.h
rename to Marlin/src/lcd/extui/mks_ui/draw_ui.h
index 2809e4e9379..37b19ebd46b 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
@@ -79,7 +79,7 @@
 #include "draw_media_select.h"
 #include "draw_encoder_settings.h"
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(MKS_WIFI_MODULE)
   #include "wifiSerial.h"
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
index fe22923b441..34b2abd0945 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi.h b/Marlin/src/lcd/extui/mks_ui/draw_wifi.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi.h
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_list.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_list.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp
index bda6306e6c0..2c3957fe9c9 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_list.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_list.h b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_list.h
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
index fd2c6467e77..8509cc3ac1e 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_tips.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_tips.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
index 3db89a87c96..c337d189223 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_tips.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_tips.h b/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_tips.h
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/gb2312_puhui16.cpp b/Marlin/src/lcd/extui/mks_ui/gb2312_puhui16.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/gb2312_puhui16.cpp
rename to Marlin/src/lcd/extui/mks_ui/gb2312_puhui16.cpp
index f3585cc6cb5..b1f0e0e1bb9 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/gb2312_puhui16.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/gb2312_puhui16.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "pic_manager.h"
 #include <lvgl.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if HAS_SPI_FLASH_FONT
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/irq_overrid.cpp b/Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/lib/mks_ui/irq_overrid.cpp
rename to Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp
index 98b4aff881c..df48cbec0ac 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/irq_overrid.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -36,7 +36,7 @@
 #include <libmaple/usart.h>
 #include <libmaple/ring_buffer.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #ifdef __cplusplus
   extern "C" { /* C-declarations for C++ */
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/mks_hardware_test.cpp b/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/mks_hardware_test.cpp
rename to Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp
index 8cbe319d147..bcb3cdb6a27 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/mks_hardware_test.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -32,9 +32,9 @@
 #include "pic_manager.h"
 #include <lvgl.h>
 
-#include "../../../../MarlinCore.h"
-#include "../../../../module/temperature.h"
-#include "../../../../sd/cardreader.h"
+#include "../../../MarlinCore.h"
+#include "../../../module/temperature.h"
+#include "../../../sd/cardreader.h"
 
 uint8_t pw_det_sta, pw_off_sta, mt_det_sta, mt_det3_sta;
 #if PIN_EXISTS(MT_DET_2)
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/mks_hardware_test.h b/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/mks_hardware_test.h
rename to Marlin/src/lcd/extui/mks_ui/mks_hardware_test.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/pic_manager.cpp b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/pic_manager.cpp
rename to Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
index 9318b50d2bc..da7b1929cec 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/pic_manager.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -30,10 +30,10 @@
 #include "mks_hardware_test.h"
 
 #include "SPIFlashStorage.h"
-#include "../../../../libs/W25Qxx.h"
+#include "../../../libs/W25Qxx.h"
 
-#include "../../../../sd/cardreader.h"
-#include "../../../../MarlinCore.h"
+#include "../../../sd/cardreader.h"
+#include "../../../MarlinCore.h"
 
 extern uint16_t DeviceCode;
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/pic_manager.h b/Marlin/src/lcd/extui/mks_ui/pic_manager.h
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/pic_manager.h
rename to Marlin/src/lcd/extui/mks_ui/pic_manager.h
index e9960fc73aa..90e2407ab05 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/pic_manager.h
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.h
@@ -21,9 +21,9 @@
  */
 #pragma once
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
-#include "../../../../libs/W25Qxx.h"
+#include "../../../libs/W25Qxx.h"
 
 #include <lvgl.h>
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/printer_operation.cpp b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/printer_operation.cpp
rename to Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
index 03bcf228226..b618a01957e 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/printer_operation.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
@@ -19,23 +19,23 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../gcode/gcode.h"
-#include "../../../../module/planner.h"
-#include "../../../../module/motion.h"
-#include "../../../../sd/cardreader.h"
-#include "../../../../inc/MarlinConfig.h"
-#include "../../../../MarlinCore.h"
-#include "../../../../gcode/queue.h"
+#include "../../../gcode/gcode.h"
+#include "../../../module/planner.h"
+#include "../../../module/motion.h"
+#include "../../../sd/cardreader.h"
+#include "../../../inc/MarlinConfig.h"
+#include "../../../MarlinCore.h"
+#include "../../../gcode/queue.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 extern uint32_t To_pre_view;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/printer_operation.h b/Marlin/src/lcd/extui/mks_ui/printer_operation.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/printer_operation.h
rename to Marlin/src/lcd/extui/mks_ui/printer_operation.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_Language_en.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_Language_en.h
rename to Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_Language_fr.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_fr.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_Language_fr.h
rename to Marlin/src/lcd/extui/mks_ui/tft_Language_fr.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_Language_it.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_it.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_Language_it.h
rename to Marlin/src/lcd/extui/mks_ui/tft_Language_it.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_Language_ru.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_Language_ru.h
rename to Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_Language_s_cn.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_s_cn.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_Language_s_cn.h
rename to Marlin/src/lcd/extui/mks_ui/tft_Language_s_cn.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_Language_sp.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_Language_sp.h
rename to Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_Language_t_cn.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_t_cn.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_Language_t_cn.h
rename to Marlin/src/lcd/extui/mks_ui/tft_Language_t_cn.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp
rename to Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index f54b290c13e..84e3040e84e 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -34,19 +34,19 @@
 #include "SPIFlashStorage.h"
 #include <lvgl.h>
 
-#include "../../../../MarlinCore.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../MarlinCore.h"
+#include "../../../inc/MarlinConfig.h"
 
-#include HAL_PATH(../../../../HAL, tft/xpt2046.h)
-#include "../../../marlinui.h"
+#include HAL_PATH(../../../HAL, tft/xpt2046.h)
+#include "../../marlinui.h"
 XPT2046 touch;
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
-  #include "../../../tft_io/touch_calibration.h"
+  #include "../../tft_io/touch_calibration.h"
   #include "draw_touch_calibration.h"
 #endif
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.h b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.h
rename to Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
index 308162b7996..49f6ea0900f 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * @file lcd/extui/lib/mks_ui/tft_lvgl_configuration.h
+ * @file lcd/extui/mks_ui/tft_lvgl_configuration.h
  * @date 2020-02-21
  */
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_multi_language.cpp b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_multi_language.cpp
rename to Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
index 5e37acb2b4d..b34942303a8 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/tft_multi_language.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_multi_language.h b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_multi_language.h
rename to Marlin/src/lcd/extui/mks_ui/tft_multi_language.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/wifiSerial.cpp b/Marlin/src/lcd/extui/mks_ui/wifiSerial.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/wifiSerial.cpp
rename to Marlin/src/lcd/extui/mks_ui/wifiSerial.cpp
index 9e528821d7c..d00fd269d82 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/wifiSerial.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -36,7 +36,7 @@
 #include <libmaple/usart.h>
 #include <libmaple/ring_buffer.h>
 
-#include "../../../../MarlinCore.h"
+#include "../../../MarlinCore.h"
 
 DEFINE_WFSERIAL(WifiSerial1, 1);
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/wifiSerial.h b/Marlin/src/lcd/extui/mks_ui/wifiSerial.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/wifiSerial.h
rename to Marlin/src/lcd/extui/mks_ui/wifiSerial.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/wifi_module.cpp
rename to Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index 4dd092e64bb..897137d013b 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
 
@@ -28,24 +28,24 @@
 #include "wifi_upload.h"
 #include "SPI_TFT.h"
 
-#include "../../../../MarlinCore.h"
-#include "../../../../module/temperature.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../gcode/gcode.h"
-#include "../../../../lcd/marlinui.h"
-#include "../../../../sd/cardreader.h"
-#include "../../../../module/planner.h"
-#include "../../../../module/servo.h"
-#include "../../../../module/probe.h"
+#include "../../../MarlinCore.h"
+#include "../../../module/temperature.h"
+#include "../../../gcode/queue.h"
+#include "../../../gcode/gcode.h"
+#include "../../../lcd/marlinui.h"
+#include "../../../sd/cardreader.h"
+#include "../../../module/planner.h"
+#include "../../../module/servo.h"
+#include "../../../module/probe.h"
 
 #if DISABLED(EMERGENCY_PARSER)
-  #include "../../../../module/motion.h"
+  #include "../../../module/motion.h"
 #endif
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 #if ENABLED(PARK_HEAD_ON_PAUSE)
-  #include "../../../../feature/pause.h"
+  #include "../../../feature/pause.h"
 #endif
 
 #define WIFI_SET()        WRITE(WIFI_RESET_PIN, HIGH);
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/wifi_module.h b/Marlin/src/lcd/extui/mks_ui/wifi_module.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/wifi_module.h
rename to Marlin/src/lcd/extui/mks_ui/wifi_module.h
index 0886641b2d2..8f646134179 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/wifi_module.h
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.h
@@ -25,7 +25,7 @@
   extern "C" { /* C-declarations for C++ */
 #endif
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #include <math.h>
 #include <stdio.h>
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.cpp
rename to Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
index e41d473c11b..cb5bb762d0d 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
 
@@ -27,8 +27,8 @@
 #include "wifi_module.h"
 #include "wifi_upload.h"
 
-#include "../../../../MarlinCore.h"
-#include "../../../../sd/cardreader.h"
+#include "../../../MarlinCore.h"
+#include "../../../sd/cardreader.h"
 
 #define WIFI_SET()        WRITE(WIFI_RESET_PIN, HIGH);
 #define WIFI_RESET()      WRITE(WIFI_RESET_PIN, LOW);
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.h b/Marlin/src/lcd/extui/mks_ui/wifi_upload.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.h
rename to Marlin/src/lcd/extui/mks_ui/wifi_upload.h
diff --git a/Marlin/src/lcd/extui/lib/nextion/FileNavigator.cpp b/Marlin/src/lcd/extui/nextion/FileNavigator.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/nextion/FileNavigator.cpp
rename to Marlin/src/lcd/extui/nextion/FileNavigator.cpp
index f82ce1f091f..650bbd6645d 100644
--- a/Marlin/src/lcd/extui/lib/nextion/FileNavigator.cpp
+++ b/Marlin/src/lcd/extui/nextion/FileNavigator.cpp
@@ -21,13 +21,13 @@
  */
 
 /* ****************************************
- * lcd/extui/lib/nextion/FileNavigator.cpp
+ * lcd/extui/nextion/FileNavigator.cpp
  * ****************************************
  * Extensible_UI implementation for Nextion
  * https://github.com/Skorpi08
  * ***************************************/
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(NEXTION_TFT)
 
@@ -37,7 +37,7 @@
 using namespace ExtUI;
 
 #define DEBUG_OUT NEXDEBUGLEVEL
-#include "../../../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 FileList  FileNavigator::filelist;                          // Instance of the Marlin file API
 char      FileNavigator::currentfoldername[MAX_PATH_LEN];   // Current folder path
diff --git a/Marlin/src/lcd/extui/lib/nextion/FileNavigator.h b/Marlin/src/lcd/extui/nextion/FileNavigator.h
similarity index 95%
rename from Marlin/src/lcd/extui/lib/nextion/FileNavigator.h
rename to Marlin/src/lcd/extui/nextion/FileNavigator.h
index 1cd29ec6712..fd29bceadea 100644
--- a/Marlin/src/lcd/extui/lib/nextion/FileNavigator.h
+++ b/Marlin/src/lcd/extui/nextion/FileNavigator.h
@@ -22,14 +22,14 @@
 #pragma once
 
 /* ****************************************
- * lcd/extui/lib/nextion/FileNavigator.cpp
+ * lcd/extui/nextion/FileNavigator.cpp
  * ****************************************
  * Extensible_UI implementation for Nextion
  * https://github.com/Skorpi08
  * ***************************************/
 
 #include "nextion_tft_defs.h" // for MAX_PATH_LEN
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
 using namespace ExtUI;
 
diff --git a/Marlin/src/lcd/extui/nextion_lcd.cpp b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/nextion_lcd.cpp
rename to Marlin/src/lcd/extui/nextion/nextion_extui.cpp
diff --git a/Marlin/src/lcd/extui/lib/nextion/nextion_tft.cpp b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/nextion/nextion_tft.cpp
rename to Marlin/src/lcd/extui/nextion/nextion_tft.cpp
index 6272d589701..35a5bb7c683 100644
--- a/Marlin/src/lcd/extui/lib/nextion/nextion_tft.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
@@ -21,26 +21,26 @@
  */
 
 /* ****************************************
- * lcd/extui/lib/nextion/nextion_tft.h
+ * lcd/extui/nextion/nextion_tft.h
  * ****************************************
  * Extensible_UI implementation for Nextion
  * https://github.com/Skorpi08
  * ***************************************/
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(NEXTION_TFT)
 
-#include "../../../../MarlinCore.h"
-#include "../../../../feature/pause.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../libs/numtostr.h"
-#include "../../../../sd/cardreader.h"
+#include "../../../MarlinCore.h"
+#include "../../../feature/pause.h"
+#include "../../../gcode/queue.h"
+#include "../../../libs/numtostr.h"
+#include "../../../sd/cardreader.h"
 #include "FileNavigator.h"
 #include "nextion_tft.h"
 
 #define DEBUG_OUT NEXDEBUGLEVEL
-#include "../../../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 char NextionTFT::selectedfile[MAX_PATH_LEN];
 char NextionTFT::nextion_command[MAX_CMND_LEN];
diff --git a/Marlin/src/lcd/extui/lib/nextion/nextion_tft.h b/Marlin/src/lcd/extui/nextion/nextion_tft.h
similarity index 94%
rename from Marlin/src/lcd/extui/lib/nextion/nextion_tft.h
rename to Marlin/src/lcd/extui/nextion/nextion_tft.h
index 9197fcc2c63..4eb5fbe0b7f 100644
--- a/Marlin/src/lcd/extui/lib/nextion/nextion_tft.h
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.h
@@ -22,15 +22,15 @@
 #pragma once
 
 /* ****************************************
- * lcd/extui/lib/nextion/nextion_tft.h
+ * lcd/extui/nextion/nextion_tft.h
  * ****************************************
  * Extensible_UI implementation for Nextion
  * https://github.com/Skorpi08
  * ***************************************/
 
 #include "nextion_tft_defs.h"
-#include "../../../../inc/MarlinConfigPre.h"
-#include "../../ui_api.h"
+#include "../../../inc/MarlinConfigPre.h"
+#include "../ui_api.h"
 
 class NextionTFT {
   private:
diff --git a/Marlin/src/lcd/extui/lib/nextion/nextion_tft_defs.h b/Marlin/src/lcd/extui/nextion/nextion_tft_defs.h
similarity index 97%
rename from Marlin/src/lcd/extui/lib/nextion/nextion_tft_defs.h
rename to Marlin/src/lcd/extui/nextion/nextion_tft_defs.h
index 75f70fc9854..32d3ea32955 100644
--- a/Marlin/src/lcd/extui/lib/nextion/nextion_tft_defs.h
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft_defs.h
@@ -22,13 +22,13 @@
 #pragma once
 
 /* ****************************************
- * lcd/extui/lib/nextion/nextion_tft_defs.h
+ * lcd/extui/nextion/nextion_tft_defs.h
  * ****************************************
  * Extensible_UI implementation for Nextion
  * https://github.com/Skorpi08
  * ***************************************/
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 //#define NEXDEBUGLEVEL 255
 #if NEXDEBUGLEVEL
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 13c01954a06..07253c117ab 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -154,8 +154,8 @@
 #endif
 
 #if ENABLED(DGUS_LCD_UI_MKS)
-  #include "../lcd/extui/lib/dgus/DGUSScreenHandler.h"
-  #include "../lcd/extui/lib/dgus/DGUSDisplayDef.h"
+  #include "../lcd/extui/dgus/DGUSScreenHandler.h"
+  #include "../lcd/extui/dgus/DGUSDisplayDef.h"
 #endif
 
 #pragma pack(push, 1) // No padding between variables
diff --git a/ini/features.ini b/ini/features.ini
index 9d8bac5713a..db9dff9366e 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -12,7 +12,7 @@
 [features]
 YHCB2004                = red-scorp/LiquidCrystal_AIP31068@^1.0.4, red-scorp/SoftSPIB@^1.1.1
 HAS_TFT_LVGL_UI         = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/master.zip
-                          src_filter=+<src/lcd/extui/lib/mks_ui>
+                          src_filter=+<src/lcd/extui/mks_ui>
                           extra_scripts=download_mks_assets.py
 POSTMORTEM_DEBUGGING    = src_filter=+<src/HAL/shared/cpu_exception> +<src/HAL/shared/backtrace>
                           build_flags=-funwind-tables
@@ -73,17 +73,17 @@ HAS_MENU_TMC            = src_filter=+<src/lcd/menu/menu_tmc.cpp>
 HAS_MENU_TOUCH_SCREEN   = src_filter=+<src/lcd/menu/menu_touch_screen.cpp>
 HAS_MENU_TRAMMING       = src_filter=+<src/lcd/menu/menu_tramming.cpp>
 HAS_MENU_UBL            = src_filter=+<src/lcd/menu/menu_ubl.cpp>
-ANYCUBIC_LCD_CHIRON     = src_filter=+<src/lcd/extui/anycubic_chiron_lcd.cpp> +<src/lcd/extui/lib/anycubic_chiron>
-ANYCUBIC_LCD_I3MEGA     = src_filter=+<src/lcd/extui/anycubic_i3mega_lcd.cpp> +<src/lcd/extui/lib/anycubic_i3mega>
-NEXTION_TFT             = src_filter=+<src/lcd/extui/nextion_lcd.cpp> +<src/lcd/extui/lib/nextion>
-HAS_DGUS_LCD            = src_filter=+<src/lcd/extui/lib/dgus> +<src/lcd/extui/dgus_lcd.cpp>
-DGUS_LCD_UI_FYSETC      = src_filter=+<src/lcd/extui/lib/dgus/fysetc>
-DGUS_LCD_UI_HIPRECY     = src_filter=+<src/lcd/extui/lib/dgus/hiprecy>
-DGUS_LCD_UI_MKS         = src_filter=+<src/lcd/extui/lib/dgus/mks>
-DGUS_LCD_UI_ORIGIN      = src_filter=+<src/lcd/extui/lib/dgus/origin>
-TOUCH_UI_FTDI_EVE       = src_filter=+<src/lcd/extui/lib/ftdi_eve_touch_ui>
-EXTUI_EXAMPLE           = src_filter=+<src/lcd/extui/example.cpp>
-MALYAN_LCD              = src_filter=+<src/lcd/extui/malyan_lcd.cpp>
+ANYCUBIC_LCD_CHIRON     = src_filter=+<src/lcd/extui/anycubic_chiron>
+ANYCUBIC_LCD_I3MEGA     = src_filter=+<src/lcd/extui/anycubic_i3mega>
+HAS_DGUS_LCD            = src_filter=+<src/lcd/extui/dgus>
+DGUS_LCD_UI_FYSETC      = src_filter=+<src/lcd/extui/dgus/fysetc>
+DGUS_LCD_UI_HIPRECY     = src_filter=+<src/lcd/extui/dgus/hiprecy>
+DGUS_LCD_UI_MKS         = src_filter=+<src/lcd/extui/dgus/mks>
+DGUS_LCD_UI_ORIGIN      = src_filter=+<src/lcd/extui/dgus/origin>
+EXTUI_EXAMPLE           = src_filter=+<src/lcd/extui/example>
+TOUCH_UI_FTDI_EVE       = src_filter=+<src/lcd/extui/ftdi_eve_touch_ui>
+MALYAN_LCD              = src_filter=+<src/lcd/extui/malyan>
+NEXTION_TFT             = src_filter=+<src/lcd/extui/nextion>
 USE_UHS2_USB            = src_filter=+<src/sd/usb_flashdrive/lib-uhs2>
 USE_UHS3_USB            = src_filter=+<src/sd/usb_flashdrive/lib-uhs3>
 USB_FLASH_DRIVE_SUPPORT = src_filter=+<src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp>
diff --git a/platformio.ini b/platformio.ini
index bbc9ffd904b..e743eb2db45 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -70,15 +70,14 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/lcd/menu/menu_touch_screen.cpp>
   -<src/lcd/menu/menu_tramming.cpp>
   -<src/lcd/menu/menu_ubl.cpp>
-  -<src/lcd/extui/lib/mks_ui>
-  -<src/lcd/extui/lib/dgus> -<src/lcd/extui/dgus_lcd.cpp>
-  -<src/lcd/extui/lib/dgus/fysetc> -<src/lcd/extui/lib/dgus/hiprecy> -<src/lcd/extui/lib/dgus/mks> -<src/lcd/extui/lib/dgus/origin>
-  -<src/lcd/extui/example.cpp>
-  -<src/lcd/extui/malyan_lcd.cpp>
-  -<src/lcd/extui/lib/ftdi_eve_touch_ui>
-  -<src/lcd/extui/anycubic_chiron_lcd.cpp> -<src/lcd/extui/lib/anycubic_chiron>
-  -<src/lcd/extui/anycubic_i3mega_lcd.cpp> -<src/lcd/extui/lib/anycubic_i3mega>
-  -<src/lcd/extui/nextion_lcd.cpp> -<src/lcd/extui/lib/nextion>
+  -<src/lcd/extui/anycubic_chiron>
+  -<src/lcd/extui/anycubic_i3mega>
+  -<src/lcd/extui/dgus> -<src/lcd/extui/dgus/fysetc> -<src/lcd/extui/dgus/hiprecy> -<src/lcd/extui/dgus/mks> -<src/lcd/extui/dgus/origin>
+  -<src/lcd/extui/example>
+  -<src/lcd/extui/ftdi_eve_touch_ui>
+  -<src/lcd/extui/malyan>
+  -<src/lcd/extui/mks_ui>
+  -<src/lcd/extui/nextion>
   -<src/lcd/lcdprint.cpp>
   -<src/lcd/touch/touch_buttons.cpp>
   -<src/sd/usb_flashdrive/lib-uhs2> -<src/sd/usb_flashdrive/lib-uhs3>