src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameUI.java

@@ -1,6 +1,5 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui;
 
-import ch.unibas.dmi.dbis.cs108.casono.client.ClientApp;
 import ch.unibas.dmi.dbis.cs108.casono.client.game.GameService;
 import ch.unibas.dmi.dbis.cs108.casono.client.game.PlayerId;
 import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
@@ -78,7 +77,8 @@ public class CasinoGameUI extends Application {
     public void start(Stage stage) throws IOException {
 
         if (clientService == null) {
-            clientService = ClientApp.getSharedClientService();
+            clientService =
+                    ch.unibas.dmi.dbis.cs108.casono.client.ClientApp.getSharedClientService();
         }
         if (clientService == null) {
             throw new IllegalStateException(
@@ -90,7 +90,8 @@ public class CasinoGameUI extends Application {
         String effectiveUsername = normalize(username);
 
         if (effectiveUsername == null) {
-            effectiveUsername = normalize(ClientApp.getSharedUsername());
+            effectiveUsername =
+                    normalize(ch.unibas.dmi.dbis.cs108.casono.client.ClientApp.getSharedUsername());
         }
 
         if (effectiveUsername == null) {
@@ -104,7 +105,7 @@ public class CasinoGameUI extends Application {
                         + "', injectedUsername='"
                         + username
                         + "', sharedUsername='"
-                        + ClientApp.getSharedUsername()
+                        + ch.unibas.dmi.dbis.cs108.casono.client.ClientApp.getSharedUsername()
                         + "', hasClientService="
                         + (clientService != null));
 

src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/CasinomainuiController.java

@@ -55,9 +55,9 @@ public class CasinomainuiController {
     }
 
     /**
-     * Initializes the UI components and sets default values. If a shared {@link ClientService}
-     * exists (created at application start), the controller reuses it so the connection remains
-     * open and already-logged-in.
+     * Initializes the UI components and sets default values. If a shared {@link
+     * ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService} exists (created at application
+     * start), the controller reuses it so the connection remains open and already-logged-in.
      */
     @FXML
     public void initialize() {

src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java

@@ -1,9 +1,7 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui;
 
-import ch.unibas.dmi.dbis.cs108.casono.client.ClientApp;
 import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
 import ch.unibas.dmi.dbis.cs108.casono.client.network.LobbyClient;
-import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -555,10 +553,14 @@ public class LobbyButtonGridManager {
                     try {
                         var cs = lobbyClient.getClientService();
 
-                        CasinoGameUI.setClientService(cs);
-                        CasinoGameUI.setLobbyId(lobbyId);
+                        ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI
+                                .setClientService(cs);
+                        ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI.setLobbyId(
+                                lobbyId);
 
-                        String username = ClientApp.getSharedUsername();
+                        String username =
+                                ch.unibas.dmi.dbis.cs108.casono.client.ClientApp
+                                        .getSharedUsername();
                         if (username == null || username.isBlank()) {
                             username =
                                     "Guest-"
@@ -568,9 +570,11 @@ public class LobbyButtonGridManager {
                                                     .toString()
                                                     .substring(0, GUEST_ID_LENGTH);
                         }
-                        CasinoGameUI.setUsername(username);
+                        ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI.setUsername(
+                                username);
 
-                        new CasinoGameUI().start(gameStage);
+                        new ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI()
+                                .start(gameStage);
 
                     } catch (Exception e) {
                         LOGGER.error("Game UI failed: {}", e.getMessage());

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/game/bet/PlayerBetHandler.java

@@ -4,7 +4,6 @@ import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.GameController;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.player.PlayerId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager;
-import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.ErrorResponse;
@@ -59,7 +58,8 @@ public class PlayerBetHandler extends CommandHandler<PlayerBetRequest> {
             return;
         }
 
-        Optional<User> opt = userRegistry.getBySessionId(request.getSessionId());
+        Optional<ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User> opt =
+                userRegistry.getBySessionId(request.getSessionId());
         if (opt.isEmpty()) {
             responseDispatcher.dispatch(
                     new ErrorResponse(request.getContext(), "NOT_LOGGED_IN", "User not logged in"));

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/game/call/PlayerCallHandler.java

@@ -4,7 +4,6 @@ import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.GameController;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.player.PlayerId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager;
-import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.ErrorResponse;
@@ -47,7 +46,8 @@ public class PlayerCallHandler extends CommandHandler<PlayerCallRequest> {
      */
     @Override
     public void execute(PlayerCallRequest request) {
-        Optional<User> opt = userRegistry.getBySessionId(request.getSessionId());
+        Optional<ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User> opt =
+                userRegistry.getBySessionId(request.getSessionId());
         if (opt.isEmpty()) {
             responseDispatcher.dispatch(
                     new ErrorResponse(request.getContext(), "NOT_LOGGED_IN", "User not logged in"));

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/game/fold/PlayerFoldHandler.java

@@ -4,7 +4,6 @@ import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.GameController;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.player.PlayerId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager;
-import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.ErrorResponse;
@@ -47,7 +46,8 @@ public class PlayerFoldHandler extends CommandHandler<PlayerFoldRequest> {
      */
     @Override
     public void execute(PlayerFoldRequest request) {
-        Optional<User> opt = userRegistry.getBySessionId(request.getSessionId());
+        Optional<ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User> opt =
+                userRegistry.getBySessionId(request.getSessionId());
         if (opt.isEmpty()) {
             responseDispatcher.dispatch(
                     new ErrorResponse(request.getContext(), "NOT_LOGGED_IN", "User not logged in"));

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/game/raise/PlayerRaiseHandler.java

@@ -4,7 +4,6 @@ import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.GameController;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.player.PlayerId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager;
-import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.ErrorResponse;
@@ -61,7 +60,8 @@ public class PlayerRaiseHandler extends CommandHandler<PlayerRaiseRequest> {
             return;
         }
 
-        Optional<User> opt = userRegistry.getBySessionId(request.getSessionId());
+        Optional<ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User> opt =
+                userRegistry.getBySessionId(request.getSessionId());
         if (opt.isEmpty()) {
             responseDispatcher.dispatch(
                     new ErrorResponse(request.getContext(), "NOT_LOGGED_IN", "User not logged in"));

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/lobby/get_lobby_list/GetLobbyListHandler.java

@@ -1,6 +1,5 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.get_lobby_list;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.Lobby;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher.ResponseDispatcher;
@@ -22,7 +21,8 @@ public class GetLobbyListHandler extends CommandHandler<GetLobbyListRequest> {
 
     @Override
     public void execute(GetLobbyListRequest request) {
-        Collection<Lobby> l = lobbyManager.getAllLobbies();
+        Collection<ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.Lobby> l =
+                lobbyManager.getAllLobbies();
         responseDispatcher.dispatch(new GetLobbyListResponse(request.getContext(), l));
     }
 }

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/lobby/start_game/StartGameHandler.java

@@ -11,7 +11,6 @@ import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.state.GameState;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.Lobby;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager;
-import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.ErrorResponse;
@@ -39,8 +38,10 @@ public class StartGameHandler extends CommandHandler<StartGameRequest> {
 
     @Override
     public void execute(StartGameRequest request) {
-        Optional<User> opt = userRegistry.getBySessionId(request.getSessionId());
+        Optional<ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User> opt =
+                userRegistry.getBySessionId(request.getSessionId());
         if (opt.isEmpty()) {
+            // Guard: UserLoggedInCheck should normally handle this
             responseDispatcher.dispatch(
                     new ErrorResponse(
                             request.getContext(), "USER_NOT_LOGGED_IN", "User not logged in"));

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageHandler.java

@@ -5,7 +5,6 @@ import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.Lobby;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager;
-import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.OkResponse;
@@ -41,7 +40,8 @@ public class SendMessageHandler extends CommandHandler<SendMessageRequest> {
     @Override
     public void execute(SendMessageRequest request) {
         Message message = request.getMessage();
-        Optional<User> senderUser = userRegistry.getBySessionId(request.getSessionId());
+        Optional<ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User> senderUser =
+                userRegistry.getBySessionId(request.getSessionId());
         if (senderUser.isPresent()) {
             message.sender = senderUser.get().getName();
         }

src/main/resources/ui-structure/Casinogameui.fxml

@@ -4,12 +4,11 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.image.*?>
-<?import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameController?>
 
 <!-- Main container: Links the UI to the CasinoGameController and loads Casinogameui.css -->
 <AnchorPane xmlns="http://javafx.com/javafx/21"
             xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="CasinoGameController"
+            fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameController"
             styleClass="background"
             stylesheets="@Casinogameui.css">
 

src/main/resources/ui-structure/Casinomainui.fxml

@@ -3,11 +3,10 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
-<?import ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui.CasinomainuiController?>
 
 <AnchorPane xmlns="http://javafx.com"
             xmlns:fx="http://javafx.com"
-            fx:controller="CasinomainuiController"
+            fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui.CasinomainuiController"
             styleClass="anchor-pane-bg"
             stylesheets="@Casinomainui.css">
 

src/main/resources/ui-structure/gameuicomponents/HighscoreView.fxml

@@ -6,12 +6,11 @@
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<?import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.HighscoreViewController?>
 
 <VBox fx:id="highscoreRoot"
     xmlns="http://javafx.com/javafx/21"
       xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="HighscoreViewController"
+      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.gameuicomponents.HighscoreViewController"
       spacing="12"
       styleClass="highscore-root"
     onMousePressed="#onPopupPressed"

src/main/resources/ui-structure/gameuicomponents/Playerstatus.fxml

@@ -4,7 +4,6 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.geometry.Insets?>
-<?import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.PlayerStatusController?>
 
 <!--
 TODO: Main placeholder for player status & input.
@@ -17,7 +16,7 @@ and status displays will be dynamically populated with real-time data from the s
 <VBox fx:id="playerStatusBox"
       xmlns="http://javafx.com/javafx/21"
       xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="PlayerStatusController"
+      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.gameuicomponents.PlayerStatusController"
       styleClass="player-status-pane"
       prefWidth="200"
       spacing="5">

src/main/resources/ui-structure/gameuicomponents/Taskbar.fxml

@@ -3,11 +3,11 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
-<?import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.TaskbarController?>
+
 <!-- movable taskbar -->
 <HBox xmlns="http://javafx.com/javafx/21"
       xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="TaskbarController"
+      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.gameuicomponents.TaskbarController"
       fx:id="taskbar"
       styleClass="taskbar"
       spacing="15"

src/main/resources/ui-structure/gameuicomponents/chatui/chatbox.fxml

@@ -3,7 +3,6 @@
 <?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameuicomponents.ChatViewController?>
 
 <!--
     Dieses Fenster wird später mit den Serveranfragen verknüpft,
@@ -20,7 +19,7 @@
 
 <VBox xmlns="http://javafx.com/javafx/21"
       xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="ChatViewController"
+      fx:controller="ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatViewController"
       alignment="CENTER"
       stylesheets="@chatui.css">
 

src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManagerTest.java

@@ -1,7 +1,6 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui;
 
 import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
-import ch.unibas.dmi.dbis.cs108.casono.client.network.TestServer;
 import javafx.scene.layout.GridPane;
 import org.junit.jupiter.api.*;
 
@@ -9,7 +8,7 @@ class LobbyButtonGridManagerTest {
     LobbyButtonGridManager gridManager;
     LobbyButtonTranslationManager translationManager;
     GridPane gridPane;
-    TestServer testServer;
+    ch.unibas.dmi.dbis.cs108.casono.client.network.TestServer testServer;
 
     @BeforeEach
     void setUp() throws Exception {
@@ -17,7 +16,7 @@ class LobbyButtonGridManagerTest {
         translationManager = LobbyButtonTranslationManager.getInstance();
         translationManager.getButtonIdToLobbyId().clear();
         // Start an in-process test server and connect a real ClientService to it.
-        testServer = new TestServer();
+        testServer = new ch.unibas.dmi.dbis.cs108.casono.client.network.TestServer();
         String host = "127.0.0.1";
         int port = testServer.getPort();
         ClientService clientService = new ClientService(host, port);