diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/common/tokenizer/State.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/State.java
similarity index 92%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/common/tokenizer/State.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/State.java
index e99754f..d9fe798 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/common/tokenizer/State.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/State.java
@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.common.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/Test.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/Test.java
new file mode 100644
index 0000000..4c1944c
--- /dev/null
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/Test.java
@@ -0,0 +1,7 @@
+package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
+
+public class Test {
+    public static void main(String[] args) {
+        System.out.println(Tokenizer.tokenize("ARG=12"));
+    }
+}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/common/tokenizer/Token.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/Token.java
similarity index 67%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/common/tokenizer/Token.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/Token.java
index 5ee8d4b..93b9026 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/common/tokenizer/Token.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/Token.java
@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.common.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.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/common/tokenizer/TokenType.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenType.java
similarity index 72%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/common/tokenizer/TokenType.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenType.java
index 54c36ff..b3a4e85 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/common/tokenizer/TokenType.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenType.java
@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.common.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
 
 /** Enumeration of token types used in the tokenizer. */
 public enum TokenType {
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/common/tokenizer/Tokenizer.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/Tokenizer.java
similarity index 98%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/common/tokenizer/Tokenizer.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/Tokenizer.java
index 667c101..8daa411 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/common/tokenizer/Tokenizer.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/Tokenizer.java
@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.common.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
 
 import java.util.List;
 
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/common/tokenizer/TokenizerException.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenizerException.java
similarity index 88%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/common/tokenizer/TokenizerException.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenizerException.java
index da03eae..0975b1d 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/common/tokenizer/TokenizerException.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenizerException.java
@@ -1,4 +1,4 @@
-package ch.unibas.dmi.dbis.cs108.casono.common.tokenizer;
+package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
 
 /** Exception thrown during tokenization. */
 public class TokenizerException extends RuntimeException {