Merge branch 'chore/26-restructure-server-files' into 'main'

Restructure server files and folders

Closes #26

See merge request cs108-fs26/Gruppe-13!56

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

@@ -3,10 +3,10 @@ package ch.unibas.dmi.dbis.cs108.casono.server;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserCleanupJob;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.NetworkManager;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.command.CommandRouter;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandRouter;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParserDispatcher;
 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.parser.CommandParserDispatcher;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionDisconnectJob;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionManager;
 import java.time.Duration;

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserRegistry.java

@@ -58,7 +58,6 @@ public class UserRegistry {
      *
      * @param sessionId the session ID of the disconnected client
      */
-    // TODO: Add to EventRegistry with DisconnectEvent
     public synchronized void onDisconnect(SessionId sessionId) {
         User user = bySessionId.remove(sessionId);
         if (user == null) {

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

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

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

@@ -0,0 +1,7 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution;
+
+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

@@ -1,6 +1,6 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.command;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.Request;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
 import java.util.HashMap;
 import java.util.Map;
 

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

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.command;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution;
 
 public class UnknownRequestException extends RuntimeException {
     private final String requestName;

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

@@ -1,4 +1,7 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.parser;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
+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

@@ -1,5 +1,7 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.parser;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
 import java.util.HashMap;
 import java.util.Map;
 

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

@@ -0,0 +1,4 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing;
+
+/** Used in the PrimitiveRequest class to store the key of a parameter with its respective value */
+public record RequestParameter(String key, String value) {}

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

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.parser;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing;
 
 /**
  * Exception thrown when the CommandParserDispatcher has no registered handler for the provided

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

@@ -1,4 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.parser;
-
-/** Used in the PrimitiveRequest class to store the key of a parameter with its respective value */
-public record Parameter(String key, String value) {}

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

@@ -1,7 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.parser;
-
-import java.util.List;
-
-/** Created by the ProtocolParser to allow easy access to the request contents */
-public record PrimitiveRequest(
-        RequestContext context, String command, List<Parameter> parameters) {}

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

@@ -1,5 +0,0 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.parser;
-
-import java.util.List;
-
-public record RawRequest(String command, List<Parameter> parameters) {}

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

@@ -1,10 +1,12 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.parser;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.RawToken;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter;
-import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.Token;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer.RawToken;
-import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.TokenClassifier;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer.Token;
-import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.TokenType;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer.TokenClassifier;
-import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.Tokenizer;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer.TokenType;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer.Tokenizer;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RawRequest;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -24,7 +26,7 @@ public class ProtocolParser {
 
         Iterator<Token> iterator = tokens.iterator();
         String command = readCommand(iterator);
-        List<Parameter> parameters = readParameters(iterator);
+        List<RequestParameter> parameters = readParameters(iterator);
 
         return new RawRequest(command, parameters);
     }
@@ -50,8 +52,8 @@ public class ProtocolParser {
      * @param iterator
      * @return list containing all parsed parameters
      */
-    private static List<Parameter> readParameters(Iterator<Token> iterator) {
+    private static List<RequestParameter> readParameters(Iterator<Token> iterator) {
-        List<Parameter> parameters = new ArrayList<>();
+        List<RequestParameter> parameters = new ArrayList<>();
 
         try {
             while (iterator.hasNext()) {
@@ -65,7 +67,7 @@ public class ProtocolParser {
                 readSeperator(iterator.next());
                 String value = readValue(iterator.next());
 
-                parameters.add(new Parameter(key, value));
+                parameters.add(new RequestParameter(key, value));
             }
         } catch (NoSuchElementException e) {
             throw new ProtocolParserException("Ran out of tokens while reading parameter");

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

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.parser;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser;
 
 public class ProtocolParserException extends RuntimeException {
     public ProtocolParserException(String message) {

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

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer;
 
 /** Represents a raw (unclassified) token in the tokenizer. */
 public record RawToken(RawTokenType type, String value, int line, int column) {}

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

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer;
 
 public enum RawTokenType {
     WORD,

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

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

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

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer;
 
 /** Represents a token in the tokenizer. */
 public record Token(TokenType type, String value, int line, int column) {}

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

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

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

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer;
 
 /** Enumeration of token types used in the tokenizer. */
 public enum TokenType {

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

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

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

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer;
 
 /** Exception thrown during tokenization. */
 public class TokenizerException extends RuntimeException {

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

@@ -0,0 +1,8 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter;
+import java.util.List;
+
+/** Created by the ProtocolParser to allow easy access to the request contents */
+public record PrimitiveRequest(
+        RequestContext context, String command, List<RequestParameter> parameters) {}

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

@@ -0,0 +1,6 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter;
+import java.util.List;
+
+public record RawRequest(String command, List<RequestParameter> parameters) {}

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.parser;
+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.parser;
+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.parser;
+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.parser;
+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,5 +1,6 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.parser;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -18,10 +19,12 @@ public class RequestParameterAccessor {
      *
      * @param parameters to use
      */
-    public RequestParameterAccessor(List<Parameter> parameters) {
+    public RequestParameterAccessor(List<RequestParameter> parameters) {
         this.index =
                 parameters.stream()
-                        .collect(Collectors.toUnmodifiableMap(Parameter::key, Parameter::value));
+                        .collect(
+                                Collectors.toUnmodifiableMap(
+                                        RequestParameter::key, RequestParameter::value));
     }
 
     /**

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.parser;
+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/protocol/response/ErrorResponse.java

@@ -1,5 +1,6 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.response;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId;
 
 /** Response representing an error outcome for a client's request. */

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/OkResponse.java

@@ -1,5 +1,6 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.response;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId;
 
 /**

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/PrimitiveResponse.java

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

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/Response.java

@@ -1,5 +1,6 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.response;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId;
 
 /** Abstract base class for all server responses sent to clients. */

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java

@@ -1,5 +1,6 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.response;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId;
 
 /**

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseBlock.java

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

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseBody.java

@@ -1,5 +1,6 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.response;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.Response;
 import java.util.List;
 
 /**

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseBodyBuilder.java

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

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseNode.java

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.response;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder;
 
 /**
  * Marker interface for elements that may appear in a {@link ResponseBody}.

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseParameter.java

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.response;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder;
 
 /**
  * A parameter node stored in a {@link ResponseBody}.

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/dispatcher/ResponseDispatcher.java

@@ -1,5 +1,7 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.response;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.PrimitiveResponse;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.Response;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.Session;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionManager;
 

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/dispatcher/ResponseEncoder.java

@@ -1,4 +1,10 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.response;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher;
+
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.PrimitiveResponse;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.Response;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBlock;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseNode;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseParameter;
 
 /**
  * Utility responsible for encoding a {@link Response} into a protocol payload string and wrapping

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

@@ -1,9 +1,9 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.network.command.CommandRouter;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandRouter;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParserDispatcher;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.CommandParserDispatcher;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.PrimitiveResponse;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.response.PrimitiveResponse;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer;
 import java.io.IOException;
 import java.time.Instant;

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

@@ -1,9 +1,9 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.network.command.CommandRouter;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandRouter;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParserDispatcher;
 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.parser.CommandParserDispatcher;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer;
 import java.io.IOException;
 import java.util.Collection;

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

@@ -1,18 +1,18 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.network.command.CommandRouter;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandRouter;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParserDispatcher;
 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.parser.CommandParserDispatcher;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.ProtocolParser;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.PrimitiveRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.ProtocolParserException;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.ProtocolParser;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer.TokenizerException;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.ProtocolParserException;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.RawRequest;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RawRequest;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.Request;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.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;
 import java.io.EOFException;
 import java.io.IOException;
 import org.apache.logging.log4j.LogManager;

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

@@ -1,6 +1,6 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.network.response.PrimitiveResponse;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.PrimitiveResponse;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.RawPacket;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer;
 import java.io.IOException;

src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/StateTest.java

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;

src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/TokenizerExceptionTest.java

@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;