diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
index 44a6c726..76767434 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
@@ -2,6 +2,7 @@
 
 import pp.mdga.client.view.GameView;
 import pp.mdga.client.view.LobbyView;
+import pp.mdga.notification.*;
 
 import java.util.ArrayList;
 
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java
index a128bb82..5c504d27 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java
@@ -9,6 +9,10 @@
 import com.jme3.network.serializing.Serializer;
 import pp.mdga.game.Game;
 import pp.mdga.game.Player;
+import pp.mdga.message.client.*;
+import pp.mdga.message.client.ClientMessage;
+import pp.mdga.message.server.*;
+import pp.mdga.message.server.ServerMessage;
 import pp.mdga.server.ServerGameLogic;
 import pp.mdga.server.ServerSender;
 
@@ -53,7 +57,7 @@ public static void main(String[] args) {
      */
     public MdgaServer() {
         LOGGER.log(Level.INFO, "Creating MdgaServer"); //NON-NLS
-        logic = new ServerGameLogic(new Game(), this);
+        logic = null;//new ServerGameLogic(new Game(), this);
     }
 
     public void run() {
@@ -166,13 +170,13 @@ public void messageReceived(HostedConnection source, Message message) {
     @Override
     public void connectionAdded(Server server, HostedConnection hostedConnection) {
         LOGGER.log(Level.INFO, "new connection {0}", hostedConnection); //NON-NLS
-        logic.addPlayer(hostedConnection.getId());
+        //logic.addPlayer(hostedConnection.getId());
     }
 
     @Override
     public void connectionRemoved(Server server, HostedConnection hostedConnection) {
         LOGGER.log(Level.INFO, "connection closed: {0}", hostedConnection); //NON-NLS
-        final Player player = logic.getPlayerById(hostedConnection.getId());
+        final Player player = null;// = logic.getPlayerById(hostedConnection.getId());
         if (player == null)
             LOGGER.log(Level.INFO, "closed connection does not belong to an active player"); //NON-NLS
         else { //NON-NLS
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java
index 47b4388e..9ec3bca9 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java
@@ -1,6 +1,5 @@
 package pp.mdga.client;
 
-import pp.mdga.client.gameState.turnState.choosePieceState.StartPiece;
 import pp.mdga.game.Game;
 import pp.mdga.message.client.ClientMessage;
 import pp.mdga.message.server.*;
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/DetermineStartPlayer.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/DetermineStartPlayer.java
index 007a6ba4..166f6f90 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/DetermineStartPlayer.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/DetermineStartPlayer.java
@@ -2,7 +2,7 @@
 
 import pp.mdga.client.ClientGameLogic;
 import pp.mdga.client.ClientState;
-import pp.mdga.client.gameState.determineStartPlayer.DetermineStartPlayerStateMachine;
+import pp.mdga.client.gameState.determineStartPlayerState.DetermineStartPlayerStateMachine;
 
 public class DetermineStartPlayer extends GameStates {
     private final DetermineStartPlayerStateMachine determineStartPlayerStateMachine;
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/DetermineStartPlayerStateMachine.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/DetermineStartPlayerStateMachine.java
index 40a85b01..8db2cd8a 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/DetermineStartPlayerStateMachine.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/DetermineStartPlayerStateMachine.java
@@ -1,9 +1,8 @@
-package pp.mdga.client.gameState.determineStartPlayer;
+package pp.mdga.client.gameState.determineStartPlayerState;
 
 import pp.mdga.client.ClientGameLogic;
 import pp.mdga.client.ClientState;
 import pp.mdga.client.ClientStateMachine;
-import pp.mdga.client.RollRankingDice;
 
 public class DetermineStartPlayerStateMachine extends ClientStateMachine {
     public DetermineStartPlayerStateMachine(ClientState parent, ClientGameLogic logic) {
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/RollRankingDice.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/RollRankingDice.java
index 56225b22..2c91f998 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/RollRankingDice.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/RollRankingDice.java
@@ -2,7 +2,6 @@
 
 import pp.mdga.client.ClientGameLogic;
 import pp.mdga.client.ClientState;
-import pp.mdga.client.gameState.determineStartPlayer.DetermineStartPlayerStates;
 
 public class RollRankingDice extends DetermineStartPlayerStates {
     public RollRankingDice(ClientState parent, ClientGameLogic logic) {
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
index 87669c71..7fe6251b 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
@@ -383,7 +383,7 @@ public void setAllReady(Boolean allReady) {
      */
     public void notifyObservers() {
         for (Observer observer : new ArrayList<>(observers)) {
-            observer.update();
+            //observer.update();
         }
     }
 
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/DetermineStartPlayer.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/DetermineStartPlayer.java
index 3686ab3e..9f726af0 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/server/DetermineStartPlayer.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/DetermineStartPlayer.java
@@ -1,6 +1,6 @@
 package pp.mdga.server;
 
-public class DetermineStartPlayer extends Game {
+public class DetermineStartPlayer extends GameState {
     public DetermineStartPlayer(ServerGameLogic logic) {
         super(logic);
     }
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/ServerGameLogic.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/ServerGameLogic.java
index bb754961..0a486a88 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/server/ServerGameLogic.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/ServerGameLogic.java
@@ -2,8 +2,6 @@
 
 import pp.mdga.game.Game;
 import pp.mdga.message.client.*;
-import pp.mdga.message.server.NoTurn;
-import pp.mdga.message.server.StartPiece;
 
 import java.lang.System.Logger;
 
@@ -17,7 +15,7 @@ public class ServerGameLogic implements ClientInterpreter  {
     private final ServerState state;
 
     private final ServerState lobby = new Lobby(this);
-    private final ServerState game = new Game(this);
+    private final ServerState gameState = new GameState(this);
     private final ServerState interrupt = new Interrupt(this);
     private final ServerState ceremony = new Ceremony(this);
     private final ServerState turn = new Turn(this);
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/Turn.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/Turn.java
index 77c28708..e15e5bfa 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/server/Turn.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/Turn.java
@@ -1,6 +1,6 @@
 package pp.mdga.server;
 
-public class Turn extends Game {
+public class Turn extends GameState {
     public Turn(ServerGameLogic logic) {
         super(logic);
     }