diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/StateTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/StateTest.java
similarity index 91%
rename from src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/StateTest.java
rename to src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/StateTest.java
index b368663..5f0f8be 100644
--- a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/StateTest.java
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/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.tokenizer;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -6,8 +6,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.State;
-
 class StateTest {
     @Test
     void testConstructor() {
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenizerExceptionTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenizerExceptionTest.java
similarity index 76%
rename from src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenizerExceptionTest.java
rename to src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenizerExceptionTest.java
index c2b4178..39ec405 100644
--- a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenizerExceptionTest.java
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenizerExceptionTest.java
@@ -1,11 +1,9 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
-import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.TokenizerException;
-
 class TokenizerExceptionTest {
     @Test
     void testConstructorAndGetters() {