src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/DisconnectEvent.java

@@ -1,3 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network;
-
-public record DisconnectEvent(SessionId sessionId) implements Event {}

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/Event.java

@@ -1,3 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network;
-
-interface Event {}

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/NetworkManager.java

@@ -7,6 +7,12 @@ import java.net.Socket;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.events.DisconnectEvent;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.Session;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionManager;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TcpTransport;
+
 /**
  * Creates and manages the server socket. Accepts new incomming connections and creates sessions.
  */

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/DisconnectEvent.java

@@ -0,0 +1,5 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.network.events;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId;
+
+public record DisconnectEvent(SessionId sessionId) implements Event {}

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/Event.java

@@ -0,0 +1,3 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.network.events;
+
+interface Event {}

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/events/EventBus.java

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.events;
 
 import java.util.List;
 import java.util.Map;

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java

@@ -1,10 +1,14 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions;
 
 import java.io.EOFException;
 import java.io.IOException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.events.DisconnectEvent;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer;
+
 public class Session implements Runnable {
     private SessionId id;
     private Thread thread;

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionId.java

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions;
 
 import java.util.UUID;
 

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/transport/TcpTransport.java

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.transport;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/transport/TransportLayer.java

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.transport;
 
 import java.io.IOException;