Rationalize module names

341 files changed, 14 insertions, 19 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index cd926085..8dd57a32 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     val kotlinVersion = "1.3.31"
-    id("kotlin-multiplatform") version kotlinVersion apply false
-    id("org.jetbrains.kotlin.jvm") version kotlinVersion apply false
+    kotlin("jvm") version kotlinVersion apply false
+    kotlin("multiplatform") version kotlinVersion apply false
     id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion apply false
 }
 
diff --git a/settings.gradle b/settings.gradle
index 607a2ea4..11445e6c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,7 +10,7 @@ pluginManagement {
 
 rootProject.name = "seven-wonders"
 
-include 'frontend'
-include 'backend'
-include 'game-engine'
-include 'game-model'
+include 'sw-ui'
+include 'sw-server'
+include 'sw-engine'
+include 'sw-common-model'
diff --git a/game-model/build.gradle b/sw-common-model/build.gradle
index 4656b652..b8bdb97b 100644
--- a/game-model/build.gradle
+++ b/sw-common-model/build.gradle
@@ -5,7 +5,6 @@ plugins {
 kotlin {
     jvm()
     js()
-    mingwX64("mingw")
     sourceSets {
         commonMain {
             dependencies {
@@ -39,9 +38,5 @@ kotlin {
                 implementation kotlin('test-js')
             }
         }
-        mingwMain {
-        }
-        mingwTest {
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/Boards.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/Boards.kt
index 698615e9..698615e9 100644
--- a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/Boards.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/Boards.kt
diff --git a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/CustomizableSettings.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/CustomizableSettings.kt
index ac2c2b14..ac2c2b14 100644
--- a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/CustomizableSettings.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/CustomizableSettings.kt
diff --git a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/PlayerTurnInfo.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/PlayerTurnInfo.kt
index c5feb6c5..c5feb6c5 100644
--- a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/PlayerTurnInfo.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/PlayerTurnInfo.kt
diff --git a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/Table.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/Table.kt
index 23ab6ee2..23ab6ee2 100644
--- a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/Table.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/Table.kt
diff --git a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/boards/RelativeBoardPosition.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/boards/RelativeBoardPosition.kt
index 3a8387a3..3a8387a3 100644
--- a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/boards/RelativeBoardPosition.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/boards/RelativeBoardPosition.kt
diff --git a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/cards/Cards.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/cards/Cards.kt
index ab0e0297..ab0e0297 100644
--- a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/cards/Cards.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/cards/Cards.kt
diff --git a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/cards/HandRotationDirection.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/cards/HandRotationDirection.kt
index a10ec19f..a10ec19f 100644
--- a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/cards/HandRotationDirection.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/cards/HandRotationDirection.kt
diff --git a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/moves/MoveType.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/moves/MoveType.kt
index d982c100..d982c100 100644
--- a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/moves/MoveType.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/moves/MoveType.kt
diff --git a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/resources/Provider.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/resources/Provider.kt
index 5d0f3159..5d0f3159 100644
--- a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/resources/Provider.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/resources/Provider.kt
diff --git a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/resources/ResourceTransactions.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/resources/ResourceTransactions.kt
index 77a8670d..77a8670d 100644
--- a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/resources/ResourceTransactions.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/resources/ResourceTransactions.kt
diff --git a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/resources/ResourceType.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/resources/ResourceType.kt
index 5c92b887..5c92b887 100644
--- a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/resources/ResourceType.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/resources/ResourceType.kt
diff --git a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/wonders/Wonder.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/wonders/Wonder.kt
index 6480e935..6480e935 100644
--- a/game-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/wonders/Wonder.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/wonders/Wonder.kt
diff --git a/game-engine/build.gradle.kts b/sw-engine/build.gradle.kts
index 6f135a90..e85d396f 100644
--- a/game-engine/build.gradle.kts
+++ b/sw-engine/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":game-model"))
+    implementation(project(":sw-common-model"))
     implementation(kotlin("stdlib-jdk8"))
     implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
     testImplementation(kotlin("test"))
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/Game.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/Game.kt
index 266a57a5..266a57a5 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/Game.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/Game.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/Player.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/Player.kt
index 2c82b6ff..2c82b6ff 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/Player.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/Player.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/Settings.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/Settings.kt
index ad6cb105..ad6cb105 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/Settings.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/Settings.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/api/Boards.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/api/Boards.kt
index 5dff8636..5dff8636 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/api/Boards.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/api/Boards.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/api/Cards.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/api/Cards.kt
index 7587d69a..7587d69a 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/api/Cards.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/api/Cards.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/api/Table.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/api/Table.kt
index de6e587d..de6e587d 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/api/Table.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/api/Table.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Board.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Board.kt
index a43b8a3c..a43b8a3c 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Board.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Board.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Military.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Military.kt
index 98404d94..98404d94 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Military.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Military.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Science.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Science.kt
index a152c7db..a152c7db 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Science.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Science.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Table.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Table.kt
index 168649f4..168649f4 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Table.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/boards/Table.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Cards.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Cards.kt
index b983aa0e..b983aa0e 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Cards.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Cards.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Decks.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Decks.kt
index f3c5d471..f3c5d471 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Decks.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Decks.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Hands.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Hands.kt
index 19490b9c..19490b9c 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Hands.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Hands.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Requirements.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Requirements.kt
index 27f73109..27f73109 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Requirements.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/Requirements.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/RequirementsSatisfaction.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/RequirementsSatisfaction.kt
index 87b35723..87b35723 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/RequirementsSatisfaction.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/cards/RequirementsSatisfaction.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/GameDefinition.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/GameDefinition.kt
index 43c48aa7..43c48aa7 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/GameDefinition.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/GameDefinition.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/CardDefinition.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/CardDefinition.kt
index 0b7b9229..0b7b9229 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/CardDefinition.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/CardDefinition.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/DecksDefinition.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/DecksDefinition.kt
index b090547d..b090547d 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/DecksDefinition.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/DecksDefinition.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/EffectsDefinition.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/EffectsDefinition.kt
index 4d0348ea..4d0348ea 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/EffectsDefinition.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/EffectsDefinition.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/WonderDefinition.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/WonderDefinition.kt
index fb0eccda..fb0eccda 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/WonderDefinition.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/definitions/WonderDefinition.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializer.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializer.kt
index 9a9a006e..9a9a006e 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializer.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializer.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializer.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializer.kt
index 0970a968..0970a968 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializer.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializer.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionSerializer.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionSerializer.kt
index b766dd31..b766dd31 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionSerializer.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionSerializer.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializer.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializer.kt
index 99c364c5..99c364c5 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializer.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializer.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializer.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializer.kt
index b4784689..b4784689 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializer.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializer.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializer.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializer.kt
index 1b1373ed..1b1373ed 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializer.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializer.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializer.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializer.kt
index d6dc9ae3..d6dc9ae3 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializer.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializer.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/BonusPerBoardElement.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/BonusPerBoardElement.kt
index 04dbf9be..04dbf9be 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/BonusPerBoardElement.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/BonusPerBoardElement.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/Discount.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/Discount.kt
index 981ad9bd..981ad9bd 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/Discount.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/Discount.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/Effect.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/Effect.kt
index 55744669..55744669 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/Effect.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/Effect.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/EndGameEffect.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/EndGameEffect.kt
index b4e7a683..b4e7a683 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/EndGameEffect.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/EndGameEffect.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/GoldIncrease.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/GoldIncrease.kt
index f6e37841..f6e37841 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/GoldIncrease.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/GoldIncrease.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/InstantOwnBoardEffect.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/InstantOwnBoardEffect.kt
index 0b50656c..0b50656c 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/InstantOwnBoardEffect.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/InstantOwnBoardEffect.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/MilitaryReinforcements.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/MilitaryReinforcements.kt
index a168943c..a168943c 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/MilitaryReinforcements.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/MilitaryReinforcements.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/ProductionIncrease.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/ProductionIncrease.kt
index 4bd4a27f..4bd4a27f 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/ProductionIncrease.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/ProductionIncrease.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/RawPointsIncrease.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/RawPointsIncrease.kt
index a47686da..a47686da 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/RawPointsIncrease.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/RawPointsIncrease.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/ScienceProgress.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/ScienceProgress.kt
index 462330db..462330db 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/ScienceProgress.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/ScienceProgress.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/SpecialAbility.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/SpecialAbility.kt
index d271134f..d271134f 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/SpecialAbility.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/SpecialAbility.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/SpecialAbilityActivation.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/SpecialAbilityActivation.kt
index 66521679..66521679 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/SpecialAbilityActivation.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/effects/SpecialAbilityActivation.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/BuildWonderMove.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/BuildWonderMove.kt
index c4508401..c4508401 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/BuildWonderMove.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/BuildWonderMove.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/CardFromHandMove.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/CardFromHandMove.kt
index 17d612af..17d612af 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/CardFromHandMove.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/CardFromHandMove.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/CopyGuildMove.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/CopyGuildMove.kt
index 3a7fe792..3a7fe792 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/CopyGuildMove.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/CopyGuildMove.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/DiscardMove.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/DiscardMove.kt
index a8cd42a6..a8cd42a6 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/DiscardMove.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/DiscardMove.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/Move.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/Move.kt
index 98a96fd9..98a96fd9 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/Move.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/Move.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/PlayCardMove.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/PlayCardMove.kt
index 3596b164..3596b164 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/PlayCardMove.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/PlayCardMove.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/PlayFreeCardMove.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/PlayFreeCardMove.kt
index bac185d9..bac185d9 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/PlayFreeCardMove.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/moves/PlayFreeCardMove.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/BestPriceCalculator.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/BestPriceCalculator.kt
index dea6f2c2..dea6f2c2 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/BestPriceCalculator.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/BestPriceCalculator.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/Production.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/Production.kt
index 66a63463..66a63463 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/Production.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/Production.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/ResourceTransactions.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/ResourceTransactions.kt
index 4a3a483c..4a3a483c 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/ResourceTransactions.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/ResourceTransactions.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/Resources.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/Resources.kt
index 6ffda080..6ffda080 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/Resources.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/Resources.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/TradingRules.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/TradingRules.kt
index a006fadf..a006fadf 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/TradingRules.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/resources/TradingRules.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/score/Score.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/score/Score.kt
index c1d34d5d..c1d34d5d 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/score/Score.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/score/Score.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/wonders/Wonder.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/wonders/Wonder.kt
index fc2e8676..fc2e8676 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/wonders/Wonder.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/wonders/Wonder.kt
diff --git a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/wonders/WonderStage.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/wonders/WonderStage.kt
index 311e589e..311e589e 100644
--- a/game-engine/src/main/kotlin/org/luxons/sevenwonders/game/wonders/WonderStage.kt
+++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/game/wonders/WonderStage.kt
diff --git a/game-engine/src/main/resources/org/luxons/sevenwonders/game/data/cards.json b/sw-engine/src/main/resources/org/luxons/sevenwonders/game/data/cards.json
index bd2d5893..bd2d5893 100644
--- a/game-engine/src/main/resources/org/luxons/sevenwonders/game/data/cards.json
+++ b/sw-engine/src/main/resources/org/luxons/sevenwonders/game/data/cards.json
diff --git a/game-engine/src/main/resources/org/luxons/sevenwonders/game/data/global_rules.json b/sw-engine/src/main/resources/org/luxons/sevenwonders/game/data/global_rules.json
index 9b486fe6..9b486fe6 100644
--- a/game-engine/src/main/resources/org/luxons/sevenwonders/game/data/global_rules.json
+++ b/sw-engine/src/main/resources/org/luxons/sevenwonders/game/data/global_rules.json
diff --git a/game-engine/src/main/resources/org/luxons/sevenwonders/game/data/wonders.json b/sw-engine/src/main/resources/org/luxons/sevenwonders/game/data/wonders.json
index fc3ac69d..fc3ac69d 100644
--- a/game-engine/src/main/resources/org/luxons/sevenwonders/game/data/wonders.json
+++ b/sw-engine/src/main/resources/org/luxons/sevenwonders/game/data/wonders.json
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt
index a63ccdd6..a63ccdd6 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/api/BoardsKtTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/api/BoardsKtTest.kt
index 244c30a8..244c30a8 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/api/BoardsKtTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/api/BoardsKtTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/api/TableTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/api/TableTest.kt
index 19e4e8e8..19e4e8e8 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/api/TableTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/api/TableTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/BoardTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/BoardTest.kt
index d1b7c239..d1b7c239 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/BoardTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/BoardTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/MilitaryTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/MilitaryTest.kt
index 248d43dd..248d43dd 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/MilitaryTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/MilitaryTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/RelativeBoardPositionTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/RelativeBoardPositionTest.kt
index 2038a676..2038a676 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/RelativeBoardPositionTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/RelativeBoardPositionTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/ScienceTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/ScienceTest.kt
index 80d6773d..80d6773d 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/ScienceTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/ScienceTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/CardBackTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/CardBackTest.kt
index 66ff7a0e..66ff7a0e 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/CardBackTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/CardBackTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/CardTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/CardTest.kt
index b6fecbd0..b6fecbd0 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/CardTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/CardTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/DecksTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/DecksTest.kt
index f6c45720..f6c45720 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/DecksTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/DecksTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/HandRotationDirectionTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/HandRotationDirectionTest.kt
index 4582c4a1..4582c4a1 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/HandRotationDirectionTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/HandRotationDirectionTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/HandsTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/HandsTest.kt
index c7ff9106..c7ff9106 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/HandsTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/HandsTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/RequirementsTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/RequirementsTest.kt
index eccca3e7..eccca3e7 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/RequirementsTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/RequirementsTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/GameDefinitionTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/GameDefinitionTest.kt
index 4317a933..4317a933 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/GameDefinitionTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/GameDefinitionTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.kt
index 0b561938..0b561938 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializerTest.kt
index 9b44fad2..9b44fad2 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializerTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializerTest.kt
index 31d695e8..31d695e8 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializerTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionSerializerTest.kt
index 265087ba..265087ba 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionSerializerTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializerTest.kt
index f2b07e84..f2b07e84 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializerTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializerTest.kt
index 8c1b421d..8c1b421d 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializerTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializerTest.kt
index c146a948..c146a948 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializerTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializerTest.kt
index 95d72517..95d72517 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializerTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/BonusPerBoardElementTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/BonusPerBoardElementTest.kt
index 700eddb1..700eddb1 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/BonusPerBoardElementTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/BonusPerBoardElementTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/DiscountTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/DiscountTest.kt
index d92c8d24..d92c8d24 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/DiscountTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/DiscountTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/GoldIncreaseTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/GoldIncreaseTest.kt
index 993cc273..993cc273 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/GoldIncreaseTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/GoldIncreaseTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/MilitaryReinforcementsTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/MilitaryReinforcementsTest.kt
index 0d5765da..0d5765da 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/MilitaryReinforcementsTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/MilitaryReinforcementsTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/ProductionIncreaseTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/ProductionIncreaseTest.kt
index c016ccc9..c016ccc9 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/ProductionIncreaseTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/ProductionIncreaseTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/RawPointsIncreaseTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/RawPointsIncreaseTest.kt
index 9cb10562..9cb10562 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/RawPointsIncreaseTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/RawPointsIncreaseTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/ScienceProgressTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/ScienceProgressTest.kt
index 7e566a8c..7e566a8c 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/ScienceProgressTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/ScienceProgressTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/SpecialAbilityActivationTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/SpecialAbilityActivationTest.kt
index aae3be8e..aae3be8e 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/SpecialAbilityActivationTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/SpecialAbilityActivationTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/moves/BuildWonderMoveTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/moves/BuildWonderMoveTest.kt
index 21b92872..21b92872 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/moves/BuildWonderMoveTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/moves/BuildWonderMoveTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/BestPriceCalculatorTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/BestPriceCalculatorTest.kt
index b4c3b886..b4c3b886 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/BestPriceCalculatorTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/BestPriceCalculatorTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ProductionTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ProductionTest.kt
index 0e865921..0e865921 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ProductionTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ProductionTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ResourceTransactionsTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ResourceTransactionsTest.kt
index 7e6d7816..7e6d7816 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ResourceTransactionsTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ResourceTransactionsTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ResourcesTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ResourcesTest.kt
index 634a25c7..634a25c7 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ResourcesTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ResourcesTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/TradingRulesTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/TradingRulesTest.kt
index 38953529..38953529 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/TradingRulesTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/TradingRulesTest.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/test/TestUtils.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/test/TestUtils.kt
index 78386b3d..78386b3d 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/test/TestUtils.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/test/TestUtils.kt
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/wonders/WonderTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/wonders/WonderTest.kt
index 491d13fb..491d13fb 100644
--- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/wonders/WonderTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/wonders/WonderTest.kt
diff --git a/backend/build.gradle.kts b/sw-server/build.gradle.kts
index 8bb77645..99374cdf 100644
--- a/backend/build.gradle.kts
+++ b/sw-server/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("org.jetbrains.kotlin.jvm")
-    id("org.jetbrains.kotlin.plugin.spring")
+    kotlin("jvm")
+    kotlin("plugin.spring")
     id("org.springframework.boot") version "2.1.3.RELEASE"
     id("org.jlleitschuh.gradle.ktlint") version "7.1.0"
 }
@@ -12,8 +12,8 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
 }
 
 dependencies {
-    compile(project(":game-model"))
-    compile(project(":game-engine"))
+    compile(project(":sw-common-model"))
+    compile(project(":sw-engine"))
     compile(kotlin("stdlib-jdk8"))
     compile(kotlin("reflect")) // required by Spring 5
 
@@ -39,10 +39,10 @@ dependencies {
 
 // packages the frontend app within the jar
 tasks.bootJar {
-    from("../frontend/build") {
+    from("../sw-ui/build") {
         into("static")
     }
 }
 
 // make sure we build the frontend before creating the jar
-tasks.bootJar.get().dependsOn(":frontend:assemble")
+tasks.bootJar.get().dependsOn(":sw-ui:assemble")
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/SevenWonders.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/SevenWonders.kt
index 04f03956..04f03956 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/SevenWonders.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/SevenWonders.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/actions/ChooseNameAction.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/ChooseNameAction.kt
index ab444780..ab444780 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/actions/ChooseNameAction.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/ChooseNameAction.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/actions/CreateGameAction.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/CreateGameAction.kt
index c10f9c34..c10f9c34 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/actions/CreateGameAction.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/CreateGameAction.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/actions/JoinGameAction.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/JoinGameAction.kt
index 002309b3..002309b3 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/actions/JoinGameAction.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/JoinGameAction.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/actions/PrepareMoveAction.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/PrepareMoveAction.kt
index 6b39c486..6b39c486 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/actions/PrepareMoveAction.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/PrepareMoveAction.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/actions/ReorderPlayersAction.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/ReorderPlayersAction.kt
index 79a32137..79a32137 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/actions/ReorderPlayersAction.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/ReorderPlayersAction.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/actions/UpdateSettingsAction.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/UpdateSettingsAction.kt
index d13e5b45..d13e5b45 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/actions/UpdateSettingsAction.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/UpdateSettingsAction.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/api/LobbyDTO.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/api/LobbyDTO.kt
index b4445f32..b4445f32 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/api/LobbyDTO.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/api/LobbyDTO.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/api/PlayerDTO.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/api/PlayerDTO.kt
index 54c69122..54c69122 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/api/PlayerDTO.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/api/PlayerDTO.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/config/AnonymousUsersHandshakeHandler.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/config/AnonymousUsersHandshakeHandler.kt
index db707d1b..db707d1b 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/config/AnonymousUsersHandshakeHandler.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/config/AnonymousUsersHandshakeHandler.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/config/TopicSubscriptionInterceptor.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/config/TopicSubscriptionInterceptor.kt
index f4c55c2c..f4c55c2c 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/config/TopicSubscriptionInterceptor.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/config/TopicSubscriptionInterceptor.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/config/WebSecurityConfig.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/config/WebSecurityConfig.kt
index 06b2bc90..06b2bc90 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/config/WebSecurityConfig.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/config/WebSecurityConfig.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/config/WebSocketConfig.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/config/WebSocketConfig.kt
index 743e3d1a..743e3d1a 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/config/WebSocketConfig.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/config/WebSocketConfig.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/controllers/GameBrowserController.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/controllers/GameBrowserController.kt
index f856365f..f856365f 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/controllers/GameBrowserController.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/controllers/GameBrowserController.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/controllers/GameController.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/controllers/GameController.kt
index b37c9c7c..b37c9c7c 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/controllers/GameController.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/controllers/GameController.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/controllers/HomeController.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/controllers/HomeController.kt
index bd672000..bd672000 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/controllers/HomeController.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/controllers/HomeController.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/controllers/LobbyController.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/controllers/LobbyController.kt
index 4e4120a9..4e4120a9 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/controllers/LobbyController.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/controllers/LobbyController.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/doc/Documentation.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/doc/Documentation.kt
index 3b04356a..3b04356a 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/doc/Documentation.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/doc/Documentation.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/errors/ErrorDTO.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/errors/ErrorDTO.kt
index c3eae0b5..c3eae0b5 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/errors/ErrorDTO.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/errors/ErrorDTO.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/errors/ExceptionHandler.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/errors/ExceptionHandler.kt
index 76d01f5f..76d01f5f 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/errors/ExceptionHandler.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/errors/ExceptionHandler.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/lobby/Lobby.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/lobby/Lobby.kt
index 08249193..08249193 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/lobby/Lobby.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/lobby/Lobby.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/lobby/Player.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/lobby/Player.kt
index d6e9b344..d6e9b344 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/lobby/Player.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/lobby/Player.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/repositories/LobbyRepository.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/repositories/LobbyRepository.kt
index 768aa659..768aa659 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/repositories/LobbyRepository.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/repositories/LobbyRepository.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/repositories/PlayerRepository.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/repositories/PlayerRepository.kt
index 4d552eaa..4d552eaa 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/repositories/PlayerRepository.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/repositories/PlayerRepository.kt
diff --git a/backend/src/main/kotlin/org/luxons/sevenwonders/validation/DestinationAccessValidator.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/validation/DestinationAccessValidator.kt
index 5f704357..5f704357 100644
--- a/backend/src/main/kotlin/org/luxons/sevenwonders/validation/DestinationAccessValidator.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/validation/DestinationAccessValidator.kt
diff --git a/backend/src/main/resources/application.properties b/sw-server/src/main/resources/application.properties
index aa2e5d12..aa2e5d12 100644
--- a/backend/src/main/resources/application.properties
+++ b/sw-server/src/main/resources/application.properties
diff --git a/backend/src/main/resources/static/images/tokens/coin1.png b/sw-server/src/main/resources/static/images/tokens/coin1.png
index dd57e5f0..dd57e5f0 100644
--- a/backend/src/main/resources/static/images/tokens/coin1.png
+++ b/sw-server/src/main/resources/static/images/tokens/coin1.png
diff --git a/backend/src/main/resources/static/images/tokens/coin3.png b/sw-server/src/main/resources/static/images/tokens/coin3.png
index 546d41b6..546d41b6 100644
--- a/backend/src/main/resources/static/images/tokens/coin3.png
+++ b/sw-server/src/main/resources/static/images/tokens/coin3.png
diff --git a/backend/src/main/resources/static/images/tokens/free.png b/sw-server/src/main/resources/static/images/tokens/free.png
index 1c8d0782..1c8d0782 100644
--- a/backend/src/main/resources/static/images/tokens/free.png
+++ b/sw-server/src/main/resources/static/images/tokens/free.png
diff --git a/backend/src/main/resources/static/images/tokens/pyramid-stage0.png b/sw-server/src/main/resources/static/images/tokens/pyramid-stage0.png
index b6a3977f..b6a3977f 100644
--- a/backend/src/main/resources/static/images/tokens/pyramid-stage0.png
+++ b/sw-server/src/main/resources/static/images/tokens/pyramid-stage0.png
diff --git a/backend/src/main/resources/static/images/tokens/pyramid-stage1.png b/sw-server/src/main/resources/static/images/tokens/pyramid-stage1.png
index ead4a34e..ead4a34e 100644
--- a/backend/src/main/resources/static/images/tokens/pyramid-stage1.png
+++ b/sw-server/src/main/resources/static/images/tokens/pyramid-stage1.png
diff --git a/backend/src/main/resources/static/images/tokens/pyramid-stage2.png b/sw-server/src/main/resources/static/images/tokens/pyramid-stage2.png
index 7239a3a4..7239a3a4 100644
--- a/backend/src/main/resources/static/images/tokens/pyramid-stage2.png
+++ b/sw-server/src/main/resources/static/images/tokens/pyramid-stage2.png
diff --git a/backend/src/main/resources/static/images/tokens/pyramid-stage3.png b/sw-server/src/main/resources/static/images/tokens/pyramid-stage3.png
index cab9912b..cab9912b 100644
--- a/backend/src/main/resources/static/images/tokens/pyramid-stage3.png
+++ b/sw-server/src/main/resources/static/images/tokens/pyramid-stage3.png
diff --git a/backend/src/main/resources/static/images/tokens/pyramid.png b/sw-server/src/main/resources/static/images/tokens/pyramid.png
index 074247da..074247da 100644
--- a/backend/src/main/resources/static/images/tokens/pyramid.png
+++ b/sw-server/src/main/resources/static/images/tokens/pyramid.png
diff --git a/backend/src/main/resources/static/images/tokens/victory1.png b/sw-server/src/main/resources/static/images/tokens/victory1.png
index 6b9aff29..6b9aff29 100644
--- a/backend/src/main/resources/static/images/tokens/victory1.png
+++ b/sw-server/src/main/resources/static/images/tokens/victory1.png
diff --git a/backend/src/main/resources/static/images/tokens/victory3.png b/sw-server/src/main/resources/static/images/tokens/victory3.png
index 474cb30c..474cb30c 100644
--- a/backend/src/main/resources/static/images/tokens/victory3.png
+++ b/sw-server/src/main/resources/static/images/tokens/victory3.png
diff --git a/backend/src/main/resources/static/images/tokens/victory5.png b/sw-server/src/main/resources/static/images/tokens/victory5.png
index ad042119..ad042119 100644
--- a/backend/src/main/resources/static/images/tokens/victory5.png
+++ b/sw-server/src/main/resources/static/images/tokens/victory5.png
diff --git a/backend/src/main/resources/static/images/tokens/victoryminus1.png b/sw-server/src/main/resources/static/images/tokens/victoryminus1.png
index 00a615c7..00a615c7 100644
--- a/backend/src/main/resources/static/images/tokens/victoryminus1.png
+++ b/sw-server/src/main/resources/static/images/tokens/victoryminus1.png
diff --git a/backend/src/test/kotlin/org/luxons/sevenwonders/SevenWondersTest.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/SevenWondersTest.kt
index 01de366a..01de366a 100644
--- a/backend/src/test/kotlin/org/luxons/sevenwonders/SevenWondersTest.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/SevenWondersTest.kt
diff --git a/backend/src/test/kotlin/org/luxons/sevenwonders/controllers/GameBrowserControllerTest.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/controllers/GameBrowserControllerTest.kt
index 343b7f34..343b7f34 100644
--- a/backend/src/test/kotlin/org/luxons/sevenwonders/controllers/GameBrowserControllerTest.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/controllers/GameBrowserControllerTest.kt
diff --git a/backend/src/test/kotlin/org/luxons/sevenwonders/controllers/HomeControllerTest.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/controllers/HomeControllerTest.kt
index 3374a025..3374a025 100644
--- a/backend/src/test/kotlin/org/luxons/sevenwonders/controllers/HomeControllerTest.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/controllers/HomeControllerTest.kt
diff --git a/backend/src/test/kotlin/org/luxons/sevenwonders/controllers/LobbyControllerTest.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/controllers/LobbyControllerTest.kt
index a140e000..a140e000 100644
--- a/backend/src/test/kotlin/org/luxons/sevenwonders/controllers/LobbyControllerTest.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/controllers/LobbyControllerTest.kt
diff --git a/backend/src/test/kotlin/org/luxons/sevenwonders/controllers/TestPrincipal.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/controllers/TestPrincipal.kt
index 76b0f8fa..76b0f8fa 100644
--- a/backend/src/test/kotlin/org/luxons/sevenwonders/controllers/TestPrincipal.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/controllers/TestPrincipal.kt
diff --git a/backend/src/test/kotlin/org/luxons/sevenwonders/lobby/LobbyTest.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/lobby/LobbyTest.kt
index 967a97e2..967a97e2 100644
--- a/backend/src/test/kotlin/org/luxons/sevenwonders/lobby/LobbyTest.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/lobby/LobbyTest.kt
diff --git a/backend/src/test/kotlin/org/luxons/sevenwonders/repositories/LobbyRepositoryTest.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/repositories/LobbyRepositoryTest.kt
index 446feee6..446feee6 100644
--- a/backend/src/test/kotlin/org/luxons/sevenwonders/repositories/LobbyRepositoryTest.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/repositories/LobbyRepositoryTest.kt
diff --git a/backend/src/test/kotlin/org/luxons/sevenwonders/repositories/PlayerRepositoryTest.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/repositories/PlayerRepositoryTest.kt
index aeedc54c..aeedc54c 100644
--- a/backend/src/test/kotlin/org/luxons/sevenwonders/repositories/PlayerRepositoryTest.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/repositories/PlayerRepositoryTest.kt
diff --git a/backend/src/test/kotlin/org/luxons/sevenwonders/test/TestUtils.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/test/TestUtils.kt
index 9f328c5f..9f328c5f 100644
--- a/backend/src/test/kotlin/org/luxons/sevenwonders/test/TestUtils.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/test/TestUtils.kt
diff --git a/backend/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersClient.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersClient.kt
index ee5827cc..ee5827cc 100644
--- a/backend/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersClient.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersClient.kt
diff --git a/backend/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersSession.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersSession.kt
index 70031a71..70031a71 100644
--- a/backend/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersSession.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersSession.kt
diff --git a/backend/src/test/kotlin/org/luxons/sevenwonders/validation/DestinationAccessValidatorTest.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/validation/DestinationAccessValidatorTest.kt
index 85d03e99..85d03e99 100644
--- a/backend/src/test/kotlin/org/luxons/sevenwonders/validation/DestinationAccessValidatorTest.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/validation/DestinationAccessValidatorTest.kt
diff --git a/frontend/.editorconfig b/sw-ui/.editorconfig
index 32c3b3d4..32c3b3d4 100644
--- a/frontend/.editorconfig
+++ b/sw-ui/.editorconfig
diff --git a/frontend/.eslintrc b/sw-ui/.eslintrc
index e100aaa5..e100aaa5 100644
--- a/frontend/.eslintrc
+++ b/sw-ui/.eslintrc
diff --git a/frontend/.gitignore b/sw-ui/.gitignore
index 3c3629e6..3c3629e6 100644
--- a/frontend/.gitignore
+++ b/sw-ui/.gitignore
diff --git a/frontend/README.md b/sw-ui/README.md
index bdb88df6..bdb88df6 100644
--- a/frontend/README.md
+++ b/sw-ui/README.md
diff --git a/frontend/build.gradle b/sw-ui/build.gradle
index 61f01053..61f01053 100644
--- a/frontend/build.gradle
+++ b/sw-ui/build.gradle
diff --git a/frontend/package.json b/sw-ui/package.json
index 9e549a75..9e549a75 100644
--- a/frontend/package.json
+++ b/sw-ui/package.json
diff --git a/frontend/public/favicon.ico b/sw-ui/public/favicon.ico
index 5c125de5..5c125de5 100644
--- a/frontend/public/favicon.ico
+++ b/sw-ui/public/favicon.ico
diff --git a/frontend/public/images/cards/academy.png b/sw-ui/public/images/cards/academy.png
index d2a75075..d2a75075 100644
--- a/frontend/public/images/cards/academy.png
+++ b/sw-ui/public/images/cards/academy.png
diff --git a/frontend/public/images/cards/altar.png b/sw-ui/public/images/cards/altar.png
index bbde8f2f..bbde8f2f 100644
--- a/frontend/public/images/cards/altar.png
+++ b/sw-ui/public/images/cards/altar.png
diff --git a/frontend/public/images/cards/apothecary.png b/sw-ui/public/images/cards/apothecary.png
index 01804c0a..01804c0a 100644
--- a/frontend/public/images/cards/apothecary.png
+++ b/sw-ui/public/images/cards/apothecary.png
diff --git a/frontend/public/images/cards/aqueduct.png b/sw-ui/public/images/cards/aqueduct.png
index c29d9566..c29d9566 100644
--- a/frontend/public/images/cards/aqueduct.png
+++ b/sw-ui/public/images/cards/aqueduct.png
diff --git a/frontend/public/images/cards/archeryrange.png b/sw-ui/public/images/cards/archeryrange.png
index 15c6edda..15c6edda 100644
--- a/frontend/public/images/cards/archeryrange.png
+++ b/sw-ui/public/images/cards/archeryrange.png
diff --git a/frontend/public/images/cards/arena.png b/sw-ui/public/images/cards/arena.png
index 7dc76961..7dc76961 100644
--- a/frontend/public/images/cards/arena.png
+++ b/sw-ui/public/images/cards/arena.png
diff --git a/frontend/public/images/cards/arsenal.png b/sw-ui/public/images/cards/arsenal.png
index fc3f4a27..fc3f4a27 100644
--- a/frontend/public/images/cards/arsenal.png
+++ b/sw-ui/public/images/cards/arsenal.png
diff --git a/frontend/public/images/cards/back/age1.png b/sw-ui/public/images/cards/back/age1.png
index a06332d7..a06332d7 100644
--- a/frontend/public/images/cards/back/age1.png
+++ b/sw-ui/public/images/cards/back/age1.png
diff --git a/frontend/public/images/cards/back/age2.png b/sw-ui/public/images/cards/back/age2.png
index 9b52aa4e..9b52aa4e 100644
--- a/frontend/public/images/cards/back/age2.png
+++ b/sw-ui/public/images/cards/back/age2.png
diff --git a/frontend/public/images/cards/back/age3.png b/sw-ui/public/images/cards/back/age3.png
index 86c983ee..86c983ee 100644
--- a/frontend/public/images/cards/back/age3.png
+++ b/sw-ui/public/images/cards/back/age3.png
diff --git a/frontend/public/images/cards/barracks.png b/sw-ui/public/images/cards/barracks.png
index f5a68c17..f5a68c17 100644
--- a/frontend/public/images/cards/barracks.png
+++ b/sw-ui/public/images/cards/barracks.png
diff --git a/frontend/public/images/cards/baths.png b/sw-ui/public/images/cards/baths.png
index 3d99d59d..3d99d59d 100644
--- a/frontend/public/images/cards/baths.png
+++ b/sw-ui/public/images/cards/baths.png
diff --git a/frontend/public/images/cards/bazar.png b/sw-ui/public/images/cards/bazar.png
index f36e25c2..f36e25c2 100644
--- a/frontend/public/images/cards/bazar.png
+++ b/sw-ui/public/images/cards/bazar.png
diff --git a/frontend/public/images/cards/brickyard.png b/sw-ui/public/images/cards/brickyard.png
index ae0b7e9b..ae0b7e9b 100644
--- a/frontend/public/images/cards/brickyard.png
+++ b/sw-ui/public/images/cards/brickyard.png
diff --git a/frontend/public/images/cards/buildersguild.png b/sw-ui/public/images/cards/buildersguild.png
index f5402611..f5402611 100644
--- a/frontend/public/images/cards/buildersguild.png
+++ b/sw-ui/public/images/cards/buildersguild.png
diff --git a/frontend/public/images/cards/caravansery.png b/sw-ui/public/images/cards/caravansery.png
index 997bb102..997bb102 100644
--- a/frontend/public/images/cards/caravansery.png
+++ b/sw-ui/public/images/cards/caravansery.png
diff --git a/frontend/public/images/cards/chamberofcommerce.png b/sw-ui/public/images/cards/chamberofcommerce.png
index 44b5af28..44b5af28 100644
--- a/frontend/public/images/cards/chamberofcommerce.png
+++ b/sw-ui/public/images/cards/chamberofcommerce.png
diff --git a/frontend/public/images/cards/circus.png b/sw-ui/public/images/cards/circus.png
index b1ec4d8b..b1ec4d8b 100644
--- a/frontend/public/images/cards/circus.png
+++ b/sw-ui/public/images/cards/circus.png
diff --git a/frontend/public/images/cards/claypit.png b/sw-ui/public/images/cards/claypit.png
index 5442248e..5442248e 100644
--- a/frontend/public/images/cards/claypit.png
+++ b/sw-ui/public/images/cards/claypit.png
diff --git a/frontend/public/images/cards/claypool.png b/sw-ui/public/images/cards/claypool.png
index 873cad47..873cad47 100644
--- a/frontend/public/images/cards/claypool.png
+++ b/sw-ui/public/images/cards/claypool.png
diff --git a/frontend/public/images/cards/courthouse.png b/sw-ui/public/images/cards/courthouse.png
index 394901f2..394901f2 100644
--- a/frontend/public/images/cards/courthouse.png
+++ b/sw-ui/public/images/cards/courthouse.png
diff --git a/frontend/public/images/cards/craftsmensguild.png b/sw-ui/public/images/cards/craftsmensguild.png
index 09bff60e..09bff60e 100644
--- a/frontend/public/images/cards/craftsmensguild.png
+++ b/sw-ui/public/images/cards/craftsmensguild.png
diff --git a/frontend/public/images/cards/dispensary.png b/sw-ui/public/images/cards/dispensary.png
index 4917166b..4917166b 100644
--- a/frontend/public/images/cards/dispensary.png
+++ b/sw-ui/public/images/cards/dispensary.png
diff --git a/frontend/public/images/cards/easttradingpost.png b/sw-ui/public/images/cards/easttradingpost.png
index 0c67cc78..0c67cc78 100644
--- a/frontend/public/images/cards/easttradingpost.png
+++ b/sw-ui/public/images/cards/easttradingpost.png
diff --git a/frontend/public/images/cards/excavation.png b/sw-ui/public/images/cards/excavation.png
index 0fe1b01f..0fe1b01f 100644
--- a/frontend/public/images/cards/excavation.png
+++ b/sw-ui/public/images/cards/excavation.png
diff --git a/frontend/public/images/cards/forestcave.png b/sw-ui/public/images/cards/forestcave.png
index 262fffc6..262fffc6 100644
--- a/frontend/public/images/cards/forestcave.png
+++ b/sw-ui/public/images/cards/forestcave.png
diff --git a/frontend/public/images/cards/fortifications.png b/sw-ui/public/images/cards/fortifications.png
index 3e113473..3e113473 100644
--- a/frontend/public/images/cards/fortifications.png
+++ b/sw-ui/public/images/cards/fortifications.png
diff --git a/frontend/public/images/cards/forum.png b/sw-ui/public/images/cards/forum.png
index d6262158..d6262158 100644
--- a/frontend/public/images/cards/forum.png
+++ b/sw-ui/public/images/cards/forum.png
diff --git a/frontend/public/images/cards/foundry.png b/sw-ui/public/images/cards/foundry.png
index da95a48e..da95a48e 100644
--- a/frontend/public/images/cards/foundry.png
+++ b/sw-ui/public/images/cards/foundry.png
diff --git a/frontend/public/images/cards/gardens.png b/sw-ui/public/images/cards/gardens.png
index 9a49a0ad..9a49a0ad 100644
--- a/frontend/public/images/cards/gardens.png
+++ b/sw-ui/public/images/cards/gardens.png
diff --git a/frontend/public/images/cards/glassworks.png b/sw-ui/public/images/cards/glassworks.png
index 285d7d54..285d7d54 100644
--- a/frontend/public/images/cards/glassworks.png
+++ b/sw-ui/public/images/cards/glassworks.png
diff --git a/frontend/public/images/cards/guardtower.png b/sw-ui/public/images/cards/guardtower.png
index 524b06f3..524b06f3 100644
--- a/frontend/public/images/cards/guardtower.png
+++ b/sw-ui/public/images/cards/guardtower.png
diff --git a/frontend/public/images/cards/haven.png b/sw-ui/public/images/cards/haven.png
index e0b345b2..e0b345b2 100644
--- a/frontend/public/images/cards/haven.png
+++ b/sw-ui/public/images/cards/haven.png
diff --git a/frontend/public/images/cards/laboratory.png b/sw-ui/public/images/cards/laboratory.png
index 4c29e81f..4c29e81f 100644
--- a/frontend/public/images/cards/laboratory.png
+++ b/sw-ui/public/images/cards/laboratory.png
diff --git a/frontend/public/images/cards/library.png b/sw-ui/public/images/cards/library.png
index 7495a2ca..7495a2ca 100644
--- a/frontend/public/images/cards/library.png
+++ b/sw-ui/public/images/cards/library.png
diff --git a/frontend/public/images/cards/lighthouse.png b/sw-ui/public/images/cards/lighthouse.png
index 2124811b..2124811b 100644
--- a/frontend/public/images/cards/lighthouse.png
+++ b/sw-ui/public/images/cards/lighthouse.png
diff --git a/frontend/public/images/cards/lodge.png b/sw-ui/public/images/cards/lodge.png
index 22758688..22758688 100644
--- a/frontend/public/images/cards/lodge.png
+++ b/sw-ui/public/images/cards/lodge.png
diff --git a/frontend/public/images/cards/loom.png b/sw-ui/public/images/cards/loom.png
index 70bdf375..70bdf375 100644
--- a/frontend/public/images/cards/loom.png
+++ b/sw-ui/public/images/cards/loom.png
diff --git a/frontend/public/images/cards/lumberyard.png b/sw-ui/public/images/cards/lumberyard.png
index 8558af1a..8558af1a 100644
--- a/frontend/public/images/cards/lumberyard.png
+++ b/sw-ui/public/images/cards/lumberyard.png
diff --git a/frontend/public/images/cards/magistratesguild.png b/sw-ui/public/images/cards/magistratesguild.png
index d7deabb3..d7deabb3 100644
--- a/frontend/public/images/cards/magistratesguild.png
+++ b/sw-ui/public/images/cards/magistratesguild.png
diff --git a/frontend/public/images/cards/marketplace.png b/sw-ui/public/images/cards/marketplace.png
index cd3676d4..cd3676d4 100644
--- a/frontend/public/images/cards/marketplace.png
+++ b/sw-ui/public/images/cards/marketplace.png
diff --git a/frontend/public/images/cards/mine.png b/sw-ui/public/images/cards/mine.png
index 4062775c..4062775c 100644
--- a/frontend/public/images/cards/mine.png
+++ b/sw-ui/public/images/cards/mine.png
diff --git a/frontend/public/images/cards/observatory.png b/sw-ui/public/images/cards/observatory.png
index 1da3d7b4..1da3d7b4 100644
--- a/frontend/public/images/cards/observatory.png
+++ b/sw-ui/public/images/cards/observatory.png
diff --git a/frontend/public/images/cards/orevein.png b/sw-ui/public/images/cards/orevein.png
index fabea674..fabea674 100644
--- a/frontend/public/images/cards/orevein.png
+++ b/sw-ui/public/images/cards/orevein.png
diff --git a/frontend/public/images/cards/palace.png b/sw-ui/public/images/cards/palace.png
index 1a24890e..1a24890e 100644
--- a/frontend/public/images/cards/palace.png
+++ b/sw-ui/public/images/cards/palace.png
diff --git a/frontend/public/images/cards/pantheon.png b/sw-ui/public/images/cards/pantheon.png
index 264bae02..264bae02 100644
--- a/frontend/public/images/cards/pantheon.png
+++ b/sw-ui/public/images/cards/pantheon.png
diff --git a/frontend/public/images/cards/pawnshop.png b/sw-ui/public/images/cards/pawnshop.png
index 30bb3807..30bb3807 100644
--- a/frontend/public/images/cards/pawnshop.png
+++ b/sw-ui/public/images/cards/pawnshop.png
diff --git a/frontend/public/images/cards/philosophersguild.png b/sw-ui/public/images/cards/philosophersguild.png
index f72590f6..f72590f6 100644
--- a/frontend/public/images/cards/philosophersguild.png
+++ b/sw-ui/public/images/cards/philosophersguild.png
diff --git a/frontend/public/images/cards/press.png b/sw-ui/public/images/cards/press.png
index c932df06..c932df06 100644
--- a/frontend/public/images/cards/press.png
+++ b/sw-ui/public/images/cards/press.png
diff --git a/frontend/public/images/cards/quarry.png b/sw-ui/public/images/cards/quarry.png
index 8cdbdb22..8cdbdb22 100644
--- a/frontend/public/images/cards/quarry.png
+++ b/sw-ui/public/images/cards/quarry.png
diff --git a/frontend/public/images/cards/sawmill.png b/sw-ui/public/images/cards/sawmill.png
index 5abff473..5abff473 100644
--- a/frontend/public/images/cards/sawmill.png
+++ b/sw-ui/public/images/cards/sawmill.png
diff --git a/frontend/public/images/cards/school.png b/sw-ui/public/images/cards/school.png
index ab2218d0..ab2218d0 100644
--- a/frontend/public/images/cards/school.png
+++ b/sw-ui/public/images/cards/school.png
diff --git a/frontend/public/images/cards/scientistsguild.png b/sw-ui/public/images/cards/scientistsguild.png
index 7ee639e3..7ee639e3 100644
--- a/frontend/public/images/cards/scientistsguild.png
+++ b/sw-ui/public/images/cards/scientistsguild.png
diff --git a/frontend/public/images/cards/scriptorium.png b/sw-ui/public/images/cards/scriptorium.png
index 36dca27a..36dca27a 100644
--- a/frontend/public/images/cards/scriptorium.png
+++ b/sw-ui/public/images/cards/scriptorium.png
diff --git a/frontend/public/images/cards/senate.png b/sw-ui/public/images/cards/senate.png
index ee878ea6..ee878ea6 100644
--- a/frontend/public/images/cards/senate.png
+++ b/sw-ui/public/images/cards/senate.png
diff --git a/frontend/public/images/cards/shipownersguild.png b/sw-ui/public/images/cards/shipownersguild.png
index 3eecd2da..3eecd2da 100644
--- a/frontend/public/images/cards/shipownersguild.png
+++ b/sw-ui/public/images/cards/shipownersguild.png
diff --git a/frontend/public/images/cards/siegeworkshop.png b/sw-ui/public/images/cards/siegeworkshop.png
index bacf8309..bacf8309 100644
--- a/frontend/public/images/cards/siegeworkshop.png
+++ b/sw-ui/public/images/cards/siegeworkshop.png
diff --git a/frontend/public/images/cards/spiesguild.png b/sw-ui/public/images/cards/spiesguild.png
index 85e28d9e..85e28d9e 100644
--- a/frontend/public/images/cards/spiesguild.png
+++ b/sw-ui/public/images/cards/spiesguild.png
diff --git a/frontend/public/images/cards/stables.png b/sw-ui/public/images/cards/stables.png
index 48c963f0..48c963f0 100644
--- a/frontend/public/images/cards/stables.png
+++ b/sw-ui/public/images/cards/stables.png
diff --git a/frontend/public/images/cards/statue.png b/sw-ui/public/images/cards/statue.png
index 55aaa5cb..55aaa5cb 100644
--- a/frontend/public/images/cards/statue.png
+++ b/sw-ui/public/images/cards/statue.png
diff --git a/frontend/public/images/cards/stockade.png b/sw-ui/public/images/cards/stockade.png
index 37741429..37741429 100644
--- a/frontend/public/images/cards/stockade.png
+++ b/sw-ui/public/images/cards/stockade.png
diff --git a/frontend/public/images/cards/stonepit.png b/sw-ui/public/images/cards/stonepit.png
index 724900c7..724900c7 100644
--- a/frontend/public/images/cards/stonepit.png
+++ b/sw-ui/public/images/cards/stonepit.png
diff --git a/frontend/public/images/cards/strategistsguild.png b/sw-ui/public/images/cards/strategistsguild.png
index ae186a4b..ae186a4b 100644
--- a/frontend/public/images/cards/strategistsguild.png
+++ b/sw-ui/public/images/cards/strategistsguild.png
diff --git a/frontend/public/images/cards/study.png b/sw-ui/public/images/cards/study.png
index d8b9ebf9..d8b9ebf9 100644
--- a/frontend/public/images/cards/study.png
+++ b/sw-ui/public/images/cards/study.png
diff --git a/frontend/public/images/cards/tavern.png b/sw-ui/public/images/cards/tavern.png
index 418b0fb2..418b0fb2 100644
--- a/frontend/public/images/cards/tavern.png
+++ b/sw-ui/public/images/cards/tavern.png
diff --git a/frontend/public/images/cards/temple.png b/sw-ui/public/images/cards/temple.png
index 9a8d89dc..9a8d89dc 100644
--- a/frontend/public/images/cards/temple.png
+++ b/sw-ui/public/images/cards/temple.png
diff --git a/frontend/public/images/cards/theater.png b/sw-ui/public/images/cards/theater.png
index 0d5b2b01..0d5b2b01 100644
--- a/frontend/public/images/cards/theater.png
+++ b/sw-ui/public/images/cards/theater.png
diff --git a/frontend/public/images/cards/timberyard.png b/sw-ui/public/images/cards/timberyard.png
index 0f20547f..0f20547f 100644
--- a/frontend/public/images/cards/timberyard.png
+++ b/sw-ui/public/images/cards/timberyard.png
diff --git a/frontend/public/images/cards/townhall.png b/sw-ui/public/images/cards/townhall.png
index d0638739..d0638739 100644
--- a/frontend/public/images/cards/townhall.png
+++ b/sw-ui/public/images/cards/townhall.png
diff --git a/frontend/public/images/cards/tradersguild.png b/sw-ui/public/images/cards/tradersguild.png
index 15777e77..15777e77 100644
--- a/frontend/public/images/cards/tradersguild.png
+++ b/sw-ui/public/images/cards/tradersguild.png
diff --git a/frontend/public/images/cards/trainingground.png b/sw-ui/public/images/cards/trainingground.png
index d59ef4f8..d59ef4f8 100644
--- a/frontend/public/images/cards/trainingground.png
+++ b/sw-ui/public/images/cards/trainingground.png
diff --git a/frontend/public/images/cards/treefarm.png b/sw-ui/public/images/cards/treefarm.png
index 18cf228f..18cf228f 100644
--- a/frontend/public/images/cards/treefarm.png
+++ b/sw-ui/public/images/cards/treefarm.png
diff --git a/frontend/public/images/cards/university.png b/sw-ui/public/images/cards/university.png
index c9ca8a80..c9ca8a80 100644
--- a/frontend/public/images/cards/university.png
+++ b/sw-ui/public/images/cards/university.png
diff --git a/frontend/public/images/cards/vineyard.png b/sw-ui/public/images/cards/vineyard.png
index 58fa8ee1..58fa8ee1 100644
--- a/frontend/public/images/cards/vineyard.png
+++ b/sw-ui/public/images/cards/vineyard.png
diff --git a/frontend/public/images/cards/walls.png b/sw-ui/public/images/cards/walls.png
index 3823c62f..3823c62f 100644
--- a/frontend/public/images/cards/walls.png
+++ b/sw-ui/public/images/cards/walls.png
diff --git a/frontend/public/images/cards/westtradingpost.png b/sw-ui/public/images/cards/westtradingpost.png
index b536269f..b536269f 100644
--- a/frontend/public/images/cards/westtradingpost.png
+++ b/sw-ui/public/images/cards/westtradingpost.png
diff --git a/frontend/public/images/cards/workersguild.png b/sw-ui/public/images/cards/workersguild.png
index de4f452f..de4f452f 100644
--- a/frontend/public/images/cards/workersguild.png
+++ b/sw-ui/public/images/cards/workersguild.png
diff --git a/frontend/public/images/cards/workshop.png b/sw-ui/public/images/cards/workshop.png
index 8f585d61..8f585d61 100644
--- a/frontend/public/images/cards/workshop.png
+++ b/sw-ui/public/images/cards/workshop.png
diff --git a/frontend/public/images/tokens/coin.png b/sw-ui/public/images/tokens/coin.png
index f4813042..f4813042 100644
--- a/frontend/public/images/tokens/coin.png
+++ b/sw-ui/public/images/tokens/coin.png
diff --git a/frontend/public/images/tokens/resources/clay.png b/sw-ui/public/images/tokens/resources/clay.png
index 72fc0b0e..72fc0b0e 100644
--- a/frontend/public/images/tokens/resources/clay.png
+++ b/sw-ui/public/images/tokens/resources/clay.png
diff --git a/frontend/public/images/tokens/resources/glass.png b/sw-ui/public/images/tokens/resources/glass.png
index 61fd2be5..61fd2be5 100644
--- a/frontend/public/images/tokens/resources/glass.png
+++ b/sw-ui/public/images/tokens/resources/glass.png
diff --git a/frontend/public/images/tokens/resources/loom.png b/sw-ui/public/images/tokens/resources/loom.png
index 294adcb2..294adcb2 100644
--- a/frontend/public/images/tokens/resources/loom.png
+++ b/sw-ui/public/images/tokens/resources/loom.png
diff --git a/frontend/public/images/tokens/resources/ore.png b/sw-ui/public/images/tokens/resources/ore.png
index c2149daa..c2149daa 100644
--- a/frontend/public/images/tokens/resources/ore.png
+++ b/sw-ui/public/images/tokens/resources/ore.png
diff --git a/frontend/public/images/tokens/resources/papyrus.png b/sw-ui/public/images/tokens/resources/papyrus.png
index 91a59221..91a59221 100644
--- a/frontend/public/images/tokens/resources/papyrus.png
+++ b/sw-ui/public/images/tokens/resources/papyrus.png
diff --git a/frontend/public/images/tokens/resources/stone.png b/sw-ui/public/images/tokens/resources/stone.png
index 674c40db..674c40db 100644
--- a/frontend/public/images/tokens/resources/stone.png
+++ b/sw-ui/public/images/tokens/resources/stone.png
diff --git a/frontend/public/images/tokens/resources/wood.png b/sw-ui/public/images/tokens/resources/wood.png
index 09a4ede8..09a4ede8 100644
--- a/frontend/public/images/tokens/resources/wood.png
+++ b/sw-ui/public/images/tokens/resources/wood.png
diff --git a/frontend/public/images/wonders/alexandriaA.png b/sw-ui/public/images/wonders/alexandriaA.png
index 0d4135f3..0d4135f3 100644
--- a/frontend/public/images/wonders/alexandriaA.png
+++ b/sw-ui/public/images/wonders/alexandriaA.png
diff --git a/frontend/public/images/wonders/alexandriaB.png b/sw-ui/public/images/wonders/alexandriaB.png
index dd072f8a..dd072f8a 100644
--- a/frontend/public/images/wonders/alexandriaB.png
+++ b/sw-ui/public/images/wonders/alexandriaB.png
diff --git a/frontend/public/images/wonders/babylonA.png b/sw-ui/public/images/wonders/babylonA.png
index ae323c78..ae323c78 100644
--- a/frontend/public/images/wonders/babylonA.png
+++ b/sw-ui/public/images/wonders/babylonA.png
diff --git a/frontend/public/images/wonders/babylonB.png b/sw-ui/public/images/wonders/babylonB.png
index 3780dc9d..3780dc9d 100644
--- a/frontend/public/images/wonders/babylonB.png
+++ b/sw-ui/public/images/wonders/babylonB.png
diff --git a/frontend/public/images/wonders/ephesosA.png b/sw-ui/public/images/wonders/ephesosA.png
index 307794ba..307794ba 100644
--- a/frontend/public/images/wonders/ephesosA.png
+++ b/sw-ui/public/images/wonders/ephesosA.png
diff --git a/frontend/public/images/wonders/ephesosB.png b/sw-ui/public/images/wonders/ephesosB.png
index ec2e9cb7..ec2e9cb7 100644
--- a/frontend/public/images/wonders/ephesosB.png
+++ b/sw-ui/public/images/wonders/ephesosB.png
diff --git a/frontend/public/images/wonders/extra/agrigentoA.jpg b/sw-ui/public/images/wonders/extra/agrigentoA.jpg
index 76ba8195..76ba8195 100644
--- a/frontend/public/images/wonders/extra/agrigentoA.jpg
+++ b/sw-ui/public/images/wonders/extra/agrigentoA.jpg
diff --git a/frontend/public/images/wonders/extra/angkorwatA.jpg b/sw-ui/public/images/wonders/extra/angkorwatA.jpg
index 32f52514..32f52514 100644
--- a/frontend/public/images/wonders/extra/angkorwatA.jpg
+++ b/sw-ui/public/images/wonders/extra/angkorwatA.jpg
diff --git a/frontend/public/images/wonders/extra/angkorwatB.jpg b/sw-ui/public/images/wonders/extra/angkorwatB.jpg
index c3f4304e..c3f4304e 100644
--- a/frontend/public/images/wonders/extra/angkorwatB.jpg
+++ b/sw-ui/public/images/wonders/extra/angkorwatB.jpg
diff --git a/frontend/public/images/wonders/extra/avalonA.jpg b/sw-ui/public/images/wonders/extra/avalonA.jpg
index 7f7f0678..7f7f0678 100644
--- a/frontend/public/images/wonders/extra/avalonA.jpg
+++ b/sw-ui/public/images/wonders/extra/avalonA.jpg
diff --git a/frontend/public/images/wonders/extra/ctesiphonB.jpg b/sw-ui/public/images/wonders/extra/ctesiphonB.jpg
index c00b40ac..c00b40ac 100644
--- a/frontend/public/images/wonders/extra/ctesiphonB.jpg
+++ b/sw-ui/public/images/wonders/extra/ctesiphonB.jpg
diff --git a/frontend/public/images/wonders/extra/iramA.jpg b/sw-ui/public/images/wonders/extra/iramA.jpg
index d2c24e95..d2c24e95 100644
--- a/frontend/public/images/wonders/extra/iramA.jpg
+++ b/sw-ui/public/images/wonders/extra/iramA.jpg
diff --git a/frontend/public/images/wonders/extra/persepolisA.jpg b/sw-ui/public/images/wonders/extra/persepolisA.jpg
index 2caa4f89..2caa4f89 100644
--- a/frontend/public/images/wonders/extra/persepolisA.jpg
+++ b/sw-ui/public/images/wonders/extra/persepolisA.jpg
diff --git a/frontend/public/images/wonders/extra/romaA.jpg b/sw-ui/public/images/wonders/extra/romaA.jpg
index c54bc820..c54bc820 100644
--- a/frontend/public/images/wonders/extra/romaA.jpg
+++ b/sw-ui/public/images/wonders/extra/romaA.jpg
diff --git a/frontend/public/images/wonders/extra/sangri-laA.jpg b/sw-ui/public/images/wonders/extra/sangri-laA.jpg
index 1c5dad97..1c5dad97 100644
--- a/frontend/public/images/wonders/extra/sangri-laA.jpg
+++ b/sw-ui/public/images/wonders/extra/sangri-laA.jpg
diff --git a/frontend/public/images/wonders/extra/spahanA.jpg b/sw-ui/public/images/wonders/extra/spahanA.jpg
index ab2cfc84..ab2cfc84 100644
--- a/frontend/public/images/wonders/extra/spahanA.jpg
+++ b/sw-ui/public/images/wonders/extra/spahanA.jpg
diff --git a/frontend/public/images/wonders/extra/the-great-wallA.jpg b/sw-ui/public/images/wonders/extra/the-great-wallA.jpg
index 4aacd39b..4aacd39b 100644
--- a/frontend/public/images/wonders/extra/the-great-wallA.jpg
+++ b/sw-ui/public/images/wonders/extra/the-great-wallA.jpg
diff --git a/frontend/public/images/wonders/extra/veniseA.jpg b/sw-ui/public/images/wonders/extra/veniseA.jpg
index 55ec00b5..55ec00b5 100644
--- a/frontend/public/images/wonders/extra/veniseA.jpg
+++ b/sw-ui/public/images/wonders/extra/veniseA.jpg
diff --git a/frontend/public/images/wonders/extra/veniseB.jpg b/sw-ui/public/images/wonders/extra/veniseB.jpg
index e18f3a12..e18f3a12 100644
--- a/frontend/public/images/wonders/extra/veniseB.jpg
+++ b/sw-ui/public/images/wonders/extra/veniseB.jpg
diff --git a/frontend/public/images/wonders/gizahA.png b/sw-ui/public/images/wonders/gizahA.png
index e66735fb..e66735fb 100644
--- a/frontend/public/images/wonders/gizahA.png
+++ b/sw-ui/public/images/wonders/gizahA.png
diff --git a/frontend/public/images/wonders/gizahB.png b/sw-ui/public/images/wonders/gizahB.png
index ed55ed45..ed55ed45 100644
--- a/frontend/public/images/wonders/gizahB.png
+++ b/sw-ui/public/images/wonders/gizahB.png
diff --git a/frontend/public/images/wonders/halikarnassusA.png b/sw-ui/public/images/wonders/halikarnassusA.png
index 659f706e..659f706e 100644
--- a/frontend/public/images/wonders/halikarnassusA.png
+++ b/sw-ui/public/images/wonders/halikarnassusA.png
diff --git a/frontend/public/images/wonders/halikarnassusB.png b/sw-ui/public/images/wonders/halikarnassusB.png
index b6ae1f93..b6ae1f93 100644
--- a/frontend/public/images/wonders/halikarnassusB.png
+++ b/sw-ui/public/images/wonders/halikarnassusB.png
diff --git a/frontend/public/images/wonders/olympiaA.png b/sw-ui/public/images/wonders/olympiaA.png
index 478ed503..478ed503 100644
--- a/frontend/public/images/wonders/olympiaA.png
+++ b/sw-ui/public/images/wonders/olympiaA.png
diff --git a/frontend/public/images/wonders/olympiaB.png b/sw-ui/public/images/wonders/olympiaB.png
index a97a9524..a97a9524 100644
--- a/frontend/public/images/wonders/olympiaB.png
+++ b/sw-ui/public/images/wonders/olympiaB.png
diff --git a/frontend/public/images/wonders/rhodosA.png b/sw-ui/public/images/wonders/rhodosA.png
index 0c11a71a..0c11a71a 100644
--- a/frontend/public/images/wonders/rhodosA.png
+++ b/sw-ui/public/images/wonders/rhodosA.png
diff --git a/frontend/public/images/wonders/rhodosB.png b/sw-ui/public/images/wonders/rhodosB.png
index 43e5d594..43e5d594 100644
--- a/frontend/public/images/wonders/rhodosB.png
+++ b/sw-ui/public/images/wonders/rhodosB.png
diff --git a/frontend/public/index.html b/sw-ui/public/index.html
index 32b449cb..32b449cb 100644
--- a/frontend/public/index.html
+++ b/sw-ui/public/index.html
diff --git a/frontend/src/@types/reflexbox.d.ts b/sw-ui/src/@types/reflexbox.d.ts
index 802bc5f3..802bc5f3 100644
--- a/frontend/src/@types/reflexbox.d.ts
+++ b/sw-ui/src/@types/reflexbox.d.ts
diff --git a/frontend/src/api/model.ts b/sw-ui/src/api/model.ts
index 2796a6d3..2796a6d3 100644
--- a/frontend/src/api/model.ts
+++ b/sw-ui/src/api/model.ts
diff --git a/frontend/src/api/sevenWondersApi.ts b/sw-ui/src/api/sevenWondersApi.ts
index 4f76a677..4f76a677 100644
--- a/frontend/src/api/sevenWondersApi.ts
+++ b/sw-ui/src/api/sevenWondersApi.ts
diff --git a/frontend/src/api/websocket.ts b/sw-ui/src/api/websocket.ts
index e9393836..e9393836 100644
--- a/frontend/src/api/websocket.ts
+++ b/sw-ui/src/api/websocket.ts
diff --git a/frontend/src/components/Application.tsx b/sw-ui/src/components/Application.tsx
index e0ec604d..e0ec604d 100644
--- a/frontend/src/components/Application.tsx
+++ b/sw-ui/src/components/Application.tsx
diff --git a/frontend/src/components/game-browser/GameBrowser.tsx b/sw-ui/src/components/game-browser/GameBrowser.tsx
index a6367d5e..a6367d5e 100644
--- a/frontend/src/components/game-browser/GameBrowser.tsx
+++ b/sw-ui/src/components/game-browser/GameBrowser.tsx
diff --git a/frontend/src/components/game-browser/GameList.css b/sw-ui/src/components/game-browser/GameList.css
index a04e126c..a04e126c 100644
--- a/frontend/src/components/game-browser/GameList.css
+++ b/sw-ui/src/components/game-browser/GameList.css
diff --git a/frontend/src/components/game-browser/GameList.tsx b/sw-ui/src/components/game-browser/GameList.tsx
index 1b136940..1b136940 100644
--- a/frontend/src/components/game-browser/GameList.tsx
+++ b/sw-ui/src/components/game-browser/GameList.tsx
diff --git a/frontend/src/components/game-browser/GameStatus.tsx b/sw-ui/src/components/game-browser/GameStatus.tsx
index 5f237258..5f237258 100644
--- a/frontend/src/components/game-browser/GameStatus.tsx
+++ b/sw-ui/src/components/game-browser/GameStatus.tsx
diff --git a/frontend/src/components/game-browser/PlayerCount.css b/sw-ui/src/components/game-browser/PlayerCount.css
index d2f18e50..d2f18e50 100644
--- a/frontend/src/components/game-browser/PlayerCount.css
+++ b/sw-ui/src/components/game-browser/PlayerCount.css
diff --git a/frontend/src/components/game-browser/PlayerCount.tsx b/sw-ui/src/components/game-browser/PlayerCount.tsx
index 64028f68..64028f68 100644
--- a/frontend/src/components/game-browser/PlayerCount.tsx
+++ b/sw-ui/src/components/game-browser/PlayerCount.tsx
diff --git a/frontend/src/components/game-browser/PlayerInfo.tsx b/sw-ui/src/components/game-browser/PlayerInfo.tsx
index 4afed671..4afed671 100644
--- a/frontend/src/components/game-browser/PlayerInfo.tsx
+++ b/sw-ui/src/components/game-browser/PlayerInfo.tsx
diff --git a/frontend/src/components/game/Board.css b/sw-ui/src/components/game/Board.css
index 0600bd14..0600bd14 100644
--- a/frontend/src/components/game/Board.css
+++ b/sw-ui/src/components/game/Board.css
diff --git a/frontend/src/components/game/Board.tsx b/sw-ui/src/components/game/Board.tsx
index 98298a1f..98298a1f 100644
--- a/frontend/src/components/game/Board.tsx
+++ b/sw-ui/src/components/game/Board.tsx
diff --git a/frontend/src/components/game/CardImage.css b/sw-ui/src/components/game/CardImage.css
index 795c1503..795c1503 100644
--- a/frontend/src/components/game/CardImage.css
+++ b/sw-ui/src/components/game/CardImage.css
diff --git a/frontend/src/components/game/CardImage.tsx b/sw-ui/src/components/game/CardImage.tsx
index a37595ad..a37595ad 100644
--- a/frontend/src/components/game/CardImage.tsx
+++ b/sw-ui/src/components/game/CardImage.tsx
diff --git a/frontend/src/components/game/GameScene.css b/sw-ui/src/components/game/GameScene.css
index 3417459b..3417459b 100644
--- a/frontend/src/components/game/GameScene.css
+++ b/sw-ui/src/components/game/GameScene.css
diff --git a/frontend/src/components/game/GameScene.tsx b/sw-ui/src/components/game/GameScene.tsx
index 465d0840..465d0840 100644
--- a/frontend/src/components/game/GameScene.tsx
+++ b/sw-ui/src/components/game/GameScene.tsx
diff --git a/frontend/src/components/game/Hand.css b/sw-ui/src/components/game/Hand.css
index 8e7d93c5..8e7d93c5 100644
--- a/frontend/src/components/game/Hand.css
+++ b/sw-ui/src/components/game/Hand.css
diff --git a/frontend/src/components/game/Hand.tsx b/sw-ui/src/components/game/Hand.tsx
index 744c45cc..744c45cc 100644
--- a/frontend/src/components/game/Hand.tsx
+++ b/sw-ui/src/components/game/Hand.tsx
diff --git a/frontend/src/components/game/ProductionBar.css b/sw-ui/src/components/game/ProductionBar.css
index 77a3b8fc..77a3b8fc 100644
--- a/frontend/src/components/game/ProductionBar.css
+++ b/sw-ui/src/components/game/ProductionBar.css
diff --git a/frontend/src/components/game/ProductionBar.tsx b/sw-ui/src/components/game/ProductionBar.tsx
index 3e5c6d34..3e5c6d34 100644
--- a/frontend/src/components/game/ProductionBar.tsx
+++ b/sw-ui/src/components/game/ProductionBar.tsx
diff --git a/frontend/src/components/game/background-papyrus.jpg b/sw-ui/src/components/game/background-papyrus.jpg
index 57bdffcf..57bdffcf 100644
--- a/frontend/src/components/game/background-papyrus.jpg
+++ b/sw-ui/src/components/game/background-papyrus.jpg
diff --git a/frontend/src/components/home/ChooseNameForm.tsx b/sw-ui/src/components/home/ChooseNameForm.tsx
index 8292150b..8292150b 100644
--- a/frontend/src/components/home/ChooseNameForm.tsx
+++ b/sw-ui/src/components/home/ChooseNameForm.tsx
diff --git a/frontend/src/components/home/Home.css b/sw-ui/src/components/home/Home.css
index 7d9a96de..7d9a96de 100644
--- a/frontend/src/components/home/Home.css
+++ b/sw-ui/src/components/home/Home.css
diff --git a/frontend/src/components/home/Home.tsx b/sw-ui/src/components/home/Home.tsx
index 094db658..094db658 100644
--- a/frontend/src/components/home/Home.tsx
+++ b/sw-ui/src/components/home/Home.tsx
diff --git a/frontend/src/components/home/background-zeus-temple.jpg b/sw-ui/src/components/home/background-zeus-temple.jpg
index 5a28e933..5a28e933 100644
--- a/frontend/src/components/home/background-zeus-temple.jpg
+++ b/sw-ui/src/components/home/background-zeus-temple.jpg
diff --git a/frontend/src/components/home/logo-7-wonders.png b/sw-ui/src/components/home/logo-7-wonders.png
index 96974d3e..96974d3e 100644
--- a/frontend/src/components/home/logo-7-wonders.png
+++ b/sw-ui/src/components/home/logo-7-wonders.png
diff --git a/frontend/src/components/lobby/Lobby.tsx b/sw-ui/src/components/lobby/Lobby.tsx
index 3594af65..3594af65 100644
--- a/frontend/src/components/lobby/Lobby.tsx
+++ b/sw-ui/src/components/lobby/Lobby.tsx
diff --git a/frontend/src/components/lobby/PlayerList.tsx b/sw-ui/src/components/lobby/PlayerList.tsx
index bfc3a56c..bfc3a56c 100644
--- a/frontend/src/components/lobby/PlayerList.tsx
+++ b/sw-ui/src/components/lobby/PlayerList.tsx
diff --git a/frontend/src/components/lobby/RadialPlayerList.tsx b/sw-ui/src/components/lobby/RadialPlayerList.tsx
index 88db55fc..88db55fc 100644
--- a/frontend/src/components/lobby/RadialPlayerList.tsx
+++ b/sw-ui/src/components/lobby/RadialPlayerList.tsx
diff --git a/frontend/src/components/lobby/radial-list/RadialList.css b/sw-ui/src/components/lobby/radial-list/RadialList.css
index 3b0f3a79..3b0f3a79 100644
--- a/frontend/src/components/lobby/radial-list/RadialList.css
+++ b/sw-ui/src/components/lobby/radial-list/RadialList.css
diff --git a/frontend/src/components/lobby/radial-list/RadialList.tsx b/sw-ui/src/components/lobby/radial-list/RadialList.tsx
index 806cdd08..806cdd08 100644
--- a/frontend/src/components/lobby/radial-list/RadialList.tsx
+++ b/sw-ui/src/components/lobby/radial-list/RadialList.tsx
diff --git a/frontend/src/components/lobby/radial-list/RadialListItem.css b/sw-ui/src/components/lobby/radial-list/RadialListItem.css
index 65bb9661..65bb9661 100644
--- a/frontend/src/components/lobby/radial-list/RadialListItem.css
+++ b/sw-ui/src/components/lobby/radial-list/RadialListItem.css
diff --git a/frontend/src/components/lobby/radial-list/RadialListItem.tsx b/sw-ui/src/components/lobby/radial-list/RadialListItem.tsx
index 19a27638..19a27638 100644
--- a/frontend/src/components/lobby/radial-list/RadialListItem.tsx
+++ b/sw-ui/src/components/lobby/radial-list/RadialListItem.tsx
diff --git a/frontend/src/components/lobby/radial-list/radial-math.ts b/sw-ui/src/components/lobby/radial-list/radial-math.ts
index f0f411f5..f0f411f5 100644
--- a/frontend/src/components/lobby/radial-list/radial-math.ts
+++ b/sw-ui/src/components/lobby/radial-list/radial-math.ts
diff --git a/frontend/src/components/lobby/round-table.png b/sw-ui/src/components/lobby/round-table.png
index f277376d..f277376d 100644
--- a/frontend/src/components/lobby/round-table.png
+++ b/sw-ui/src/components/lobby/round-table.png
diff --git a/frontend/src/global-styles.css b/sw-ui/src/global-styles.css
index e69de29b..e69de29b 100644
--- a/frontend/src/global-styles.css
+++ b/sw-ui/src/global-styles.css
diff --git a/frontend/src/index.tsx b/sw-ui/src/index.tsx
index fce90915..fce90915 100644
--- a/frontend/src/index.tsx
+++ b/sw-ui/src/index.tsx
diff --git a/frontend/src/react-app-env.d.ts b/sw-ui/src/react-app-env.d.ts
index 6431bc5f..6431bc5f 100644
--- a/frontend/src/react-app-env.d.ts
+++ b/sw-ui/src/react-app-env.d.ts
diff --git a/frontend/src/reducers.ts b/sw-ui/src/reducers.ts
index f885f642..f885f642 100644
--- a/frontend/src/reducers.ts
+++ b/sw-ui/src/reducers.ts
diff --git a/frontend/src/redux/actions/all.ts b/sw-ui/src/redux/actions/all.ts
index 57d2a443..57d2a443 100644
--- a/frontend/src/redux/actions/all.ts
+++ b/sw-ui/src/redux/actions/all.ts
diff --git a/frontend/src/redux/actions/game.ts b/sw-ui/src/redux/actions/game.ts
index b67ea1dc..b67ea1dc 100644
--- a/frontend/src/redux/actions/game.ts
+++ b/sw-ui/src/redux/actions/game.ts
diff --git a/frontend/src/redux/actions/lobby.ts b/sw-ui/src/redux/actions/lobby.ts
index c121b022..c121b022 100644
--- a/frontend/src/redux/actions/lobby.ts
+++ b/sw-ui/src/redux/actions/lobby.ts
diff --git a/frontend/src/redux/actions/user.ts b/sw-ui/src/redux/actions/user.ts
index 29c85707..29c85707 100644
--- a/frontend/src/redux/actions/user.ts
+++ b/sw-ui/src/redux/actions/user.ts
diff --git a/frontend/src/redux/currentGame.ts b/sw-ui/src/redux/currentGame.ts
index 5e015d60..5e015d60 100644
--- a/frontend/src/redux/currentGame.ts
+++ b/sw-ui/src/redux/currentGame.ts
diff --git a/frontend/src/redux/games.ts b/sw-ui/src/redux/games.ts
index 4df2f1da..4df2f1da 100644
--- a/frontend/src/redux/games.ts
+++ b/sw-ui/src/redux/games.ts
diff --git a/frontend/src/redux/user.ts b/sw-ui/src/redux/user.ts
index 2cc25cc0..2cc25cc0 100644
--- a/frontend/src/redux/user.ts
+++ b/sw-ui/src/redux/user.ts
diff --git a/frontend/src/sagas.ts b/sw-ui/src/sagas.ts
index 03c71b63..03c71b63 100644
--- a/frontend/src/sagas.ts
+++ b/sw-ui/src/sagas.ts
diff --git a/frontend/src/sagas/errors.ts b/sw-ui/src/sagas/errors.ts
index b27dfa95..b27dfa95 100644
--- a/frontend/src/sagas/errors.ts
+++ b/sw-ui/src/sagas/errors.ts
diff --git a/frontend/src/sagas/game.ts b/sw-ui/src/sagas/game.ts
index a60ab2d3..a60ab2d3 100644
--- a/frontend/src/sagas/game.ts
+++ b/sw-ui/src/sagas/game.ts
diff --git a/frontend/src/sagas/gameBrowser.ts b/sw-ui/src/sagas/gameBrowser.ts
index 868ec471..868ec471 100644
--- a/frontend/src/sagas/gameBrowser.ts
+++ b/sw-ui/src/sagas/gameBrowser.ts
diff --git a/frontend/src/sagas/home.ts b/sw-ui/src/sagas/home.ts
index 585c536e..585c536e 100644
--- a/frontend/src/sagas/home.ts
+++ b/sw-ui/src/sagas/home.ts
diff --git a/frontend/src/sagas/lobby.ts b/sw-ui/src/sagas/lobby.ts
index 09360b02..09360b02 100644
--- a/frontend/src/sagas/lobby.ts
+++ b/sw-ui/src/sagas/lobby.ts
diff --git a/frontend/src/setupProxy.js b/sw-ui/src/setupProxy.js
index 88831e6e..88831e6e 100644
--- a/frontend/src/setupProxy.js
+++ b/sw-ui/src/setupProxy.js
diff --git a/frontend/src/store.ts b/sw-ui/src/store.ts
index 54a65509..54a65509 100644
--- a/frontend/src/store.ts
+++ b/sw-ui/src/store.ts
diff --git a/frontend/tsconfig.json b/sw-ui/tsconfig.json
index 0dd89b81..0dd89b81 100644
--- a/frontend/tsconfig.json
+++ b/sw-ui/tsconfig.json
diff --git a/frontend/yarn.lock b/sw-ui/yarn.lock
index ca497f21..ca497f21 100644
--- a/frontend/yarn.lock
+++ b/sw-ui/yarn.lock