diff --git a/knockoutwhist b/knockoutwhist
index 48cd4d3..026c666 160000
--- a/knockoutwhist
+++ b/knockoutwhist
@@ -1 +1 @@
-Subproject commit 48cd4d3956ec9a94074a147544cfe22e2c8c6bae
+Subproject commit 026c666f03cc95ceb42bf1fe5f11d94f6a66176e
diff --git a/knockoutwhistweb/app/controllers/WebUI.scala b/knockoutwhistweb/app/controllers/WebUI.scala
index 0e826fe..a9e010c 100644
--- a/knockoutwhistweb/app/controllers/WebUI.scala
+++ b/knockoutwhistweb/app/controllers/WebUI.scala
@@ -3,14 +3,15 @@ package controllers
 import controllers.sessions.SimpleSession
 import de.knockoutwhist.cards.{Card, CardValue, Hand, Suit}
 import de.knockoutwhist.events.*
-import de.knockoutwhist.events.ERROR_STATUS.*
-import de.knockoutwhist.events.GLOBAL_STATUS.*
-import de.knockoutwhist.events.PLAYER_STATUS.*
-import de.knockoutwhist.events.ROUND_STATUS.{PLAYERS_OUT, SHOW_START_ROUND, WON_ROUND}
-import de.knockoutwhist.events.cards.{RenderHandEvent, ShowTieCardsEvent}
-import de.knockoutwhist.events.round.ShowCurrentTrickEvent
-import de.knockoutwhist.events.ui.GameState.{INGAME, MAIN_MENU}
-import de.knockoutwhist.events.ui.{GameState, GameStateUpdateEvent}
+import de.knockoutwhist.events.old.ERROR_STATUS.*
+import de.knockoutwhist.events.old.GLOBAL_STATUS.*
+import de.knockoutwhist.events.old.PLAYER_STATUS.*
+import de.knockoutwhist.events.old.ROUND_STATUS.{PLAYERS_OUT, SHOW_START_ROUND, WON_ROUND}
+import de.knockoutwhist.events.old.{ShowErrorStatus, ShowGlobalStatus, ShowPlayerStatus, ShowRoundStatus}
+import de.knockoutwhist.events.old.cards.{RenderHandEvent, ShowTieCardsEvent}
+import de.knockoutwhist.events.old.round.ShowCurrentTrickEvent
+import de.knockoutwhist.events.old.ui.{GameState, GameStateUpdateEvent}
+import de.knockoutwhist.events.old.ui.GameState.{INGAME, MAIN_MENU}
 import de.knockoutwhist.player.AbstractPlayer
 import de.knockoutwhist.rounds.Match
 import de.knockoutwhist.ui.UI
diff --git a/knockoutwhistweb/app/controllers/sessions/SimpleSession.scala b/knockoutwhistweb/app/controllers/sessions/SimpleSession.scala
index 738ce6b..ab65aa1 100644
--- a/knockoutwhistweb/app/controllers/sessions/SimpleSession.scala
+++ b/knockoutwhistweb/app/controllers/sessions/SimpleSession.scala
@@ -1,13 +1,13 @@
 package controllers.sessions
 
 import de.knockoutwhist.cards.{Card, CardValue, Hand}
-import de.knockoutwhist.events.ERROR_STATUS.*
-import de.knockoutwhist.events.GLOBAL_STATUS.*
-import de.knockoutwhist.events.PLAYER_STATUS.*
-import de.knockoutwhist.events.ROUND_STATUS.*
-import de.knockoutwhist.events.{ShowErrorStatus, ShowGlobalStatus, ShowPlayerStatus, ShowRoundStatus}
-import de.knockoutwhist.events.cards.{RenderHandEvent, ShowTieCardsEvent}
-import de.knockoutwhist.events.round.ShowCurrentTrickEvent
+import de.knockoutwhist.events.old.ERROR_STATUS.*
+import de.knockoutwhist.events.old.GLOBAL_STATUS.*
+import de.knockoutwhist.events.old.PLAYER_STATUS.*
+import de.knockoutwhist.events.old.ROUND_STATUS.*
+import de.knockoutwhist.events.old.{ShowErrorStatus, ShowGlobalStatus, ShowPlayerStatus, ShowRoundStatus}
+import de.knockoutwhist.events.old.cards.{RenderHandEvent, ShowTieCardsEvent}
+import de.knockoutwhist.events.old.round.ShowCurrentTrickEvent
 import de.knockoutwhist.player.AbstractPlayer
 import de.knockoutwhist.utils.events.SimpleEvent
 import play.twirl.api.Html