diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt
index 894fdf3145..3bf90bcfbb 100644
--- a/core/src/com/unciv/UncivGame.kt
+++ b/core/src/com/unciv/UncivGame.kt
@@ -10,7 +10,7 @@ import com.badlogic.gdx.scenes.scene2d.actions.Actions
 import com.badlogic.gdx.utils.Align
 import com.unciv.logic.GameInfo
 import com.unciv.logic.IsPartOfGameInfoSerialization
-import com.unciv.logic.UncivFiles
+import com.unciv.logic.files.UncivFiles
 import com.unciv.logic.UncivShowableException
 import com.unciv.logic.civilization.PlayerType
 import com.unciv.logic.multiplayer.OnlineMultiplayer
diff --git a/core/src/com/unciv/UncivGameParameters.kt b/core/src/com/unciv/UncivGameParameters.kt
index 703ff37cdc..db9e96ddce 100644
--- a/core/src/com/unciv/UncivGameParameters.kt
+++ b/core/src/com/unciv/UncivGameParameters.kt
@@ -1,6 +1,6 @@
 package com.unciv
 
-import com.unciv.logic.CustomFileLocationHelper
+import com.unciv.logic.files.CustomFileLocationHelper
 import com.unciv.ui.crashhandling.CrashReportSysInfo
 import com.unciv.ui.utils.AudioExceptionHelper
 import com.unciv.ui.utils.GeneralPlatformSpecificHelpers
diff --git a/core/src/com/unciv/logic/GameInfo.kt b/core/src/com/unciv/logic/GameInfo.kt
index 63d5f9b346..80a45f7776 100644
--- a/core/src/com/unciv/logic/GameInfo.kt
+++ b/core/src/com/unciv/logic/GameInfo.kt
@@ -18,11 +18,12 @@ import com.unciv.logic.civilization.NotificationCategory
 import com.unciv.logic.civilization.NotificationIcon
 import com.unciv.logic.civilization.PlayerType
 import com.unciv.logic.civilization.managers.TechManager
+import com.unciv.logic.map.CityDistanceData
 import com.unciv.logic.map.TileInfo
 import com.unciv.logic.map.TileMap
 import com.unciv.models.Religion
 import com.unciv.models.metadata.GameParameters
-import com.unciv.models.ruleset.Difficulty
+import com.unciv.models.ruleset.nation.Difficulty
 import com.unciv.models.ruleset.ModOptionsConstants
 import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.ruleset.RulesetCache
diff --git a/core/src/com/unciv/logic/GameStarter.kt b/core/src/com/unciv/logic/GameStarter.kt
index f61e4b6b9c..80c71ce340 100644
--- a/core/src/com/unciv/logic/GameStarter.kt
+++ b/core/src/com/unciv/logic/GameStarter.kt
@@ -6,6 +6,8 @@ import com.unciv.logic.civilization.AlertType
 import com.unciv.logic.civilization.CivilizationInfo
 import com.unciv.logic.civilization.PlayerType
 import com.unciv.logic.civilization.PopupAlert
+import com.unciv.logic.files.MapSaver
+import com.unciv.logic.map.HexMath
 import com.unciv.logic.map.TileInfo
 import com.unciv.logic.map.TileMap
 import com.unciv.logic.map.mapgenerator.MapGenerator
diff --git a/core/src/com/unciv/logic/BarbarianManager.kt b/core/src/com/unciv/logic/automation/civilization/BarbarianManager.kt
similarity index 100%
rename from core/src/com/unciv/logic/BarbarianManager.kt
rename to core/src/com/unciv/logic/automation/civilization/BarbarianManager.kt
diff --git a/core/src/com/unciv/models/AttackableTile.kt b/core/src/com/unciv/logic/automation/unit/AttackableTile.kt
similarity index 80%
rename from core/src/com/unciv/models/AttackableTile.kt
rename to core/src/com/unciv/logic/automation/unit/AttackableTile.kt
index 01ceed2e23..b8563a272a 100644
--- a/core/src/com/unciv/models/AttackableTile.kt
+++ b/core/src/com/unciv/logic/automation/unit/AttackableTile.kt
@@ -1,6 +1,6 @@
-package com.unciv.models
+package com.unciv.logic.automation.unit
 
 import com.unciv.logic.map.TileInfo
 
 class AttackableTile(val tileToAttackFrom: TileInfo, val tileToAttack: TileInfo,
-                     val movementLeftAfterMovingToAttackTile:Float)
\ No newline at end of file
+                     val movementLeftAfterMovingToAttackTile:Float)
diff --git a/core/src/com/unciv/logic/automation/unit/BattleHelper.kt b/core/src/com/unciv/logic/automation/unit/BattleHelper.kt
index 617ad2c42c..c4d2c17e96 100644
--- a/core/src/com/unciv/logic/automation/unit/BattleHelper.kt
+++ b/core/src/com/unciv/logic/automation/unit/BattleHelper.kt
@@ -8,7 +8,6 @@ import com.unciv.logic.battle.MapUnitCombatant
 import com.unciv.logic.map.MapUnit
 import com.unciv.logic.map.PathsToTilesWithinTurn
 import com.unciv.logic.map.TileInfo
