diff --git a/Marlin/dogm_bitmaps.h b/Marlin/src/lcd/dogm/dogm_bitmaps.h
similarity index 100%
rename from Marlin/dogm_bitmaps.h
rename to Marlin/src/lcd/dogm/dogm_bitmaps.h
diff --git a/Marlin/dogm_font_data_6x9_marlin.h b/Marlin/src/lcd/dogm/dogm_font_data_6x9_marlin.h
similarity index 100%
rename from Marlin/dogm_font_data_6x9_marlin.h
rename to Marlin/src/lcd/dogm/dogm_font_data_6x9_marlin.h
diff --git a/Marlin/dogm_font_data_HD44780_C.h b/Marlin/src/lcd/dogm/dogm_font_data_HD44780_C.h
similarity index 100%
rename from Marlin/dogm_font_data_HD44780_C.h
rename to Marlin/src/lcd/dogm/dogm_font_data_HD44780_C.h
diff --git a/Marlin/dogm_font_data_HD44780_J.h b/Marlin/src/lcd/dogm/dogm_font_data_HD44780_J.h
similarity index 100%
rename from Marlin/dogm_font_data_HD44780_J.h
rename to Marlin/src/lcd/dogm/dogm_font_data_HD44780_J.h
diff --git a/Marlin/dogm_font_data_HD44780_W.h b/Marlin/src/lcd/dogm/dogm_font_data_HD44780_W.h
similarity index 100%
rename from Marlin/dogm_font_data_HD44780_W.h
rename to Marlin/src/lcd/dogm/dogm_font_data_HD44780_W.h
diff --git a/Marlin/dogm_font_data_ISO10646_1.h b/Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h
similarity index 100%
rename from Marlin/dogm_font_data_ISO10646_1.h
rename to Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h
diff --git a/Marlin/dogm_font_data_ISO10646_1_PL.h b/Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1_PL.h
similarity index 100%
rename from Marlin/dogm_font_data_ISO10646_1_PL.h
rename to Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1_PL.h
diff --git a/Marlin/dogm_font_data_ISO10646_1_tr.h b/Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1_tr.h
similarity index 100%
rename from Marlin/dogm_font_data_ISO10646_1_tr.h
rename to Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1_tr.h
diff --git a/Marlin/dogm_font_data_ISO10646_5_Cyrillic.h b/Marlin/src/lcd/dogm/dogm_font_data_ISO10646_5_Cyrillic.h
similarity index 100%
rename from Marlin/dogm_font_data_ISO10646_5_Cyrillic.h
rename to Marlin/src/lcd/dogm/dogm_font_data_ISO10646_5_Cyrillic.h
diff --git a/Marlin/dogm_font_data_ISO10646_CN.h b/Marlin/src/lcd/dogm/dogm_font_data_ISO10646_CN.h
similarity index 100%
rename from Marlin/dogm_font_data_ISO10646_CN.h
rename to Marlin/src/lcd/dogm/dogm_font_data_ISO10646_CN.h
diff --git a/Marlin/dogm_font_data_ISO10646_CZ.h b/Marlin/src/lcd/dogm/dogm_font_data_ISO10646_CZ.h
similarity index 100%
rename from Marlin/dogm_font_data_ISO10646_CZ.h
rename to Marlin/src/lcd/dogm/dogm_font_data_ISO10646_CZ.h
diff --git a/Marlin/dogm_font_data_ISO10646_Greek.h b/Marlin/src/lcd/dogm/dogm_font_data_ISO10646_Greek.h
similarity index 100%
rename from Marlin/dogm_font_data_ISO10646_Greek.h
rename to Marlin/src/lcd/dogm/dogm_font_data_ISO10646_Greek.h
diff --git a/Marlin/dogm_font_data_ISO10646_Kana.h b/Marlin/src/lcd/dogm/dogm_font_data_ISO10646_Kana.h
similarity index 100%
rename from Marlin/dogm_font_data_ISO10646_Kana.h
rename to Marlin/src/lcd/dogm/dogm_font_data_ISO10646_Kana.h
diff --git a/Marlin/dogm_font_data_Marlin_symbols.h b/Marlin/src/lcd/dogm/dogm_font_data_Marlin_symbols.h
similarity index 100%
rename from Marlin/dogm_font_data_Marlin_symbols.h
rename to Marlin/src/lcd/dogm/dogm_font_data_Marlin_symbols.h
diff --git a/Marlin/ultralcd_st7565_u8glib_VIKI.h b/Marlin/src/lcd/dogm/ultralcd_st7565_u8glib_VIKI.h
similarity index 100%
rename from Marlin/ultralcd_st7565_u8glib_VIKI.h
rename to Marlin/src/lcd/dogm/ultralcd_st7565_u8glib_VIKI.h
diff --git a/Marlin/ultralcd_st7920_u8glib_rrd.h b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd.h
similarity index 100%
rename from Marlin/ultralcd_st7920_u8glib_rrd.h
rename to Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd.h
diff --git a/Marlin/language_an.h b/Marlin/src/lcd/language/language_an.h
similarity index 100%
rename from Marlin/language_an.h
rename to Marlin/src/lcd/language/language_an.h
diff --git a/Marlin/language_bg.h b/Marlin/src/lcd/language/language_bg.h
similarity index 100%
rename from Marlin/language_bg.h
rename to Marlin/src/lcd/language/language_bg.h
diff --git a/Marlin/language_ca.h b/Marlin/src/lcd/language/language_ca.h
similarity index 100%
rename from Marlin/language_ca.h
rename to Marlin/src/lcd/language/language_ca.h
diff --git a/Marlin/language_cn.h b/Marlin/src/lcd/language/language_cn.h
similarity index 100%
rename from Marlin/language_cn.h
rename to Marlin/src/lcd/language/language_cn.h
diff --git a/Marlin/language_cz.h b/Marlin/src/lcd/language/language_cz.h
similarity index 100%
rename from Marlin/language_cz.h
rename to Marlin/src/lcd/language/language_cz.h
diff --git a/Marlin/language_cz_utf8.h b/Marlin/src/lcd/language/language_cz_utf8.h
similarity index 100%
rename from Marlin/language_cz_utf8.h
rename to Marlin/src/lcd/language/language_cz_utf8.h
diff --git a/Marlin/language_da.h b/Marlin/src/lcd/language/language_da.h
similarity index 100%
rename from Marlin/language_da.h
rename to Marlin/src/lcd/language/language_da.h
diff --git a/Marlin/language_de.h b/Marlin/src/lcd/language/language_de.h
similarity index 100%
rename from Marlin/language_de.h
rename to Marlin/src/lcd/language/language_de.h
diff --git a/Marlin/language_el-gr.h b/Marlin/src/lcd/language/language_el-gr.h
similarity index 100%
rename from Marlin/language_el-gr.h
rename to Marlin/src/lcd/language/language_el-gr.h
diff --git a/Marlin/language_el.h b/Marlin/src/lcd/language/language_el.h
similarity index 100%
rename from Marlin/language_el.h
rename to Marlin/src/lcd/language/language_el.h
diff --git a/Marlin/language_en.h b/Marlin/src/lcd/language/language_en.h
similarity index 100%
rename from Marlin/language_en.h
rename to Marlin/src/lcd/language/language_en.h
diff --git a/Marlin/language_es.h b/Marlin/src/lcd/language/language_es.h
similarity index 100%
rename from Marlin/language_es.h
rename to Marlin/src/lcd/language/language_es.h
diff --git a/Marlin/language_eu.h b/Marlin/src/lcd/language/language_eu.h
similarity index 100%
rename from Marlin/language_eu.h
rename to Marlin/src/lcd/language/language_eu.h
diff --git a/Marlin/language_fi.h b/Marlin/src/lcd/language/language_fi.h
similarity index 100%
rename from Marlin/language_fi.h
rename to Marlin/src/lcd/language/language_fi.h
diff --git a/Marlin/language_fr.h b/Marlin/src/lcd/language/language_fr.h
similarity index 100%
rename from Marlin/language_fr.h
rename to Marlin/src/lcd/language/language_fr.h
diff --git a/Marlin/language_gl.h b/Marlin/src/lcd/language/language_gl.h
similarity index 100%
rename from Marlin/language_gl.h
rename to Marlin/src/lcd/language/language_gl.h
diff --git a/Marlin/language_hr.h b/Marlin/src/lcd/language/language_hr.h
similarity index 100%
rename from Marlin/language_hr.h
rename to Marlin/src/lcd/language/language_hr.h
diff --git a/Marlin/language_it.h b/Marlin/src/lcd/language/language_it.h
similarity index 100%
rename from Marlin/language_it.h
rename to Marlin/src/lcd/language/language_it.h
diff --git a/Marlin/language_kana.h b/Marlin/src/lcd/language/language_kana.h
similarity index 100%
rename from Marlin/language_kana.h
rename to Marlin/src/lcd/language/language_kana.h
diff --git a/Marlin/language_kana_utf8.h b/Marlin/src/lcd/language/language_kana_utf8.h
similarity index 100%
rename from Marlin/language_kana_utf8.h
rename to Marlin/src/lcd/language/language_kana_utf8.h
diff --git a/Marlin/language_nl.h b/Marlin/src/lcd/language/language_nl.h
similarity index 100%
rename from Marlin/language_nl.h
rename to Marlin/src/lcd/language/language_nl.h
diff --git a/Marlin/language_pl-DOGM.h b/Marlin/src/lcd/language/language_pl-DOGM.h
similarity index 100%
rename from Marlin/language_pl-DOGM.h
rename to Marlin/src/lcd/language/language_pl-DOGM.h
diff --git a/Marlin/language_pl-HD44780.h b/Marlin/src/lcd/language/language_pl-HD44780.h
similarity index 100%
rename from Marlin/language_pl-HD44780.h
rename to Marlin/src/lcd/language/language_pl-HD44780.h
diff --git a/Marlin/language_pl.h b/Marlin/src/lcd/language/language_pl.h
similarity index 100%
rename from Marlin/language_pl.h
rename to Marlin/src/lcd/language/language_pl.h
diff --git a/Marlin/language_pt-br.h b/Marlin/src/lcd/language/language_pt-br.h
similarity index 100%
rename from Marlin/language_pt-br.h
rename to Marlin/src/lcd/language/language_pt-br.h
diff --git a/Marlin/language_pt-br_utf8.h b/Marlin/src/lcd/language/language_pt-br_utf8.h
similarity index 100%
rename from Marlin/language_pt-br_utf8.h
rename to Marlin/src/lcd/language/language_pt-br_utf8.h
diff --git a/Marlin/language_pt.h b/Marlin/src/lcd/language/language_pt.h
similarity index 100%
rename from Marlin/language_pt.h
rename to Marlin/src/lcd/language/language_pt.h
diff --git a/Marlin/language_pt_utf8.h b/Marlin/src/lcd/language/language_pt_utf8.h
similarity index 100%
rename from Marlin/language_pt_utf8.h
rename to Marlin/src/lcd/language/language_pt_utf8.h
diff --git a/Marlin/language_ru.h b/Marlin/src/lcd/language/language_ru.h
similarity index 100%
rename from Marlin/language_ru.h
rename to Marlin/src/lcd/language/language_ru.h
diff --git a/Marlin/language_sk_utf8.h b/Marlin/src/lcd/language/language_sk_utf8.h
similarity index 100%
rename from Marlin/language_sk_utf8.h
rename to Marlin/src/lcd/language/language_sk_utf8.h
diff --git a/Marlin/language_test.h b/Marlin/src/lcd/language/language_test.h
similarity index 100%
rename from Marlin/language_test.h
rename to Marlin/src/lcd/language/language_test.h
diff --git a/Marlin/language_tr.h b/Marlin/src/lcd/language/language_tr.h
similarity index 100%
rename from Marlin/language_tr.h
rename to Marlin/src/lcd/language/language_tr.h
diff --git a/Marlin/language_uk.h b/Marlin/src/lcd/language/language_uk.h
similarity index 100%
rename from Marlin/language_uk.h
rename to Marlin/src/lcd/language/language_uk.h
diff --git a/Marlin/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
similarity index 100%
rename from Marlin/language_zh_CN.h
rename to Marlin/src/lcd/language/language_zh_CN.h
diff --git a/Marlin/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
similarity index 100%
rename from Marlin/language_zh_TW.h
rename to Marlin/src/lcd/language/language_zh_TW.h
diff --git a/Marlin/thermistornames.h b/Marlin/src/lcd/thermistornames.h
similarity index 100%
rename from Marlin/thermistornames.h
rename to Marlin/src/lcd/thermistornames.h
diff --git a/Marlin/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
similarity index 100%
rename from Marlin/ultralcd.cpp
rename to Marlin/src/lcd/ultralcd.cpp
diff --git a/Marlin/ultralcd.h b/Marlin/src/lcd/ultralcd.h
similarity index 100%
rename from Marlin/ultralcd.h
rename to Marlin/src/lcd/ultralcd.h
diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/src/lcd/ultralcd_impl_DOGM.h
similarity index 100%
rename from Marlin/ultralcd_impl_DOGM.h
rename to Marlin/src/lcd/ultralcd_impl_DOGM.h
diff --git a/Marlin/ultralcd_impl_HD44780.h b/Marlin/src/lcd/ultralcd_impl_HD44780.h
similarity index 100%
rename from Marlin/ultralcd_impl_HD44780.h
rename to Marlin/src/lcd/ultralcd_impl_HD44780.h
diff --git a/Marlin/utf_mapper.h b/Marlin/src/lcd/utf_mapper.h
similarity index 100%
rename from Marlin/utf_mapper.h
rename to Marlin/src/lcd/utf_mapper.h