diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorMainTabs.kt b/core/src/com/unciv/ui/mapeditor/MapEditorMainTabs.kt
index eb4deb5b0d..e28886ee68 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorMainTabs.kt
+++ b/core/src/com/unciv/ui/mapeditor/MapEditorMainTabs.kt
@@ -1,6 +1,13 @@
 package com.unciv.ui.mapeditor
 
 import com.unciv.ui.images.ImageGetter
+import com.unciv.ui.mapeditor.tabs.MapEditorEditTab
+import com.unciv.ui.mapeditor.tabs.MapEditorGenerateTab
+import com.unciv.ui.mapeditor.tabs.MapEditorLoadTab
+import com.unciv.ui.mapeditor.tabs.MapEditorModsTab
+import com.unciv.ui.mapeditor.tabs.MapEditorOptionsTab
+import com.unciv.ui.mapeditor.tabs.MapEditorSaveTab
+import com.unciv.ui.mapeditor.tabs.MapEditorViewTab
 import com.unciv.ui.utils.KeyCharAndCode
 import com.unciv.ui.utils.TabbedPager
 
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt b/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt
index fbc3b9bb12..38938bdb22 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt
+++ b/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt
@@ -6,13 +6,14 @@ import com.unciv.UncivGame
 import com.unciv.logic.map.MapParameters
 import com.unciv.logic.map.MapSize
 import com.unciv.logic.map.MapSizeNew
-import com.unciv.logic.map.tile.TileInfo
 import com.unciv.logic.map.TileMap
+import com.unciv.logic.map.tile.TileInfo
 import com.unciv.models.metadata.BaseRuleset
 import com.unciv.models.metadata.GameSetupInfo
 import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.ruleset.RulesetCache
 import com.unciv.ui.images.ImageGetter
+import com.unciv.ui.mapeditor.tabs.MapEditorOptionsTab
 import com.unciv.ui.popup.ConfirmPopup
 import com.unciv.ui.tilegroups.TileGroup
 import com.unciv.ui.utils.BaseScreen
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorEditSubTabs.kt b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorEditSubTabs.kt
similarity index 99%
rename from core/src/com/unciv/ui/mapeditor/MapEditorEditSubTabs.kt
rename to core/src/com/unciv/ui/mapeditor/tabs/MapEditorEditSubTabs.kt
index 3816e5fbb0..163d157eb7 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorEditSubTabs.kt
+++ b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorEditSubTabs.kt
@@ -7,8 +7,8 @@ import com.unciv.Constants
 import com.unciv.UncivGame
 import com.unciv.logic.map.tile.RoadStatus
 import com.unciv.logic.map.tile.TileInfo
-import com.unciv.models.ruleset.nation.Nation
 import com.unciv.models.ruleset.Ruleset
+import com.unciv.models.ruleset.nation.Nation
 import com.unciv.models.ruleset.tile.ResourceType
 import com.unciv.models.ruleset.tile.Terrain
 import com.unciv.models.ruleset.tile.TerrainType
@@ -21,7 +21,8 @@ import com.unciv.ui.audio.MusicTrackChooserFlags
 import com.unciv.ui.civilopedia.FormattedLine
 import com.unciv.ui.civilopedia.MarkupRenderer
 import com.unciv.ui.images.ImageGetter
-import com.unciv.ui.mapeditor.MapEditorEditTab.BrushHandlerType
+import com.unciv.ui.mapeditor.tabs.MapEditorEditTab
+import com.unciv.ui.mapeditor.tabs.MapEditorEditTab.BrushHandlerType
 import com.unciv.ui.tilegroups.TileGroup
 import com.unciv.ui.tilegroups.TileSetStrings
 import com.unciv.ui.utils.BaseScreen
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorEditTab.kt b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorEditTab.kt
similarity index 96%
rename from core/src/com/unciv/ui/mapeditor/MapEditorEditTab.kt
rename to core/src/com/unciv/ui/mapeditor/tabs/MapEditorEditTab.kt
index bbadafbc7c..2b17f1a785 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorEditTab.kt
+++ b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorEditTab.kt
@@ -1,4 +1,4 @@
-package com.unciv.ui.mapeditor
+package com.unciv.ui.mapeditor.tabs
 
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.scenes.scene2d.Actor
@@ -13,7 +13,16 @@ import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.translations.tr
 import com.unciv.ui.civilopedia.FormattedLine
 import com.unciv.ui.images.ImageGetter
