diff --git a/crates/ui-egui/src/dialogs/mod.rs b/crates/ui-egui/src/dialogs.rs
similarity index 100%
rename from crates/ui-egui/src/dialogs/mod.rs
rename to crates/ui-egui/src/dialogs.rs
diff --git a/crates/ui-egui/src/i18n/mod.rs b/crates/ui-egui/src/i18n.rs
similarity index 94%
rename from crates/ui-egui/src/i18n/mod.rs
rename to crates/ui-egui/src/i18n.rs
index 690b716d5..e141965bb 100644
--- a/crates/ui-egui/src/i18n/mod.rs
+++ b/crates/ui-egui/src/i18n.rs
@@ -101,32 +101,32 @@ pub static LANGUAGES: [LangInfo; 25] = [
     LangInfo {
         code: "el",
         name: "Ελληνικά",
-        source: include_str!("el.tsv"),
+        source: include_str!("i18n/el.tsv"),
         plural: plural_one_other,
         complete_menus: true,
         catalog: OnceLock::new(),
     },
     // Japanese: the whole interface (every menu string and `tl!` literal) and the status and error
     // messages, keeping the product, workspace and perspective preset names in English (`MENU_KEEP_AS_IS`).
-    LangInfo { code: "ja", name: "日本語", source: include_str!("ja.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new() },
+    LangInfo { code: "ja", name: "日本語", source: include_str!("i18n/ja.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new() },
     // Korean: the whole interface and the status and error messages, keeping the same names in
     // English as Japanese; a count takes no plural, so plurals have one form. Hangul is drawn with an
     // installed system font (craft-fonts has no Korean UI face yet); every `ko-*` locale resolves here.
-    LangInfo { code: "ko", name: "한국어", source: include_str!("ko.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new() },
+    LangInfo { code: "ko", name: "한국어", source: include_str!("i18n/ko.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new() },
     // Vietnamese: complete menus and messages, with one plural form.
     // Every `vi-*` locale resolves here.
     LangInfo {
-        code: "vi", name: "Tiếng Việt", source: include_str!("vi.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new()
+        code: "vi", name: "Tiếng Việt", source: include_str!("i18n/vi.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new()
     },
     // Czech: the whole interface (every menu string and `tl!` literal) and the status and error
     // messages, with one/few/other plurals, keeping the same names in English as Spanish.
-    LangInfo { code: "cs", name: "Čeština", source: include_str!("cs.tsv"), plural: plural_czech, complete_menus: true, catalog: OnceLock::new() },
+    LangInfo { code: "cs", name: "Čeština", source: include_str!("i18n/cs.tsv"), plural: plural_czech, complete_menus: true, catalog: OnceLock::new() },
     // German: the whole interface and the status and error messages, keeping the same names in
     // English as Spanish; every `de-*` locale (`de-DE`, `de-AT`, `de-CH`, `de-LU` …) resolves here.
     LangInfo {
         code: "de",
         name: "Deutsch",
-        source: include_str!("de.tsv"),
+        source: include_str!("i18n/de.tsv"),
         plural: plural_one_other,
         complete_menus: true,
         catalog: OnceLock::new(),
@@ -136,20 +136,20 @@ pub static LANGUAGES: [LangInfo; 25] = [
     LangInfo {
         code: "es",
         name: "Español",
-        source: include_str!("es.tsv"),
+        source: include_str!("i18n/es.tsv"),
         plural: plural_one_other,
         complete_menus: true,
         catalog: OnceLock::new(),
     },
     // French: the whole interface and the status and error messages, keeping the same names in
     // English as Spanish; every `fr-*` locale (`fr-FR`, `fr-BE`, `fr-CA`, `fr-CH` …) resolves here.
-    LangInfo { code: "fr", name: "Français", source: include_str!("fr.tsv"), plural: plural_french, complete_menus: true, catalog: OnceLock::new() },
+    LangInfo { code: "fr", name: "Français", source: include_str!("i18n/fr.tsv"), plural: plural_french, complete_menus: true, catalog: OnceLock::new() },
     // Italian: the whole interface and the status and error messages, keeping the same names in
     // English as Spanish; every `it-*` locale (`it-IT`, `it-CH`, `it-SM` …) resolves here.
     LangInfo {
         code: "it",
         name: "Italiano",
-        source: include_str!("it.tsv"),
+        source: include_str!("i18n/it.tsv"),
         plural: plural_one_other,
         complete_menus: true,
         catalog: OnceLock::new(),
@@ -158,14 +158,14 @@ pub static LANGUAGES: [LangInfo; 25] = [
     // English as Spanish. Georgian nouns stay singular after a number, so one plural form;
     // `ka-GE` and `ka_GE.UTF-8` resolve here.
     LangInfo {
-        code: "ka", name: "ქართული", source: include_str!("ka.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new()
+        code: "ka", name: "ქართული", source: include_str!("i18n/ka.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new()
     },
     // Russian: the whole interface and the status and error messages, keeping the same names in
     // English as Spanish; every `ru-*` locale (`ru-RU`, `ru-BY`, `ru-KZ` …) resolves here.
     LangInfo {
         code: "ru",
         name: "Русский",
-        source: include_str!("ru.tsv"),
+        source: include_str!("i18n/ru.tsv"),
         plural: plural_east_slavic,
         complete_menus: true,
         catalog: OnceLock::new(),
@@ -175,7 +175,7 @@ pub static LANGUAGES: [LangInfo; 25] = [
     LangInfo {
         code: "uk",
         name: "Українська",
-        source: include_str!("uk.tsv"),
+        source: include_str!("i18n/uk.tsv"),
         plural: plural_east_slavic,
         complete_menus: true,
         catalog: OnceLock::new(),
@@ -185,7 +185,7 @@ pub static LANGUAGES: [LangInfo; 25] = [
     LangInfo {
         code: "bg",
         name: "Български",
-        source: include_str!("bg.tsv"),
+        source: include_str!("i18n/bg.tsv"),
         plural: plural_one_other,
         complete_menus: true,
         catalog: OnceLock::new(),
@@ -193,17 +193,17 @@ pub static LANGUAGES: [LangInfo; 25] = [
     // Hungarian: the whole interface and the status and error messages, keeping the same names in
     // English as Spanish; a count takes the singular ("3 réteg"), so plurals have one form. Every
     // `hu-*` locale (including `hu-HU`) resolves here.
-    LangInfo { code: "hu", name: "Magyar", source: include_str!("hu.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new() },
+    LangInfo { code: "hu", name: "Magyar", source: include_str!("i18n/hu.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new() },
     // Polish: the whole interface and the status and error messages, with one/few/many plurals,
     // keeping the same names in English as Spanish; every `pl-*` locale (including `pl-PL`)
     // resolves here.
-    LangInfo { code: "pl", name: "Polski", source: include_str!("pl.tsv"), plural: plural_polish, complete_menus: true, catalog: OnceLock::new() },
+    LangInfo { code: "pl", name: "Polski", source: include_str!("i18n/pl.tsv"), plural: plural_polish, complete_menus: true, catalog: OnceLock::new() },
     // Swedish: the whole interface and the status and error messages, keeping the same names in
     // English as Spanish; every `sv-*` locale (`sv-SE`, `sv-FI` …) resolves here.
     LangInfo {
         code: "sv",
         name: "Svenska",
-        source: include_str!("sv.tsv"),
+        source: include_str!("i18n/sv.tsv"),
         plural: plural_one_other,
         complete_menus: true,
         catalog: OnceLock::new(),
@@ -214,7 +214,7 @@ pub static LANGUAGES: [LangInfo; 25] = [
     LangInfo {
         code: "pt-br",
         name: "Português (Brasil)",
-        source: include_str!("pt-br.tsv"),
+        source: include_str!("i18n/pt-br.tsv"),
         plural: plural_one_other,
         complete_menus: true,
         catalog: OnceLock::new(),
@@ -224,7 +224,7 @@ pub static LANGUAGES: [LangInfo; 25] = [
     LangInfo {
         code: "zh-hant",
         name: "繁體中文",
-        source: include_str!("zh-hant.tsv"),
+        source: include_str!("i18n/zh-hant.tsv"),
         plural: plural_none,
         complete_menus: true,
         catalog: OnceLock::new(),
@@ -234,7 +234,7 @@ pub static LANGUAGES: [LangInfo; 25] = [
     LangInfo {
         code: "zh-hans",
         name: "简体中文",
-        source: include_str!("zh-hans.tsv"),
+        source: include_str!("i18n/zh-hans.tsv"),
         plural: plural_none,
         complete_menus: true,
         catalog: OnceLock::new(),
@@ -242,19 +242,19 @@ pub static LANGUAGES: [LangInfo; 25] = [
     LangInfo {
         code: "nl",
         name: "Nederlands",
-        source: include_str!("nl.tsv"),
+        source: include_str!("i18n/nl.tsv"),
         plural: plural_one_other,
         complete_menus: true,
         catalog: OnceLock::new(),
     },
     // Danish; every `da-*` locale (`da-DK`, `da_DK.UTF-8`…) resolves here.
-    LangInfo { code: "da", name: "Dansk", source: include_str!("da.tsv"), plural: plural_one_other, complete_menus: true, catalog: OnceLock::new() },
+    LangInfo { code: "da", name: "Dansk", source: include_str!("i18n/da.tsv"), plural: plural_one_other, complete_menus: true, catalog: OnceLock::new() },
     // Indonesian; every `id-*` locale (`id-ID`, `id_ID.UTF-8`…) resolves here. CLDR `id` counts
     // have one form, so `@plural` entries list a single form.
     LangInfo {
         code: "id",
         name: "Bahasa Indonesia",
-        source: include_str!("id.tsv"),
+        source: include_str!("i18n/id.tsv"),
         plural: plural_none,
         complete_menus: true,
         catalog: OnceLock::new(),
@@ -262,11 +262,11 @@ pub static LANGUAGES: [LangInfo; 25] = [
     // Finnish: the whole interface and the status and error messages, keeping the same names in
     // English as Spanish; one/other plurals with the partitive after any number but 1 ("2 tasoa").
     // Every `fi-*` locale resolves here.
-    LangInfo { code: "fi", name: "Suomi", source: include_str!("fi.tsv"), plural: plural_one_other, complete_menus: true, catalog: OnceLock::new() },
+    LangInfo { code: "fi", name: "Suomi", source: include_str!("i18n/fi.tsv"), plural: plural_one_other, complete_menus: true, catalog: OnceLock::new() },
     // Turkish: the whole interface and the status and error messages, keeping the same names in
     // English as Spanish; a count takes the singular ("3 katman"), so plurals have one form. Every
     // `tr-*` locale (including `tr-TR` and `tr-CY`) resolves here.
-    LangInfo { code: "tr", name: "Türkçe", source: include_str!("tr.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new() },
+    LangInfo { code: "tr", name: "Türkçe", source: include_str!("i18n/tr.tsv"), plural: plural_none, complete_menus: true, catalog: OnceLock::new() },
 ];
 
 impl LangInfo {
diff --git a/crates/ui-egui/src/panels/mod.rs b/crates/ui-egui/src/panels.rs
similarity index 100%
rename from crates/ui-egui/src/panels/mod.rs
rename to crates/ui-egui/src/panels.rs