-import com.unciv.models.AttackableTile
 import com.unciv.models.ruleset.unique.UniqueType
 
 object BattleHelper {
diff --git a/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt b/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt
index 67e06a3049..f90259c0e7 100644
--- a/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt
+++ b/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt
@@ -3,7 +3,7 @@ package com.unciv.logic.automation.unit
 import com.badlogic.gdx.math.Vector2
 import com.unciv.Constants
 import com.unciv.UncivGame
-import com.unciv.logic.HexMath
+import com.unciv.logic.map.HexMath
 import com.unciv.logic.automation.Automation
 import com.unciv.logic.automation.ThreatLevel
 import com.unciv.logic.automation.civilization.NextTurnAutomation
diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt
index e7837773a7..7b9e599540 100644
--- a/core/src/com/unciv/logic/battle/Battle.kt
+++ b/core/src/com/unciv/logic/battle/Battle.kt
@@ -17,7 +17,7 @@ import com.unciv.logic.civilization.diplomacy.DiplomaticStatus
 import com.unciv.logic.map.MapUnit
 import com.unciv.logic.map.RoadStatus
 import com.unciv.logic.map.TileInfo
-import com.unciv.models.AttackableTile
+import com.unciv.logic.automation.unit.AttackableTile
 import com.unciv.models.UnitActionType
 import com.unciv.models.helpers.UnitMovementMemoryType
 import com.unciv.models.ruleset.unique.StateForConditionals
diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt
index a4cde16b7c..42189c8cba 100644
--- a/core/src/com/unciv/logic/city/CityInfo.kt
+++ b/core/src/com/unciv/logic/city/CityInfo.kt
@@ -19,7 +19,7 @@ import com.unciv.logic.map.TileInfo
 import com.unciv.logic.map.TileMap
 import com.unciv.models.Counter
 import com.unciv.models.ruleset.ModOptionsConstants
-import com.unciv.models.ruleset.Nation
+import com.unciv.models.ruleset.nation.Nation
 import com.unciv.models.ruleset.tile.ResourceSupplyList
 import com.unciv.models.ruleset.tile.ResourceType
 import com.unciv.models.ruleset.unique.StateForConditionals
diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
index 68f9822ad8..ebf9c81058 100644
--- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
+++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
@@ -35,11 +35,11 @@ import com.unciv.logic.trade.TradeEvaluation
 import com.unciv.logic.trade.TradeRequest
 import com.unciv.models.Counter
 import com.unciv.models.ruleset.Building
-import com.unciv.models.ruleset.CityStateType
-import com.unciv.models.ruleset.Difficulty
-import com.unciv.models.ruleset.Era
+import com.unciv.models.ruleset.nation.CityStateType
+import com.unciv.models.ruleset.nation.Difficulty
+import com.unciv.models.ruleset.tech.Era
 import com.unciv.models.ruleset.ModOptionsConstants
-import com.unciv.models.ruleset.Nation
+import com.unciv.models.ruleset.nation.Nation
 import com.unciv.models.ruleset.Policy
 import com.unciv.models.ruleset.Victory
 import com.unciv.models.ruleset.tile.ResourceSupplyList
diff --git a/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt b/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt
index f1948dfca4..44e893cf52 100644
--- a/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt
+++ b/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt
@@ -12,7 +12,7 @@ import com.unciv.logic.civilization.NotificationIcon
 import com.unciv.logic.civilization.PlayerType
 import com.unciv.logic.civilization.PopupAlert
 import com.unciv.logic.civilization.Proximity
-import com.unciv.models.ruleset.CityStateType
+import com.unciv.models.ruleset.nation.CityStateType
 import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.ruleset.tile.ResourceSupplyList
 import com.unciv.models.ruleset.unique.StateForConditionals
diff --git a/core/src/com/unciv/logic/civilization/managers/TechManager.kt b/core/src/com/unciv/logic/civilization/managers/TechManager.kt
index b0ee324bbd..7bd3dc1cd8 100644
--- a/core/src/com/unciv/logic/civilization/managers/TechManager.kt
+++ b/core/src/com/unciv/logic/civilization/managers/TechManager.kt
@@ -13,7 +13,7 @@ import com.unciv.logic.civilization.PopupAlert
 import com.unciv.logic.civilization.TechAction
 import com.unciv.logic.map.MapSize
 import com.unciv.logic.map.RoadStatus
-import com.unciv.models.ruleset.Era
+import com.unciv.models.ruleset.tech.Era
 import com.unciv.models.ruleset.tech.Technology
 import com.unciv.models.ruleset.unique.UniqueMap
 import com.unciv.models.ruleset.unique.UniqueTarget
diff --git a/core/src/com/unciv/logic/CustomFileLocationHelper.kt b/core/src/com/unciv/logic/files/CustomFileLocationHelper.kt
similarity index 96%
rename from core/src/com/unciv/logic/CustomFileLocationHelper.kt
rename to core/src/com/unciv/logic/files/CustomFileLocationHelper.kt
index 21ef1785c0..327de292a2 100644
--- a/core/src/com/unciv/logic/CustomFileLocationHelper.kt
+++ b/core/src/com/unciv/logic/files/CustomFileLocationHelper.kt
@@ -1,7 +1,7 @@
-package com.unciv.logic
+package com.unciv.logic.files
 
-import com.unciv.logic.UncivFiles.CustomLoadResult
-import com.unciv.logic.UncivFiles.CustomSaveResult
+import com.unciv.logic.files.UncivFiles.CustomLoadResult
+import com.unciv.logic.files.UncivFiles.CustomSaveResult
 import com.unciv.utils.concurrency.Concurrency
 import java.io.InputStream
 import java.io.OutputStream
diff --git a/core/src/com/unciv/logic/MapSaver.kt b/core/src/com/unciv/logic/files/MapSaver.kt
similarity index 98%
rename from core/src/com/unciv/logic/MapSaver.kt
rename to core/src/com/unciv/logic/files/MapSaver.kt
index 6378379f1c..f0e513b745 100644
--- a/core/src/com/unciv/logic/MapSaver.kt
+++ b/core/src/com/unciv/logic/files/MapSaver.kt
@@ -1,4 +1,4 @@
-package com.unciv.logic
+package com.unciv.logic.files
 
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.files.FileHandle
diff --git a/core/src/com/unciv/logic/UncivFiles.kt b/core/src/com/unciv/logic/files/UncivFiles.kt
similarity index 98%
rename from core/src/com/unciv/logic/UncivFiles.kt
rename to core/src/com/unciv/logic/files/UncivFiles.kt
index 6890b01194..b275e6731e 100644
--- a/core/src/com/unciv/logic/UncivFiles.kt
+++ b/core/src/com/unciv/logic/files/UncivFiles.kt
@@ -1,4 +1,4 @@
-package com.unciv.logic
+package com.unciv.logic.files
 
 import com.badlogic.gdx.Files
 import com.badlogic.gdx.Gdx
@@ -8,6 +8,7 @@ import com.badlogic.gdx.utils.SerializationException
 import com.unciv.UncivGame
 import com.unciv.json.fromJsonFile
 import com.unciv.json.json
+import com.unciv.logic.*
 import com.unciv.models.metadata.GameSettings
 import com.unciv.models.metadata.doMigrations
 import com.unciv.models.metadata.isMigrationNecessary
@@ -86,7 +87,9 @@ class UncivFiles(
 
     fun getSaves(autoSaves: Boolean = true): Sequence<FileHandle> {
         val saves = getSaves(SAVE_FILES_FOLDER)
-        val filteredSaves = if (autoSaves) { saves } else { saves.filter { !it.name().startsWith(AUTOSAVE_FILE_NAME) }}
+        val filteredSaves = if (autoSaves) { saves } else { saves.filter { !it.name().startsWith(
+            AUTOSAVE_FILE_NAME
+        ) }}
         return filteredSaves
     }
 
@@ -429,7 +432,9 @@ class UncivFiles(
             return loadGameByName(AUTOSAVE_FILE_NAME)
         } catch (ex: Exception) {
             // silent fail if we can't read the autosave for any reason - try to load the last autosave by turn number first
-            val autosaves = getSaves().filter { it.name() != AUTOSAVE_FILE_NAME && it.name().startsWith(AUTOSAVE_FILE_NAME) }
+            val autosaves = getSaves().filter { it.name() != AUTOSAVE_FILE_NAME && it.name().startsWith(
+                AUTOSAVE_FILE_NAME
+            ) }
             return loadGameFromFile(autosaves.maxByOrNull { it.lastModified() }!!)
         }
     }
diff --git a/core/src/com/unciv/logic/CityDistance.kt b/core/src/com/unciv/logic/map/CityDistance.kt
similarity index 98%
rename from core/src/com/unciv/logic/CityDistance.kt
rename to core/src/com/unciv/logic/map/CityDistance.kt
index b327674839..d573bf1a4b 100644
--- a/core/src/com/unciv/logic/CityDistance.kt
+++ b/core/src/com/unciv/logic/map/CityDistance.kt
@@ -1,9 +1,9 @@
-package com.unciv.logic
+package com.unciv.logic.map
 
 import com.badlogic.gdx.math.Vector2
+import com.unciv.logic.GameInfo
 import com.unciv.logic.city.CityInfo
 import com.unciv.logic.civilization.CivilizationInfo
-import com.unciv.logic.map.TileInfo
 
 class CityDistance(
     val city: CityInfo,
diff --git a/core/src/com/unciv/logic/HexMath.kt b/core/src/com/unciv/logic/map/HexMath.kt
similarity index 99%
rename from core/src/com/unciv/logic/HexMath.kt
rename to core/src/com/unciv/logic/map/HexMath.kt
index 0eb0d1927c..4358c6c389 100644
--- a/core/src/com/unciv/logic/HexMath.kt
+++ b/core/src/com/unciv/logic/map/HexMath.kt
@@ -1,9 +1,7 @@
-package com.unciv.logic
+package com.unciv.logic.map
 
 import com.badlogic.gdx.math.Vector2
 import com.badlogic.gdx.math.Vector3
-import com.unciv.logic.map.MapParameters
-import com.unciv.logic.map.MapShape
 import kotlin.math.*
 
 @Suppress("MemberVisibilityCanBePrivate", "unused")  // this is a library offering optional services
@@ -238,7 +236,7 @@ object HexMath {
     }
 
     // Statically allocate the Vectors (in World coordinates)
-    // of the 6 clock directions for border and road drawing in TileGroup 
+    // of the 6 clock directions for border and road drawing in TileGroup
     private val clockPositionToWorldVectorMap: Map<Int,Vector2> = mapOf(
         2 to hex2WorldCoords(Vector2(0f, -1f)),
         4 to hex2WorldCoords(Vector2(1f, 0f)),
diff --git a/core/src/com/unciv/logic/map/MapParameters.kt b/core/src/com/unciv/logic/map/MapParameters.kt
index d8f88ebad1..9a6f2d777f 100644
--- a/core/src/com/unciv/logic/map/MapParameters.kt
+++ b/core/src/com/unciv/logic/map/MapParameters.kt
@@ -1,8 +1,8 @@
 package com.unciv.logic.map
 
-import com.unciv.logic.HexMath.getEquivalentHexagonalRadius
-import com.unciv.logic.HexMath.getEquivalentRectangularSize
-import com.unciv.logic.HexMath.getNumberOfTilesInHexagon
+import com.unciv.logic.map.HexMath.getEquivalentHexagonalRadius
+import com.unciv.logic.map.HexMath.getEquivalentRectangularSize
+import com.unciv.logic.map.HexMath.getNumberOfTilesInHexagon
 import com.unciv.logic.IsPartOfGameInfoSerialization
 import com.unciv.models.metadata.BaseRuleset
 
diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt
index 714e382d6d..93cf3e21a4 100644
--- a/core/src/com/unciv/logic/map/TileInfo.kt
+++ b/core/src/com/unciv/logic/map/TileInfo.kt
@@ -3,7 +3,6 @@
 import com.badlogic.gdx.math.Vector2
 import com.unciv.Constants
 import com.unciv.UncivGame
-import com.unciv.logic.HexMath
 import com.unciv.logic.IsPartOfGameInfoSerialization
 import com.unciv.logic.city.CityInfo
 import com.unciv.logic.civilization.CivilizationInfo
diff --git a/core/src/com/unciv/logic/map/TileMap.kt b/core/src/com/unciv/logic/map/TileMap.kt
index acf6e4dbbc..68de96dac8 100644
--- a/core/src/com/unciv/logic/map/TileMap.kt
+++ b/core/src/com/unciv/logic/map/TileMap.kt
@@ -3,12 +3,11 @@ package com.unciv.logic.map
 import com.badlogic.gdx.math.Rectangle
 import com.badlogic.gdx.math.Vector2
 import com.unciv.logic.GameInfo
-import com.unciv.logic.HexMath
 import com.unciv.logic.IsPartOfGameInfoSerialization
 import com.unciv.logic.civilization.CivilizationInfo
 import com.unciv.logic.map.mapgenerator.MapLandmassGenerator
 import com.unciv.models.metadata.Player
-import com.unciv.models.ruleset.Nation
+import com.unciv.models.ruleset.nation.Nation
 import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.ruleset.tile.TerrainType
 import com.unciv.models.ruleset.unique.UniqueType
diff --git a/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt b/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
index b927d55147..72ce527394 100644
--- a/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
+++ b/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
@@ -2,7 +2,7 @@ package com.unciv.logic.map
 
 import com.badlogic.gdx.math.Vector2
 import com.unciv.Constants
-import com.unciv.logic.HexMath.getDistance
+import com.unciv.logic.map.HexMath.getDistance
 import com.unciv.logic.civilization.CivilizationInfo
 import com.unciv.models.helpers.UnitMovementMemoryType
 import com.unciv.models.ruleset.unique.UniqueType
diff --git a/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt b/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt
index d3a4f1b8a1..2daad000f8 100644
--- a/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt
+++ b/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt
@@ -2,7 +2,7 @@ package com.unciv.logic.map.mapgenerator
 
 import com.unciv.Constants
 import com.unciv.UncivGame
-import com.unciv.logic.HexMath
+import com.unciv.logic.map.HexMath
 import com.unciv.logic.civilization.CivilizationInfo
 import com.unciv.logic.map.MapParameters
 import com.unciv.logic.map.MapShape
diff --git a/core/src/com/unciv/logic/map/mapgenerator/MapLandmassGenerator.kt b/core/src/com/unciv/logic/map/mapgenerator/MapLandmassGenerator.kt
index fdd01476fa..c0266376ea 100644
--- a/core/src/com/unciv/logic/map/mapgenerator/MapLandmassGenerator.kt
+++ b/core/src/com/unciv/logic/map/mapgenerator/MapLandmassGenerator.kt
@@ -1,6 +1,6 @@
 package com.unciv.logic.map.mapgenerator
 
-import com.unciv.logic.HexMath
+import com.unciv.logic.map.HexMath
 import com.unciv.logic.map.*
 import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.ruleset.tile.TerrainType
diff --git a/core/src/com/unciv/logic/map/mapgenerator/MapRegions.kt b/core/src/com/unciv/logic/map/mapgenerator/MapRegions.kt
index e98b49af7d..51af361561 100644
--- a/core/src/com/unciv/logic/map/mapgenerator/MapRegions.kt
+++ b/core/src/com/unciv/logic/map/mapgenerator/MapRegions.kt
@@ -3,7 +3,7 @@ package com.unciv.logic.map.mapgenerator
 import com.badlogic.gdx.math.Rectangle
 import com.badlogic.gdx.math.Vector2
 import com.unciv.Constants
-import com.unciv.logic.HexMath
+import com.unciv.logic.map.HexMath
 import com.unciv.logic.civilization.CivilizationInfo
 import com.unciv.logic.map.MapResources
 import com.unciv.logic.map.MapShape
diff --git a/core/src/com/unciv/logic/multiplayer/storage/OnlineMultiplayerFiles.kt b/core/src/com/unciv/logic/multiplayer/storage/OnlineMultiplayerFiles.kt
index a3eced65e8..55589bb899 100644
--- a/core/src/com/unciv/logic/multiplayer/storage/OnlineMultiplayerFiles.kt
+++ b/core/src/com/unciv/logic/multiplayer/storage/OnlineMultiplayerFiles.kt
@@ -4,7 +4,7 @@ import com.unciv.Constants
 import com.unciv.UncivGame
 import com.unciv.logic.GameInfo
 import com.unciv.logic.GameInfoPreview
-import com.unciv.logic.UncivFiles
+import com.unciv.logic.files.UncivFiles
 
 /**
  * Allows access to games stored on a server for multiplayer purposes.
diff --git a/core/src/com/unciv/models/ruleset/Ruleset.kt b/core/src/com/unciv/models/ruleset/Ruleset.kt
index 4c9512f70f..34c5588d0b 100644
--- a/core/src/com/unciv/models/ruleset/Ruleset.kt
+++ b/core/src/com/unciv/models/ruleset/Ruleset.kt
@@ -11,6 +11,10 @@ import com.unciv.models.Counter
 import com.unciv.models.ModConstants
 import com.unciv.models.metadata.BaseRuleset
 import com.unciv.models.metadata.GameParameters
+import com.unciv.models.ruleset.nation.CityStateType
+import com.unciv.models.ruleset.nation.Difficulty
+import com.unciv.models.ruleset.nation.Nation
+import com.unciv.models.ruleset.tech.Era
 import com.unciv.models.ruleset.tech.TechColumn
 import com.unciv.models.ruleset.tech.Technology
 import com.unciv.models.ruleset.tile.Terrain
diff --git a/core/src/com/unciv/models/ruleset/RulesetValidator.kt b/core/src/com/unciv/models/ruleset/RulesetValidator.kt
index 92a2895026..b17b8fd670 100644
--- a/core/src/com/unciv/models/ruleset/RulesetValidator.kt
+++ b/core/src/com/unciv/models/ruleset/RulesetValidator.kt
@@ -3,6 +3,8 @@ package com.unciv.models.ruleset
 import com.badlogic.gdx.graphics.Color
 import com.unciv.Constants
 import com.unciv.logic.map.RoadStatus
+import com.unciv.models.ruleset.nation.getContrastRatio
+import com.unciv.models.ruleset.nation.getRelativeLuminance
 import com.unciv.models.ruleset.tile.TerrainType
 import com.unciv.models.ruleset.unique.IHasUniques
 import com.unciv.models.ruleset.unique.StateForConditionals
diff --git a/core/src/com/unciv/models/ruleset/CityStateType.kt b/core/src/com/unciv/models/ruleset/nation/CityStateType.kt
similarity index 95%
rename from core/src/com/unciv/models/ruleset/CityStateType.kt
rename to core/src/com/unciv/models/ruleset/nation/CityStateType.kt
index c8c53aba1f..25bca2043f 100644
--- a/core/src/com/unciv/models/ruleset/CityStateType.kt
+++ b/core/src/com/unciv/models/ruleset/nation/CityStateType.kt
@@ -1,4 +1,4 @@
-package com.unciv.models.ruleset
+package com.unciv.models.ruleset.nation
 
 import com.unciv.models.ruleset.unique.Unique
 import com.unciv.models.ruleset.unique.UniqueMap
diff --git a/core/src/com/unciv/models/ruleset/Difficulty.kt b/core/src/com/unciv/models/ruleset/nation/Difficulty.kt
similarity index 97%
rename from core/src/com/unciv/models/ruleset/Difficulty.kt
rename to core/src/com/unciv/models/ruleset/nation/Difficulty.kt
index 0e633e8248..77bedcb085 100644
--- a/core/src/com/unciv/models/ruleset/Difficulty.kt
+++ b/core/src/com/unciv/models/ruleset/nation/Difficulty.kt
@@ -1,9 +1,10 @@
-package com.unciv.models.ruleset
+package com.unciv.models.ruleset.nation
 
+import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.ruleset.unique.Unique
 import com.unciv.models.stats.INamed
-import com.unciv.ui.civilopedia.ICivilopediaText
 import com.unciv.ui.civilopedia.FormattedLine
+import com.unciv.ui.civilopedia.ICivilopediaText
 import com.unciv.ui.utils.Fonts
 
 class Difficulty: INamed, ICivilopediaText {
@@ -88,7 +89,7 @@ class Difficulty: INamed, ICivilopediaText {
         if (aiMajorCivBonusStartingUnits.isNotEmpty()) {
             lines += FormattedLine()
             lines += FormattedLine("{Major AI civilization bonus starting units}:", indent = 1)
-            aiMajorCivBonusStartingUnits.groupBy { it }.map { 
+            aiMajorCivBonusStartingUnits.groupBy { it }.map {
                 it.key to it.value.size
             }.forEach {
                 lines += FormattedLine(Unique(if (it.second == 1) "[${it.first}]" else "${it.second} [${it.first}]"), indent = 2)
diff --git a/core/src/com/unciv/models/ruleset/Nation.kt b/core/src/com/unciv/models/ruleset/nation/Nation.kt
similarity index 99%
rename from core/src/com/unciv/models/ruleset/Nation.kt
rename to core/src/com/unciv/models/ruleset/nation/Nation.kt
index b56536f05c..04b3795cb4 100644
--- a/core/src/com/unciv/models/ruleset/Nation.kt
+++ b/core/src/com/unciv/models/ruleset/nation/Nation.kt
@@ -1,7 +1,9 @@
- package com.unciv.models.ruleset
+ package com.unciv.models.ruleset.nation
 
 import com.badlogic.gdx.graphics.Color
 import com.unciv.Constants
+import com.unciv.models.ruleset.Ruleset
+import com.unciv.models.ruleset.RulesetObject
 import com.unciv.models.ruleset.unique.UniqueFlag
 import com.unciv.models.ruleset.unique.UniqueTarget
 import com.unciv.models.ruleset.unique.UniqueType
diff --git a/core/src/com/unciv/models/ruleset/Era.kt b/core/src/com/unciv/models/ruleset/tech/Era.kt
similarity index 95%
rename from core/src/com/unciv/models/ruleset/Era.kt
rename to core/src/com/unciv/models/ruleset/tech/Era.kt
index b15a0bded1..ccb2b5e76e 100644
--- a/core/src/com/unciv/models/ruleset/Era.kt
+++ b/core/src/com/unciv/models/ruleset/tech/Era.kt
@@ -1,6 +1,9 @@
-package com.unciv.models.ruleset
+package com.unciv.models.ruleset.tech
 
 import com.badlogic.gdx.graphics.Color
+import com.unciv.models.ruleset.IRulesetObject
+import com.unciv.models.ruleset.Ruleset
+import com.unciv.models.ruleset.RulesetObject
 import com.unciv.models.ruleset.unique.StateForConditionals
 import com.unciv.models.ruleset.unique.UniqueTarget
 import com.unciv.models.ruleset.unique.UniqueType
diff --git a/core/src/com/unciv/models/translations/TranslationFileWriter.kt b/core/src/com/unciv/models/translations/TranslationFileWriter.kt
index f44f5f6cac..42f80bb1b8 100644
--- a/core/src/com/unciv/models/translations/TranslationFileWriter.kt
+++ b/core/src/com/unciv/models/translations/TranslationFileWriter.kt
@@ -8,6 +8,10 @@ import com.unciv.logic.civilization.managers.SpyAction
 import com.unciv.models.metadata.BaseRuleset
 import com.unciv.models.metadata.LocaleCode
 import com.unciv.models.ruleset.*
+import com.unciv.models.ruleset.nation.CityStateType
+import com.unciv.models.ruleset.nation.Difficulty
+import com.unciv.models.ruleset.nation.Nation
+import com.unciv.models.ruleset.tech.Era
 import com.unciv.models.ruleset.tech.TechColumn
 import com.unciv.models.ruleset.tile.Terrain
 import com.unciv.models.ruleset.tile.TileImprovement
diff --git a/core/src/com/unciv/ui/crashhandling/CrashScreen.kt b/core/src/com/unciv/ui/crashhandling/CrashScreen.kt
index db2ee76c9b..7cb107350b 100644
--- a/core/src/com/unciv/ui/crashhandling/CrashScreen.kt
+++ b/core/src/com/unciv/ui/crashhandling/CrashScreen.kt
@@ -8,7 +8,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.badlogic.gdx.utils.Align
 import com.unciv.Constants
 import com.unciv.UncivGame
-import com.unciv.logic.UncivFiles
+import com.unciv.logic.files.UncivFiles
 import com.unciv.models.ruleset.RulesetCache
 import com.unciv.ui.images.IconTextButton
 import com.unciv.ui.images.ImageGetter
diff --git a/core/src/com/unciv/ui/images/ImageGetter.kt b/core/src/com/unciv/ui/images/ImageGetter.kt
index 689779228a..fcd55f215e 100644
--- a/core/src/com/unciv/ui/images/ImageGetter.kt
+++ b/core/src/com/unciv/ui/images/ImageGetter.kt
@@ -20,10 +20,9 @@ import com.unciv.Constants
 import com.unciv.UncivGame
 import com.unciv.json.json
 import com.unciv.logic.city.PerpetualConstruction
-import com.unciv.models.ruleset.Nation
+import com.unciv.models.ruleset.nation.Nation
 import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.skins.SkinCache
-import com.unciv.models.stats.Stats
 import com.unciv.models.tilesets.TileSetCache
 import com.unciv.ui.utils.*
 import com.unciv.ui.utils.extensions.*
diff --git a/core/src/com/unciv/ui/images/Portrait.kt b/core/src/com/unciv/ui/images/Portrait.kt
index 18ab715ea1..463ee452ae 100644
--- a/core/src/com/unciv/ui/images/Portrait.kt
+++ b/core/src/com/unciv/ui/images/Portrait.kt
@@ -5,7 +5,6 @@ import com.badlogic.gdx.scenes.scene2d.Group
 import com.badlogic.gdx.scenes.scene2d.ui.Image
 import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.badlogic.gdx.utils.Align
-import com.unciv.models.ruleset.Nation
 import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.stats.Stats
 import com.unciv.ui.utils.extensions.center
@@ -15,7 +14,6 @@ import com.unciv.ui.utils.extensions.darken
 import com.unciv.ui.utils.extensions.surroundWithCircle
 import com.unciv.ui.utils.extensions.toGroup
 import com.unciv.ui.utils.extensions.toLabel
-import com.unciv.utils.Log
 
 open class Portrait(val type: Type, val imageName: String, val size: Float, val borderSize: Float = 2f) : Group() {
 
diff --git a/core/src/com/unciv/ui/map/TileGroupMap.kt b/core/src/com/unciv/ui/map/TileGroupMap.kt
index 98962e9b37..f4ffca81fc 100644
--- a/core/src/com/unciv/ui/map/TileGroupMap.kt
+++ b/core/src/com/unciv/ui/map/TileGroupMap.kt
@@ -3,7 +3,7 @@ package com.unciv.ui.map
 import com.badlogic.gdx.graphics.g2d.Batch
 import com.badlogic.gdx.math.Vector2
 import com.badlogic.gdx.scenes.scene2d.Group
-import com.unciv.logic.HexMath
+import com.unciv.logic.map.HexMath
 import com.unciv.logic.map.TileInfo
 import com.unciv.logic.map.TileMap
 import com.unciv.ui.cityscreen.CityTileGroup
diff --git a/core/src/com/unciv/ui/mapeditor/EditorMapHolder.kt b/core/src/com/unciv/ui/mapeditor/EditorMapHolder.kt
index ee7136c99d..e686b1b609 100644
--- a/core/src/com/unciv/ui/mapeditor/EditorMapHolder.kt
+++ b/core/src/com/unciv/ui/mapeditor/EditorMapHolder.kt
@@ -9,7 +9,7 @@ import com.badlogic.gdx.scenes.scene2d.Stage
 import com.badlogic.gdx.scenes.scene2d.Touchable
 import com.badlogic.gdx.scenes.scene2d.actions.Actions
 import com.unciv.UncivGame
-import com.unciv.logic.HexMath
+import com.unciv.logic.map.HexMath
 import com.unciv.logic.map.TileInfo
 import com.unciv.logic.map.TileMap
 import com.unciv.ui.map.TileGroupMap
@@ -17,7 +17,6 @@ import com.unciv.ui.tilegroups.TileGroup
 import com.unciv.ui.tilegroups.TileSetStrings
 import com.unciv.ui.utils.BaseScreen
 import com.unciv.ui.utils.ZoomableScrollPane
-import com.unciv.ui.utils.extensions.center
 import com.unciv.ui.utils.extensions.onClick
 
 
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorEditSubTabs.kt b/core/src/com/unciv/ui/mapeditor/MapEditorEditSubTabs.kt
index cfc88a83e2..f9c2ca9c54 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorEditSubTabs.kt
+++ b/core/src/com/unciv/ui/mapeditor/MapEditorEditSubTabs.kt
@@ -7,7 +7,7 @@ import com.unciv.Constants
 import com.unciv.UncivGame
 import com.unciv.logic.map.RoadStatus
 import com.unciv.logic.map.TileInfo
-import com.unciv.models.ruleset.Nation
+import com.unciv.models.ruleset.nation.Nation
 import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.ruleset.tile.ResourceType
 import com.unciv.models.ruleset.tile.Terrain
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorFilesTable.kt b/core/src/com/unciv/ui/mapeditor/MapEditorFilesTable.kt
index b0803be99d..527791e24d 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorFilesTable.kt
+++ b/core/src/com/unciv/ui/mapeditor/MapEditorFilesTable.kt
@@ -6,7 +6,7 @@ import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
 import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton
-import com.unciv.logic.MapSaver
+import com.unciv.logic.files.MapSaver
 import com.unciv.models.ruleset.RulesetCache
 import com.unciv.ui.images.ImageGetter
 import com.unciv.ui.utils.BaseScreen
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorLoadTab.kt b/core/src/com/unciv/ui/mapeditor/MapEditorLoadTab.kt
index 52c2438b27..8037c07a1e 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorLoadTab.kt
+++ b/core/src/com/unciv/ui/mapeditor/MapEditorLoadTab.kt
@@ -5,7 +5,7 @@ import com.badlogic.gdx.files.FileHandle
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.unciv.Constants
-import com.unciv.logic.MapSaver
+import com.unciv.logic.files.MapSaver
 import com.unciv.logic.UncivShowableException
 import com.unciv.models.ruleset.RulesetCache
 import com.unciv.models.translations.tr
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorOptionsTab.kt b/core/src/com/unciv/ui/mapeditor/MapEditorOptionsTab.kt
index c72e2e58b3..2bfcb7bff2 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorOptionsTab.kt
+++ b/core/src/com/unciv/ui/mapeditor/MapEditorOptionsTab.kt
@@ -5,7 +5,7 @@ import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.scenes.scene2d.ui.ButtonGroup
 import com.badlogic.gdx.scenes.scene2d.ui.CheckBox
 import com.badlogic.gdx.scenes.scene2d.ui.Table
-import com.unciv.logic.MapSaver
+import com.unciv.logic.files.MapSaver
 import com.unciv.models.translations.tr
 import com.unciv.ui.popup.ToastPopup
 import com.unciv.ui.utils.BaseScreen
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorSaveTab.kt b/core/src/com/unciv/ui/mapeditor/MapEditorSaveTab.kt
index 77894cc50c..c59b6a4266 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorSaveTab.kt
+++ b/core/src/com/unciv/ui/mapeditor/MapEditorSaveTab.kt
@@ -5,9 +5,8 @@ import com.badlogic.gdx.files.FileHandle
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.badlogic.gdx.scenes.scene2d.ui.TextField
-import com.unciv.logic.MapSaver
+import com.unciv.logic.files.MapSaver
 import com.unciv.logic.map.MapGeneratedMainType
-import com.unciv.logic.map.MapType
 import com.unciv.logic.map.TileMap
 import com.unciv.models.translations.tr
 import com.unciv.ui.popup.ConfirmPopup
diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorViewTab.kt b/core/src/com/unciv/ui/mapeditor/MapEditorViewTab.kt
index b452fe5fcd..44f30da353 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorViewTab.kt
+++ b/core/src/com/unciv/ui/mapeditor/MapEditorViewTab.kt
@@ -9,7 +9,7 @@ import com.unciv.logic.civilization.CivilizationInfo
 import com.unciv.logic.map.TileInfo
 import com.unciv.logic.map.TileMap
 import com.unciv.models.Counter
-import com.unciv.models.ruleset.Nation
+import com.unciv.models.ruleset.nation.Nation
 import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.stats.Stats
 import com.unciv.models.translations.tr
diff --git a/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt b/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt
index 4c9bb3e106..6a90dc8563 100644
--- a/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt
+++ b/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt
@@ -5,10 +5,9 @@ import com.badlogic.gdx.scenes.scene2d.ui.SelectBox
 import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.badlogic.gdx.utils.Array
 import com.unciv.UncivGame
-import com.unciv.logic.MapSaver
+import com.unciv.logic.files.MapSaver
 import com.unciv.logic.UncivShowableException
 import com.unciv.logic.map.MapGeneratedMainType
-import com.unciv.logic.map.MapType
 import com.unciv.models.ruleset.RulesetCache
 import com.unciv.ui.popup.Popup
 import com.unciv.ui.utils.BaseScreen
diff --git a/core/src/com/unciv/ui/newgamescreen/NationTable.kt b/core/src/com/unciv/ui/newgamescreen/NationTable.kt
index 3e94a0f78b..5f7034b32f 100644
--- a/core/src/com/unciv/ui/newgamescreen/NationTable.kt
+++ b/core/src/com/unciv/ui/newgamescreen/NationTable.kt
@@ -6,7 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.Touchable
 import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.badlogic.gdx.utils.Align
 import com.unciv.Constants
-import com.unciv.models.ruleset.Nation
+import com.unciv.models.ruleset.nation.Nation
 import com.unciv.models.ruleset.Ruleset
 import com.unciv.ui.civilopedia.FormattedLine.IconDisplay
 import com.unciv.ui.civilopedia.MarkupRenderer
diff --git a/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt b/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt
index f2992699d1..eee34475fe 100644
--- a/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt
+++ b/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt
@@ -11,10 +11,9 @@ import com.unciv.UncivGame
 import com.unciv.logic.GameInfo
 import com.unciv.logic.GameStarter
 import com.unciv.logic.IdChecker
-import com.unciv.logic.MapSaver
+import com.unciv.logic.files.MapSaver
 import com.unciv.logic.civilization.PlayerType
 import com.unciv.logic.map.MapGeneratedMainType
-import com.unciv.logic.map.MapType
 import com.unciv.logic.multiplayer.OnlineMultiplayer
 import com.unciv.logic.multiplayer.storage.FileStorageRateLimitReached
 import com.unciv.models.metadata.GameSetupInfo
@@ -25,7 +24,6 @@ import com.unciv.ui.pickerscreens.PickerScreen
 import com.unciv.ui.popup.ConfirmPopup
 import com.unciv.ui.popup.Popup
 import com.unciv.ui.popup.ToastPopup
-import com.unciv.ui.saves.LoadGameScreen
 import com.unciv.ui.utils.BaseScreen
 import com.unciv.ui.utils.ExpanderTab
 import com.unciv.ui.utils.RecreateOnResize
@@ -37,7 +35,6 @@ import com.unciv.ui.utils.extensions.onClick
 import com.unciv.ui.utils.extensions.pad
 import com.unciv.ui.utils.extensions.toLabel
 import com.unciv.ui.utils.extensions.toTextButton
-import com.unciv.ui.worldscreen.WorldScreen
 import com.unciv.utils.Log
 import com.unciv.utils.concurrency.Concurrency
 import com.unciv.utils.concurrency.launchOnGLThread
diff --git a/core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt b/core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt
index 1e5a09a986..fd5031cf2a 100644
--- a/core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt
+++ b/core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt
@@ -14,7 +14,7 @@ import com.unciv.logic.civilization.PlayerType
 import com.unciv.logic.multiplayer.FriendList
 import com.unciv.models.metadata.GameParameters
 import com.unciv.models.metadata.Player
-import com.unciv.models.ruleset.Nation
+import com.unciv.models.ruleset.nation.Nation
 import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.translations.tr
 import com.unciv.ui.audio.MusicMood
diff --git a/core/src/com/unciv/ui/options/DebugTab.kt b/core/src/com/unciv/ui/options/DebugTab.kt
index 3edbc5b8c9..00218897d8 100644
--- a/core/src/com/unciv/ui/options/DebugTab.kt
+++ b/core/src/com/unciv/ui/options/DebugTab.kt
@@ -2,8 +2,8 @@ package com.unciv.ui.options
 
 import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.unciv.UncivGame
-import com.unciv.logic.UncivFiles
-import com.unciv.logic.MapSaver
+import com.unciv.logic.files.UncivFiles
+import com.unciv.logic.files.MapSaver
 import com.unciv.models.ruleset.RulesetCache
 import com.unciv.models.ruleset.tile.ResourceType
 import com.unciv.ui.utils.BaseScreen
diff --git a/core/src/com/unciv/ui/overviewscreen/GlobalPoliticsOverviewTable.kt b/core/src/com/unciv/ui/overviewscreen/GlobalPoliticsOverviewTable.kt
index e70be47540..d68a3f20d8 100644
--- a/core/src/com/unciv/ui/overviewscreen/GlobalPoliticsOverviewTable.kt
+++ b/core/src/com/unciv/ui/overviewscreen/GlobalPoliticsOverviewTable.kt
@@ -9,7 +9,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton
 import com.badlogic.gdx.utils.Align
 import com.unciv.Constants
 import com.unciv.UncivGame
-import com.unciv.logic.HexMath
+import com.unciv.logic.map.HexMath
 import com.unciv.logic.civilization.CivilizationInfo
 import com.unciv.logic.civilization.diplomacy.DiplomacyFlags
 import com.unciv.logic.civilization.diplomacy.DiplomaticStatus
diff --git a/core/src/com/unciv/ui/overviewscreen/WonderOverviewTable.kt b/core/src/com/unciv/ui/overviewscreen/WonderOverviewTable.kt
index cd2cc59fdf..9e331acad3 100644
--- a/core/src/com/unciv/ui/overviewscreen/WonderOverviewTable.kt
+++ b/core/src/com/unciv/ui/overviewscreen/WonderOverviewTable.kt
@@ -8,7 +8,7 @@ import com.unciv.logic.city.CityInfo
 import com.unciv.logic.civilization.CivilizationInfo
 import com.unciv.logic.map.TileInfo
 import com.unciv.models.ruleset.Building
-import com.unciv.models.ruleset.Era
+import com.unciv.models.ruleset.tech.Era
 import com.unciv.models.ruleset.QuestName
 import com.unciv.models.ruleset.unique.UniqueType
 import com.unciv.models.translations.tr
diff --git a/core/src/com/unciv/ui/saves/LoadGameScreen.kt b/core/src/com/unciv/ui/saves/LoadGameScreen.kt
index f8358146e9..61771b84ac 100644
--- a/core/src/com/unciv/ui/saves/LoadGameScreen.kt
+++ b/core/src/com/unciv/ui/saves/LoadGameScreen.kt
@@ -8,7 +8,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton
 import com.badlogic.gdx.utils.SerializationException
 import com.unciv.Constants
 import com.unciv.logic.MissingModsException
-import com.unciv.logic.UncivFiles
+import com.unciv.logic.files.UncivFiles
 import com.unciv.logic.UncivShowableException
 import com.unciv.models.ruleset.RulesetCache
 import com.unciv.models.translations.tr
diff --git a/core/src/com/unciv/ui/saves/SaveGameScreen.kt b/core/src/com/unciv/ui/saves/SaveGameScreen.kt
index 8912a71376..7b85fb80a3 100644
--- a/core/src/com/unciv/ui/saves/SaveGameScreen.kt
+++ b/core/src/com/unciv/ui/saves/SaveGameScreen.kt
@@ -6,7 +6,7 @@ import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.unciv.UncivGame
 import com.unciv.logic.GameInfo
-import com.unciv.logic.UncivFiles
+import com.unciv.logic.files.UncivFiles
 import com.unciv.models.translations.tr
 import com.unciv.ui.popup.ConfirmPopup
 import com.unciv.ui.popup.ToastPopup
diff --git a/core/src/com/unciv/ui/saves/VerticalFileListScrollPane.kt b/core/src/com/unciv/ui/saves/VerticalFileListScrollPane.kt
index ff3df10a68..6aaee63fd0 100644
--- a/core/src/com/unciv/ui/saves/VerticalFileListScrollPane.kt
+++ b/core/src/com/unciv/ui/saves/VerticalFileListScrollPane.kt
@@ -7,7 +7,7 @@ import com.badlogic.gdx.scenes.scene2d.actions.Actions
 import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton
 import com.badlogic.gdx.utils.Align
-import com.unciv.logic.UncivFiles
+import com.unciv.logic.files.UncivFiles
 import com.unciv.ui.images.ImageGetter
 import com.unciv.ui.utils.AutoScrollPane
 import com.unciv.ui.utils.BaseScreen
diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt
index a16c01a4b1..2d132f8b27 100644
--- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt
+++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt
@@ -9,7 +9,7 @@ import com.badlogic.gdx.scenes.scene2d.Touchable
 import com.badlogic.gdx.scenes.scene2d.ui.Image
 import com.badlogic.gdx.utils.Align
 import com.unciv.UncivGame
-import com.unciv.logic.HexMath
+import com.unciv.logic.map.HexMath
 import com.unciv.logic.civilization.CivilizationInfo
 import com.unciv.logic.map.RoadStatus
 import com.unciv.logic.map.TileInfo
diff --git a/core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt b/core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt
index b7a6f6c8f1..43a6811933 100644
--- a/core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt
+++ b/core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt
@@ -26,7 +26,7 @@ import com.unciv.logic.civilization.CivilizationInfo
 import com.unciv.logic.map.MapUnit
 import com.unciv.logic.map.TileInfo
 import com.unciv.logic.map.TileMap
-import com.unciv.models.AttackableTile
+import com.unciv.logic.automation.unit.AttackableTile
 import com.unciv.models.UncivSound
 import com.unciv.models.helpers.MapArrowType
 import com.unciv.models.helpers.MiscArrowTypes
diff --git a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt b/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt
index 85ff4e962a..f1d517e2ff 100644
--- a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt
+++ b/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt
@@ -13,7 +13,7 @@ import com.unciv.logic.battle.CityCombatant
 import com.unciv.logic.battle.ICombatant
 import com.unciv.logic.battle.MapUnitCombatant
 import com.unciv.logic.map.TileInfo
-import com.unciv.models.AttackableTile
+import com.unciv.logic.automation.unit.AttackableTile
 import com.unciv.models.UncivSound
 import com.unciv.models.ruleset.unique.UniqueType
 import com.unciv.models.translations.tr
diff --git a/core/src/com/unciv/ui/worldscreen/minimap/MinimapTile.kt b/core/src/com/unciv/ui/worldscreen/minimap/MinimapTile.kt
index e73845220e..9343ea08cf 100644
--- a/core/src/com/unciv/ui/worldscreen/minimap/MinimapTile.kt
+++ b/core/src/com/unciv/ui/worldscreen/minimap/MinimapTile.kt
@@ -6,7 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.Group
 import com.badlogic.gdx.scenes.scene2d.ui.Image
 import com.badlogic.gdx.utils.Align
 import com.unciv.UncivGame
-import com.unciv.logic.HexMath
+import com.unciv.logic.map.HexMath
 import com.unciv.logic.civilization.CivilizationInfo
 import com.unciv.logic.map.TileInfo
 import com.unciv.ui.images.IconCircleGroup
diff --git a/desktop/src/com/unciv/app/desktop/CustomFileLocationHelperDesktop.kt b/desktop/src/com/unciv/app/desktop/CustomFileLocationHelperDesktop.kt
index deedd2bb75..8f529eb363 100644
--- a/desktop/src/com/unciv/app/desktop/CustomFileLocationHelperDesktop.kt
+++ b/desktop/src/com/unciv/app/desktop/CustomFileLocationHelperDesktop.kt
@@ -1,7 +1,7 @@
 package com.unciv.app.desktop
 
 import com.badlogic.gdx.Gdx
-import com.unciv.logic.CustomFileLocationHelper
+import com.unciv.logic.files.CustomFileLocationHelper
 import java.awt.Component
 import java.awt.EventQueue
 import java.awt.event.WindowEvent
diff --git a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
index a0858d68db..9fe68abd57 100644
--- a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
+++ b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
@@ -11,8 +11,8 @@ import com.sun.jna.Native
 import com.unciv.UncivGame
 import com.unciv.UncivGameParameters
 import com.unciv.json.json
-import com.unciv.logic.SETTINGS_FILE_NAME
-import com.unciv.logic.UncivFiles
+import com.unciv.logic.files.SETTINGS_FILE_NAME
+import com.unciv.logic.files.UncivFiles
 import com.unciv.models.metadata.ScreenSize
 import com.unciv.models.metadata.WindowState
 import com.unciv.ui.utils.Fonts
diff --git a/tests/src/com/unciv/dev/FasterUIDevelopment.kt b/tests/src/com/unciv/dev/FasterUIDevelopment.kt
index 494f2f5884..3ad22ec7b4 100644
--- a/tests/src/com/unciv/dev/FasterUIDevelopment.kt
+++ b/tests/src/com/unciv/dev/FasterUIDevelopment.kt
@@ -12,7 +12,7 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent
 import com.badlogic.gdx.scenes.scene2d.InputListener
 import com.unciv.UncivGame
 import com.unciv.UncivGameParameters
-import com.unciv.logic.UncivFiles
+import com.unciv.logic.files.UncivFiles
 import com.unciv.logic.multiplayer.throttle
 import com.unciv.ui.images.ImageGetter
 import com.unciv.ui.images.ImageWithCustomSize
diff --git a/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt b/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt
index 2251edb1c1..fbbbad62c1 100644
--- a/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt
+++ b/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt
@@ -9,7 +9,7 @@ import com.unciv.logic.civilization.transients.CapitalConnectionsFinder
 import com.unciv.logic.map.RoadStatus
 import com.unciv.logic.map.TileInfo
 import com.unciv.logic.map.TileMap
-import com.unciv.models.ruleset.Nation
+import com.unciv.models.ruleset.nation.Nation
 import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.ruleset.RulesetCache
 import com.unciv.models.ruleset.tile.TerrainType
diff --git a/tests/src/com/unciv/logic/civilization/diplomacy/DiplomacyManagerTests.kt b/tests/src/com/unciv/logic/civilization/diplomacy/DiplomacyManagerTests.kt
index 58fadff864..60a68ae76c 100644
--- a/tests/src/com/unciv/logic/civilization/diplomacy/DiplomacyManagerTests.kt
+++ b/tests/src/com/unciv/logic/civilization/diplomacy/DiplomacyManagerTests.kt
@@ -3,7 +3,7 @@ package com.unciv.logic.civilization.diplomacy
 import com.unciv.logic.GameInfo
 import com.unciv.logic.city.CityInfo
 import com.unciv.logic.civilization.CivilizationInfo
-import com.unciv.models.ruleset.Nation
+import com.unciv.models.ruleset.nation.Nation
 import com.unciv.testing.GdxTestRunner
 import io.mockk.every
 import io.mockk.mockk
diff --git a/tests/src/com/unciv/logic/map/FreshWaterTests.kt b/tests/src/com/unciv/logic/map/FreshWaterTests.kt
index 348f4fdc4c..5974ac551b 100644
--- a/tests/src/com/unciv/logic/map/FreshWaterTests.kt
+++ b/tests/src/com/unciv/logic/map/FreshWaterTests.kt
@@ -2,7 +2,7 @@ package com.unciv.logic.map
 
 import com.badlogic.gdx.math.Vector2
 import com.unciv.Constants
-import com.unciv.logic.MapSaver
+import com.unciv.logic.files.MapSaver
 import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.ruleset.RulesetCache
 import com.unciv.testing.GdxTestRunner
diff --git a/tests/src/com/unciv/logic/map/UnitMovementAlgorithmsTests.kt b/tests/src/com/unciv/logic/map/UnitMovementAlgorithmsTests.kt
index 2f9892da33..2d3ac76a94 100644
--- a/tests/src/com/unciv/logic/map/UnitMovementAlgorithmsTests.kt
+++ b/tests/src/com/unciv/logic/map/UnitMovementAlgorithmsTests.kt
@@ -8,6 +8,8 @@ import com.unciv.logic.civilization.CivilizationInfo
 import com.unciv.logic.civilization.diplomacy.DiplomacyManager
 import com.unciv.logic.civilization.diplomacy.DiplomaticStatus
 import com.unciv.models.ruleset.*
+import com.unciv.models.ruleset.nation.Difficulty
+import com.unciv.models.ruleset.nation.Nation
 import com.unciv.models.ruleset.unit.BaseUnit
 import com.unciv.testing.GdxTestRunner
 import org.junit.Assert
diff --git a/tests/src/com/unciv/logic/map/VisibilityTests.kt b/tests/src/com/unciv/logic/map/VisibilityTests.kt
index 7c3b1c78aa..9439b6fb31 100644
--- a/tests/src/com/unciv/logic/map/VisibilityTests.kt
+++ b/tests/src/com/unciv/logic/map/VisibilityTests.kt
@@ -5,6 +5,7 @@ import com.badlogic.gdx.math.Vector2
 import com.unciv.logic.GameInfo
 import com.unciv.logic.civilization.CivilizationInfo
 import com.unciv.models.ruleset.*
+import com.unciv.models.ruleset.nation.Nation
 import com.unciv.testing.GdxTestRunner
 import org.junit.Before
 import org.junit.Test
diff --git a/tests/src/com/unciv/testing/SerializationTests.kt b/tests/src/com/unciv/testing/SerializationTests.kt
index 26fec85339..d247d14303 100644
--- a/tests/src/com/unciv/testing/SerializationTests.kt
+++ b/tests/src/com/unciv/testing/SerializationTests.kt
@@ -4,7 +4,7 @@ import com.badlogic.gdx.Gdx
 import com.unciv.UncivGame
 import com.unciv.json.json
 import com.unciv.logic.GameInfo
-import com.unciv.logic.UncivFiles
+import com.unciv.logic.files.UncivFiles
 import com.unciv.logic.GameStarter
 import com.unciv.logic.civilization.PlayerType
 import com.unciv.logic.map.MapParameters
diff --git a/tests/src/com/unciv/uniques/TestGame.kt b/tests/src/com/unciv/uniques/TestGame.kt
index c85db60d13..85a61a7626 100644
--- a/tests/src/com/unciv/uniques/TestGame.kt
+++ b/tests/src/com/unciv/uniques/TestGame.kt
@@ -18,7 +18,7 @@ import com.unciv.models.ruleset.Belief
 import com.unciv.models.ruleset.BeliefType
 import com.unciv.models.ruleset.Building
 import com.unciv.models.ruleset.IRulesetObject
-import com.unciv.models.ruleset.Nation
+import com.unciv.models.ruleset.nation.Nation
 import com.unciv.models.ruleset.Policy
 import com.unciv.models.ruleset.Ruleset
 import com.unciv.models.ruleset.RulesetCache