src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/execution/CommandHandler.java

@@ -1,6 +1,6 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.network.request.Request;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
 
 public interface CommandHandler<T extends Request> {
     void execute(T request);

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/execution/CommandRouter.java

@@ -3,7 +3,7 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution;
 import java.util.HashMap;
 import java.util.Map;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.network.request.Request;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
 
 public class CommandRouter {
     private final Map<Class<? extends Request>, CommandHandler<?>> handlers = new HashMap<>();

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParser.java

@@ -1,7 +1,7 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.network.request.PrimitiveRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.request.Request;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
 
 /**
  * Parser to convert the PrimitiveRequest to a Request and performing checks for required fields and

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParserDispatcher.java

@@ -3,8 +3,8 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing;
 import java.util.HashMap;
 import java.util.Map;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.network.request.PrimitiveRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.request.Request;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
 
 /** Dispatcher all CommandParser are registered in */
 public class CommandParserDispatcher {

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/ProtocolParser.java

@@ -1,7 +1,7 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser;
 
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.request.RawRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RawRequest;
 import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.RawToken;
 import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.Token;
 import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.TokenClassifier;

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/PrimitiveRequest.java

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

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/RawRequest.java

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

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/Request.java

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.request;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request;
 
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId;
 

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/RequestContext.java

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.request;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request;
 
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId;
 

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/accessor/MissingParameterException.java

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.request.accessor;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor;
 
 /** Exception thrown when a required parameter key is not found. */
 public class MissingParameterException extends RuntimeException {

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/accessor/ParameterParseException.java

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.request.accessor;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor;
 
 /** Exception thrown when a parameter value cannot be converted to the requested type. */
 public class ParameterParseException extends RuntimeException {

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/accessor/RequestParameterAccessor.java

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

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/accessor/ThrowingParser.java

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.request.accessor;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor;
 
 /**
  * Functional parser interface used to convert a raw string parameter into a target type.

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

@@ -6,10 +6,10 @@ 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.protocol.parser.ProtocolParser;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.ProtocolParserException;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.request.PrimitiveRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.request.RawRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RawRequest;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.request.Request;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.request.RequestContext;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.RawPacket;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer;
 import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.TokenizerException;