diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/ProtocolParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/ProtocolParser.java
index e5ab65d..b3afd0c 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/ProtocolParser.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/ProtocolParser.java
@@ -1,12 +1,12 @@
 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.protocol.parser.tokenizer.RawToken;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer.Token;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer.TokenClassifier;
+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 ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.RawToken;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.Token;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.TokenClassifier;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.TokenType;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.Tokenizer;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/RawToken.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/RawToken.java
similarity index 92%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/RawToken.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/RawToken.java
index d454904..1a07f35 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/RawToken.java
+++ b/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.network.protocol.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) {}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/RawTokenType.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/RawTokenType.java
similarity index 89%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/RawTokenType.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/RawTokenType.java
index 309767e..15949a3 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/RawTokenType.java
+++ b/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.network.protocol.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer;
 
 public enum RawTokenType {
     WORD,
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/State.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/State.java
similarity index 97%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/State.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/State.java
index faf7e6f..2848d99 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/State.java
+++ b/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.network.protocol.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/Token.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/Token.java
similarity index 91%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/Token.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/Token.java
index f885eba..c99d3cd 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/Token.java
+++ b/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.network.protocol.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) {}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenClassifier.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/TokenClassifier.java
similarity index 99%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenClassifier.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/TokenClassifier.java
index 4d5c26a..330dcbb 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenClassifier.java
+++ b/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.network.protocol.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenType.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/TokenType.java
similarity index 91%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenType.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/TokenType.java
index 3496607..5096da9 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenType.java
+++ b/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.network.protocol.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer;
 
 /** Enumeration of token types used in the tokenizer. */
 public enum TokenType {
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/Tokenizer.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/Tokenizer.java
similarity index 99%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/Tokenizer.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/Tokenizer.java
index 24920f9..843edf9 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/Tokenizer.java
+++ b/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.network.protocol.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer;
 
 import java.util.List;
 
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenizerException.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/TokenizerException.java
similarity index 96%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenizerException.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/tokenizer/TokenizerException.java
index 1e3e9bf..c514a1e 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenizerException.java
+++ b/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.network.protocol.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.tokenizer;
 
 /** Exception thrown during tokenization. */
 public class TokenizerException extends RuntimeException {
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java
index aa17e67..81589a0 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java
@@ -6,11 +6,11 @@ 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.protocol.parser.tokenizer.TokenizerException;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RawRequest;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.TokenizerException;
 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.EOFException;