-import com.unciv.ui.mapeditor.MapEditorOptionsTab.TileMatchFuzziness
+import com.unciv.ui.mapeditor.IMapEditorEditSubTabs
+import com.unciv.ui.mapeditor.MapEditorEditFeaturesTab
+import com.unciv.ui.mapeditor.MapEditorEditImprovementsTab
+import com.unciv.ui.mapeditor.MapEditorEditResourcesTab
+import com.unciv.ui.mapeditor.MapEditorEditRiversTab
+import com.unciv.ui.mapeditor.MapEditorEditStartsTab
+import com.unciv.ui.mapeditor.MapEditorEditTerrainTab
+import com.unciv.ui.mapeditor.MapEditorEditWondersTab
+import com.unciv.ui.mapeditor.MapEditorScreen
+import com.unciv.ui.mapeditor.tabs.MapEditorOptionsTab.TileMatchFuzziness
 import com.unciv.ui.popup.ToastPopup
 import com.unciv.ui.utils.BaseScreen
 import com.unciv.ui.utils.KeyCharAndCode
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorGenerateTab.kt b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorGenerateTab.kt
similarity index 98%
rename from core/src/com/unciv/ui/mapeditor/MapEditorGenerateTab.kt
rename to core/src/com/unciv/ui/mapeditor/tabs/MapEditorGenerateTab.kt
index f4bb16e60d..6bd59b0ebc 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorGenerateTab.kt
+++ b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorGenerateTab.kt
@@ -1,4 +1,4 @@
-package com.unciv.ui.mapeditor
+package com.unciv.ui.mapeditor.tabs
 
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.scenes.scene2d.ui.ButtonGroup
@@ -13,6 +13,8 @@ import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.ruleset.RulesetCache
 import com.unciv.models.translations.tr
 import com.unciv.ui.images.ImageGetter
+import com.unciv.ui.mapeditor.MapEditorScreen
+import com.unciv.ui.mapeditor.MapGeneratorSteps
 import com.unciv.ui.newgamescreen.MapParametersTable
 import com.unciv.ui.popup.Popup
 import com.unciv.ui.popup.ToastPopup
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorLoadTab.kt b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorLoadTab.kt
similarity index 98%
rename from core/src/com/unciv/ui/mapeditor/MapEditorLoadTab.kt
rename to core/src/com/unciv/ui/mapeditor/tabs/MapEditorLoadTab.kt
index 8037c07a1e..268a10c207 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorLoadTab.kt
+++ b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorLoadTab.kt
@@ -1,4 +1,4 @@
-package com.unciv.ui.mapeditor
+package com.unciv.ui.mapeditor.tabs
 
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.files.FileHandle
@@ -9,6 +9,8 @@ import com.unciv.logic.files.MapSaver
 import com.unciv.logic.UncivShowableException
 import com.unciv.models.ruleset.RulesetCache
 import com.unciv.models.translations.tr
+import com.unciv.ui.mapeditor.MapEditorFilesTable
+import com.unciv.ui.mapeditor.MapEditorScreen
 import com.unciv.ui.popup.ConfirmPopup
 import com.unciv.ui.popup.Popup
 import com.unciv.ui.popup.ToastPopup
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorModsTab.kt b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorModsTab.kt
similarity index 98%
rename from core/src/com/unciv/ui/mapeditor/MapEditorModsTab.kt
rename to core/src/com/unciv/ui/mapeditor/tabs/MapEditorModsTab.kt
index dbf5eb407a..2a7eb86a2d 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorModsTab.kt
+++ b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorModsTab.kt
@@ -1,4 +1,4 @@
-package com.unciv.ui.mapeditor
+package com.unciv.ui.mapeditor.tabs
 
 import com.badlogic.gdx.scenes.scene2d.ui.Cell
 import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
@@ -7,6 +7,7 @@ import com.badlogic.gdx.utils.Align
 import com.unciv.Constants
 import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.ruleset.RulesetCache
+import com.unciv.ui.mapeditor.MapEditorScreen
 import com.unciv.ui.newgamescreen.ModCheckboxTable
 import com.unciv.ui.newgamescreen.TranslatedSelectBox
 import com.unciv.ui.popup.Popup
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorOptionsTab.kt b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorOptionsTab.kt
similarity index 97%
rename from core/src/com/unciv/ui/mapeditor/MapEditorOptionsTab.kt
rename to core/src/com/unciv/ui/mapeditor/tabs/MapEditorOptionsTab.kt
index 2bfcb7bff2..6feda4771f 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorOptionsTab.kt
+++ b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorOptionsTab.kt
@@ -1,4 +1,4 @@
-package com.unciv.ui.mapeditor
+package com.unciv.ui.mapeditor.tabs
 
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.graphics.Color
@@ -7,6 +7,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.CheckBox
 import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.unciv.logic.files.MapSaver
 import com.unciv.models.translations.tr
+import com.unciv.ui.mapeditor.MapEditorScreen
 import com.unciv.ui.popup.ToastPopup
 import com.unciv.ui.utils.BaseScreen
 import com.unciv.ui.utils.KeyCharAndCode
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorSaveTab.kt b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorSaveTab.kt
similarity index 97%
rename from core/src/com/unciv/ui/mapeditor/MapEditorSaveTab.kt
rename to core/src/com/unciv/ui/mapeditor/tabs/MapEditorSaveTab.kt
index c59b6a4266..3a45208077 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorSaveTab.kt
+++ b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorSaveTab.kt
@@ -1,4 +1,4 @@
-package com.unciv.ui.mapeditor
+package com.unciv.ui.mapeditor.tabs
 
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.files.FileHandle
@@ -9,6 +9,8 @@ import com.unciv.logic.files.MapSaver
 import com.unciv.logic.map.MapGeneratedMainType
 import com.unciv.logic.map.TileMap
 import com.unciv.models.translations.tr
+import com.unciv.ui.mapeditor.MapEditorFilesTable
+import com.unciv.ui.mapeditor.MapEditorScreen
 import com.unciv.ui.popup.ConfirmPopup
 import com.unciv.ui.popup.Popup
 import com.unciv.ui.popup.ToastPopup
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorViewTab.kt b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorViewTab.kt
similarity index 99%
rename from core/src/com/unciv/ui/mapeditor/MapEditorViewTab.kt
rename to core/src/com/unciv/ui/mapeditor/tabs/MapEditorViewTab.kt
index 9cf6ab43e2..bf64667b7a 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorViewTab.kt
+++ b/core/src/com/unciv/ui/mapeditor/tabs/MapEditorViewTab.kt
@@ -1,4 +1,4 @@
-package com.unciv.ui.mapeditor
+package com.unciv.ui.mapeditor.tabs
 
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.scenes.scene2d.ui.Cell
@@ -17,6 +17,7 @@ import com.unciv.ui.civilopedia.CivilopediaScreen
 import com.unciv.ui.civilopedia.FormattedLine
 import com.unciv.ui.civilopedia.FormattedLine.IconDisplay
 import com.unciv.ui.civilopedia.MarkupRenderer
+import com.unciv.ui.mapeditor.MapEditorScreen
 import com.unciv.ui.popup.ToastPopup
 import com.unciv.ui.utils.BaseScreen
 import com.unciv.ui.utils.ExpanderTab