diff --git a/labyrinth-generator.iml b/labyrinth-generator.iml
new file mode 100644
index 0000000..86ee68f
--- /dev/null
+++ b/labyrinth-generator.iml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:19.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.vavr:vavr:0.10.2" level="project" />
+    <orderEntry type="library" name="Maven: io.vavr:vavr-match:0.10.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox:2.0.20" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.pdfbox:fontbox:2.0.20" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.6.1" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4c6d067..0485fbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>ch.fritteli.labyrinth.Main</mainClass>
+							<mainClass>ch.fritteli.labyrinth.generator.Main</mainClass>
 						</manifest>
 					</archive>
 					<descriptorRefs>
diff --git a/src/main/java/ch/fritteli/labyrinth/Main.java b/src/main/java/ch/fritteli/labyrinth/generator/Main.java
similarity index 83%
rename from src/main/java/ch/fritteli/labyrinth/Main.java
rename to src/main/java/ch/fritteli/labyrinth/generator/Main.java
index 61b888b..1541519 100644
--- a/src/main/java/ch/fritteli/labyrinth/Main.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/Main.java
@@ -1,12 +1,12 @@
-package ch.fritteli.labyrinth;
+package ch.fritteli.labyrinth.generator;
 
-import ch.fritteli.labyrinth.model.Labyrinth;
-import ch.fritteli.labyrinth.net.TheListener;
-import ch.fritteli.labyrinth.renderer.html.HTMLRenderer;
-import ch.fritteli.labyrinth.renderer.htmlfile.HTMLFileRenderer;
-import ch.fritteli.labyrinth.renderer.pdffile.PDFFileRenderer;
-import ch.fritteli.labyrinth.renderer.text.TextRenderer;
-import ch.fritteli.labyrinth.renderer.textfile.TextFileRenderer;
+import ch.fritteli.labyrinth.generator.model.Labyrinth;
+import ch.fritteli.labyrinth.generator.net.TheListener;
+import ch.fritteli.labyrinth.generator.renderer.html.HTMLRenderer;
+import ch.fritteli.labyrinth.generator.renderer.htmlfile.HTMLFileRenderer;
+import ch.fritteli.labyrinth.generator.renderer.pdffile.PDFFileRenderer;
+import ch.fritteli.labyrinth.generator.renderer.text.TextRenderer;
+import ch.fritteli.labyrinth.generator.renderer.textfile.TextFileRenderer;
 import io.vavr.control.Option;
 import lombok.NonNull;
 
diff --git a/src/main/java/ch/fritteli/labyrinth/model/Direction.java b/src/main/java/ch/fritteli/labyrinth/generator/model/Direction.java
similarity index 91%
rename from src/main/java/ch/fritteli/labyrinth/model/Direction.java
rename to src/main/java/ch/fritteli/labyrinth/generator/model/Direction.java
index ec8a8c2..9239bcd 100644
--- a/src/main/java/ch/fritteli/labyrinth/model/Direction.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/model/Direction.java
@@ -1,4 +1,4 @@
-package ch.fritteli.labyrinth.model;
+package ch.fritteli.labyrinth.generator.model;
 
 public enum Direction {
     TOP,
diff --git a/src/main/java/ch/fritteli/labyrinth/model/Labyrinth.java b/src/main/java/ch/fritteli/labyrinth/generator/model/Labyrinth.java
similarity index 99%
rename from src/main/java/ch/fritteli/labyrinth/model/Labyrinth.java
rename to src/main/java/ch/fritteli/labyrinth/generator/model/Labyrinth.java
index 2754770..f358f11 100644
--- a/src/main/java/ch/fritteli/labyrinth/model/Labyrinth.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/model/Labyrinth.java
@@ -1,4 +1,4 @@
-package ch.fritteli.labyrinth.model;
+package ch.fritteli.labyrinth.generator.model;
 
 import io.vavr.control.Option;
 import lombok.Getter;
diff --git a/src/main/java/ch/fritteli/labyrinth/model/Position.java b/src/main/java/ch/fritteli/labyrinth/generator/model/Position.java
similarity index 93%
rename from src/main/java/ch/fritteli/labyrinth/model/Position.java
rename to src/main/java/ch/fritteli/labyrinth/generator/model/Position.java
index 036e5e1..a9751e6 100644
--- a/src/main/java/ch/fritteli/labyrinth/model/Position.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/model/Position.java
@@ -1,4 +1,4 @@
-package ch.fritteli.labyrinth.model;
+package ch.fritteli.labyrinth.generator.model;
 
 import lombok.NonNull;
 import lombok.Value;
diff --git a/src/main/java/ch/fritteli/labyrinth/model/Tile.java b/src/main/java/ch/fritteli/labyrinth/generator/model/Tile.java
similarity index 97%
rename from src/main/java/ch/fritteli/labyrinth/model/Tile.java
rename to src/main/java/ch/fritteli/labyrinth/generator/model/Tile.java
index 8182607..c7fb01b 100644
--- a/src/main/java/ch/fritteli/labyrinth/model/Tile.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/model/Tile.java
@@ -1,4 +1,4 @@
-package ch.fritteli.labyrinth.model;
+package ch.fritteli.labyrinth.generator.model;
 
 import io.vavr.collection.Stream;
 import io.vavr.control.Option;
diff --git a/src/main/java/ch/fritteli/labyrinth/model/Walls.java b/src/main/java/ch/fritteli/labyrinth/generator/model/Walls.java
similarity index 96%
rename from src/main/java/ch/fritteli/labyrinth/model/Walls.java
rename to src/main/java/ch/fritteli/labyrinth/generator/model/Walls.java
index a48b82b..0dced66 100644
--- a/src/main/java/ch/fritteli/labyrinth/model/Walls.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/model/Walls.java
@@ -1,4 +1,4 @@
-package ch.fritteli.labyrinth.model;
+package ch.fritteli.labyrinth.generator.model;
 
 import io.vavr.collection.Stream;
 import lombok.NonNull;
diff --git a/src/main/java/ch/fritteli/labyrinth/net/TheListener.java b/src/main/java/ch/fritteli/labyrinth/generator/net/TheListener.java
similarity index 96%
rename from src/main/java/ch/fritteli/labyrinth/net/TheListener.java
rename to src/main/java/ch/fritteli/labyrinth/generator/net/TheListener.java
index 4b2b3ab..df898ae 100644
--- a/src/main/java/ch/fritteli/labyrinth/net/TheListener.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/net/TheListener.java
@@ -1,9 +1,9 @@
-package ch.fritteli.labyrinth.net;
+package ch.fritteli.labyrinth.generator.net;
 
-import ch.fritteli.labyrinth.model.Labyrinth;
-import ch.fritteli.labyrinth.renderer.html.HTMLRenderer;
-import ch.fritteli.labyrinth.renderer.pdf.PDFRenderer;
-import ch.fritteli.labyrinth.renderer.text.TextRenderer;
+import ch.fritteli.labyrinth.generator.model.Labyrinth;
+import ch.fritteli.labyrinth.generator.renderer.html.HTMLRenderer;
+import ch.fritteli.labyrinth.generator.renderer.pdf.PDFRenderer;
+import ch.fritteli.labyrinth.generator.renderer.text.TextRenderer;
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpServer;
 import io.vavr.collection.HashMap;
diff --git a/src/main/java/ch/fritteli/labyrinth/renderer/Renderer.java b/src/main/java/ch/fritteli/labyrinth/generator/renderer/Renderer.java
similarity index 53%
rename from src/main/java/ch/fritteli/labyrinth/renderer/Renderer.java
rename to src/main/java/ch/fritteli/labyrinth/generator/renderer/Renderer.java
index d1e04f7..2c3ea3b 100644
--- a/src/main/java/ch/fritteli/labyrinth/renderer/Renderer.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/renderer/Renderer.java
@@ -1,6 +1,6 @@
-package ch.fritteli.labyrinth.renderer;
+package ch.fritteli.labyrinth.generator.renderer;
 
-import ch.fritteli.labyrinth.model.Labyrinth;
+import ch.fritteli.labyrinth.generator.model.Labyrinth;
 import lombok.NonNull;
 
 public interface Renderer<T> {
diff --git a/src/main/java/ch/fritteli/labyrinth/renderer/html/Generator.java b/src/main/java/ch/fritteli/labyrinth/generator/renderer/html/Generator.java
similarity index 86%
rename from src/main/java/ch/fritteli/labyrinth/renderer/html/Generator.java
rename to src/main/java/ch/fritteli/labyrinth/generator/renderer/html/Generator.java
index b521949..1fda57d 100644
--- a/src/main/java/ch/fritteli/labyrinth/renderer/html/Generator.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/renderer/html/Generator.java
@@ -1,8 +1,8 @@
-package ch.fritteli.labyrinth.renderer.html;
+package ch.fritteli.labyrinth.generator.renderer.html;
 
-import ch.fritteli.labyrinth.model.Direction;
-import ch.fritteli.labyrinth.model.Labyrinth;
-import ch.fritteli.labyrinth.model.Tile;
+import ch.fritteli.labyrinth.generator.model.Direction;
+import ch.fritteli.labyrinth.generator.model.Labyrinth;
+import ch.fritteli.labyrinth.generator.model.Tile;
 import io.vavr.collection.HashSet;
 import io.vavr.collection.Set;
 import lombok.AccessLevel;
diff --git a/src/main/java/ch/fritteli/labyrinth/renderer/html/HTMLRenderer.java b/src/main/java/ch/fritteli/labyrinth/generator/renderer/html/HTMLRenderer.java
similarity index 92%
rename from src/main/java/ch/fritteli/labyrinth/renderer/html/HTMLRenderer.java
rename to src/main/java/ch/fritteli/labyrinth/generator/renderer/html/HTMLRenderer.java
index 706c694..03666a7 100644
--- a/src/main/java/ch/fritteli/labyrinth/renderer/html/HTMLRenderer.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/renderer/html/HTMLRenderer.java
@@ -1,7 +1,7 @@
-package ch.fritteli.labyrinth.renderer.html;
+package ch.fritteli.labyrinth.generator.renderer.html;
 
-import ch.fritteli.labyrinth.model.Labyrinth;
-import ch.fritteli.labyrinth.renderer.Renderer;
+import ch.fritteli.labyrinth.generator.model.Labyrinth;
+import ch.fritteli.labyrinth.generator.renderer.Renderer;
 import lombok.NonNull;
 
 public class HTMLRenderer implements Renderer<String> {
diff --git a/src/main/java/ch/fritteli/labyrinth/renderer/htmlfile/HTMLFileRenderer.java b/src/main/java/ch/fritteli/labyrinth/generator/renderer/htmlfile/HTMLFileRenderer.java
similarity index 87%
rename from src/main/java/ch/fritteli/labyrinth/renderer/htmlfile/HTMLFileRenderer.java
rename to src/main/java/ch/fritteli/labyrinth/generator/renderer/htmlfile/HTMLFileRenderer.java
index 3540848..3407537 100644
--- a/src/main/java/ch/fritteli/labyrinth/renderer/htmlfile/HTMLFileRenderer.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/renderer/htmlfile/HTMLFileRenderer.java
@@ -1,8 +1,8 @@
-package ch.fritteli.labyrinth.renderer.htmlfile;
+package ch.fritteli.labyrinth.generator.renderer.htmlfile;
 
-import ch.fritteli.labyrinth.model.Labyrinth;
-import ch.fritteli.labyrinth.renderer.Renderer;
-import ch.fritteli.labyrinth.renderer.html.HTMLRenderer;
+import ch.fritteli.labyrinth.generator.model.Labyrinth;
+import ch.fritteli.labyrinth.generator.renderer.Renderer;
+import ch.fritteli.labyrinth.generator.renderer.html.HTMLRenderer;
 import lombok.NonNull;
 
 import java.io.IOException;
diff --git a/src/main/java/ch/fritteli/labyrinth/renderer/pdf/Generator.java b/src/main/java/ch/fritteli/labyrinth/generator/renderer/pdf/Generator.java
similarity index 97%
rename from src/main/java/ch/fritteli/labyrinth/renderer/pdf/Generator.java
rename to src/main/java/ch/fritteli/labyrinth/generator/renderer/pdf/Generator.java
index 9a7445d..a45d60d 100644
--- a/src/main/java/ch/fritteli/labyrinth/renderer/pdf/Generator.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/renderer/pdf/Generator.java
@@ -1,9 +1,9 @@
-package ch.fritteli.labyrinth.renderer.pdf;
+package ch.fritteli.labyrinth.generator.renderer.pdf;
 
-import ch.fritteli.labyrinth.model.Direction;
-import ch.fritteli.labyrinth.model.Labyrinth;
-import ch.fritteli.labyrinth.model.Position;
-import ch.fritteli.labyrinth.model.Tile;
+import ch.fritteli.labyrinth.generator.model.Direction;
+import ch.fritteli.labyrinth.generator.model.Labyrinth;
+import ch.fritteli.labyrinth.generator.model.Position;
+import ch.fritteli.labyrinth.generator.model.Tile;
 import io.vavr.control.Option;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/ch/fritteli/labyrinth/renderer/pdf/PDFRenderer.java b/src/main/java/ch/fritteli/labyrinth/generator/renderer/pdf/PDFRenderer.java
similarity index 74%
rename from src/main/java/ch/fritteli/labyrinth/renderer/pdf/PDFRenderer.java
rename to src/main/java/ch/fritteli/labyrinth/generator/renderer/pdf/PDFRenderer.java
index f9fe963..099d2ec 100644
--- a/src/main/java/ch/fritteli/labyrinth/renderer/pdf/PDFRenderer.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/renderer/pdf/PDFRenderer.java
@@ -1,7 +1,7 @@
-package ch.fritteli.labyrinth.renderer.pdf;
+package ch.fritteli.labyrinth.generator.renderer.pdf;
 
-import ch.fritteli.labyrinth.model.Labyrinth;
-import ch.fritteli.labyrinth.renderer.Renderer;
+import ch.fritteli.labyrinth.generator.model.Labyrinth;
+import ch.fritteli.labyrinth.generator.renderer.Renderer;
 import lombok.NonNull;
 
 public class PDFRenderer implements Renderer<byte[]> {
diff --git a/src/main/java/ch/fritteli/labyrinth/renderer/pdffile/PDFFileRenderer.java b/src/main/java/ch/fritteli/labyrinth/generator/renderer/pdffile/PDFFileRenderer.java
similarity index 87%
rename from src/main/java/ch/fritteli/labyrinth/renderer/pdffile/PDFFileRenderer.java
rename to src/main/java/ch/fritteli/labyrinth/generator/renderer/pdffile/PDFFileRenderer.java
index af82c07..8523c5b 100644
--- a/src/main/java/ch/fritteli/labyrinth/renderer/pdffile/PDFFileRenderer.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/renderer/pdffile/PDFFileRenderer.java
@@ -1,8 +1,8 @@
-package ch.fritteli.labyrinth.renderer.pdffile;
+package ch.fritteli.labyrinth.generator.renderer.pdffile;
 
-import ch.fritteli.labyrinth.model.Labyrinth;
-import ch.fritteli.labyrinth.renderer.Renderer;
-import ch.fritteli.labyrinth.renderer.pdf.PDFRenderer;
+import ch.fritteli.labyrinth.generator.model.Labyrinth;
+import ch.fritteli.labyrinth.generator.renderer.Renderer;
+import ch.fritteli.labyrinth.generator.renderer.pdf.PDFRenderer;
 import lombok.NonNull;
 
 import java.io.IOException;
diff --git a/src/main/java/ch/fritteli/labyrinth/renderer/text/CharDefinition.java b/src/main/java/ch/fritteli/labyrinth/generator/renderer/text/CharDefinition.java
similarity index 98%
rename from src/main/java/ch/fritteli/labyrinth/renderer/text/CharDefinition.java
rename to src/main/java/ch/fritteli/labyrinth/generator/renderer/text/CharDefinition.java
index 4f7e0a9..a8c0513 100644
--- a/src/main/java/ch/fritteli/labyrinth/renderer/text/CharDefinition.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/renderer/text/CharDefinition.java
@@ -1,4 +1,4 @@
-package ch.fritteli.labyrinth.renderer.text;
+package ch.fritteli.labyrinth.generator.renderer.text;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/ch/fritteli/labyrinth/renderer/text/Generator.java b/src/main/java/ch/fritteli/labyrinth/generator/renderer/text/Generator.java
similarity index 97%
rename from src/main/java/ch/fritteli/labyrinth/renderer/text/Generator.java
rename to src/main/java/ch/fritteli/labyrinth/generator/renderer/text/Generator.java
index afb8ccc..8378018 100644
--- a/src/main/java/ch/fritteli/labyrinth/renderer/text/Generator.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/renderer/text/Generator.java
@@ -1,8 +1,8 @@
-package ch.fritteli.labyrinth.renderer.text;
+package ch.fritteli.labyrinth.generator.renderer.text;
 
-import ch.fritteli.labyrinth.model.Direction;
-import ch.fritteli.labyrinth.model.Labyrinth;
-import ch.fritteli.labyrinth.model.Tile;
+import ch.fritteli.labyrinth.generator.model.Direction;
+import ch.fritteli.labyrinth.generator.model.Labyrinth;
+import ch.fritteli.labyrinth.generator.model.Tile;
 import io.vavr.control.Option;
 import lombok.AccessLevel;
 import lombok.NonNull;
diff --git a/src/main/java/ch/fritteli/labyrinth/renderer/text/TextRenderer.java b/src/main/java/ch/fritteli/labyrinth/generator/renderer/text/TextRenderer.java
similarity index 84%
rename from src/main/java/ch/fritteli/labyrinth/renderer/text/TextRenderer.java
rename to src/main/java/ch/fritteli/labyrinth/generator/renderer/text/TextRenderer.java
index d7fad29..ecb605f 100644
--- a/src/main/java/ch/fritteli/labyrinth/renderer/text/TextRenderer.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/renderer/text/TextRenderer.java
@@ -1,7 +1,7 @@
-package ch.fritteli.labyrinth.renderer.text;
+package ch.fritteli.labyrinth.generator.renderer.text;
 
-import ch.fritteli.labyrinth.model.Labyrinth;
-import ch.fritteli.labyrinth.renderer.Renderer;
+import ch.fritteli.labyrinth.generator.model.Labyrinth;
+import ch.fritteli.labyrinth.generator.renderer.Renderer;
 import lombok.NonNull;
 
 public class TextRenderer implements Renderer<String> {
diff --git a/src/main/java/ch/fritteli/labyrinth/renderer/textfile/TextFileRenderer.java b/src/main/java/ch/fritteli/labyrinth/generator/renderer/textfile/TextFileRenderer.java
similarity index 92%
rename from src/main/java/ch/fritteli/labyrinth/renderer/textfile/TextFileRenderer.java
rename to src/main/java/ch/fritteli/labyrinth/generator/renderer/textfile/TextFileRenderer.java
index 51560a5..9f0d959 100644
--- a/src/main/java/ch/fritteli/labyrinth/renderer/textfile/TextFileRenderer.java
+++ b/src/main/java/ch/fritteli/labyrinth/generator/renderer/textfile/TextFileRenderer.java
@@ -1,8 +1,8 @@
-package ch.fritteli.labyrinth.renderer.textfile;
+package ch.fritteli.labyrinth.generator.renderer.textfile;
 
-import ch.fritteli.labyrinth.model.Labyrinth;
-import ch.fritteli.labyrinth.renderer.Renderer;
-import ch.fritteli.labyrinth.renderer.text.TextRenderer;
+import ch.fritteli.labyrinth.generator.model.Labyrinth;
+import ch.fritteli.labyrinth.generator.renderer.Renderer;
+import ch.fritteli.labyrinth.generator.renderer.text.TextRenderer;
 import io.vavr.collection.List;
 import lombok.NonNull;
 
diff --git a/src/test/java/ch/fritteli/labyrinth/model/DirectionTest.java b/src/test/java/ch/fritteli/labyrinth/generator/model/DirectionTest.java
similarity index 89%
rename from src/test/java/ch/fritteli/labyrinth/model/DirectionTest.java
rename to src/test/java/ch/fritteli/labyrinth/generator/model/DirectionTest.java
index 74b0d36..b94bbc3 100644
--- a/src/test/java/ch/fritteli/labyrinth/model/DirectionTest.java
+++ b/src/test/java/ch/fritteli/labyrinth/generator/model/DirectionTest.java
@@ -1,4 +1,4 @@
-package ch.fritteli.labyrinth.model;
+package ch.fritteli.labyrinth.generator.model;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/ch/fritteli/labyrinth/model/LabyrinthTest.java b/src/test/java/ch/fritteli/labyrinth/generator/model/LabyrinthTest.java
similarity index 94%
rename from src/test/java/ch/fritteli/labyrinth/model/LabyrinthTest.java
rename to src/test/java/ch/fritteli/labyrinth/generator/model/LabyrinthTest.java
index eb5968a..45ecc99 100644
--- a/src/test/java/ch/fritteli/labyrinth/model/LabyrinthTest.java
+++ b/src/test/java/ch/fritteli/labyrinth/generator/model/LabyrinthTest.java
@@ -1,4 +1,4 @@
-package ch.fritteli.labyrinth.model;
+package ch.fritteli.labyrinth.generator.model;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/ch/fritteli/labyrinth/model/PositionTest.java b/src/test/java/ch/fritteli/labyrinth/generator/model/PositionTest.java
similarity index 94%
rename from src/test/java/ch/fritteli/labyrinth/model/PositionTest.java
rename to src/test/java/ch/fritteli/labyrinth/generator/model/PositionTest.java
index c23d6d8..f1494c9 100644
--- a/src/test/java/ch/fritteli/labyrinth/model/PositionTest.java
+++ b/src/test/java/ch/fritteli/labyrinth/generator/model/PositionTest.java
@@ -1,4 +1,4 @@
-package ch.fritteli.labyrinth.model;
+package ch.fritteli.labyrinth.generator.model;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/ch/fritteli/labyrinth/model/TileTest.java b/src/test/java/ch/fritteli/labyrinth/generator/model/TileTest.java
similarity index 99%
rename from src/test/java/ch/fritteli/labyrinth/model/TileTest.java
rename to src/test/java/ch/fritteli/labyrinth/generator/model/TileTest.java
index 6b3b744..6d8f5d0 100644
--- a/src/test/java/ch/fritteli/labyrinth/model/TileTest.java
+++ b/src/test/java/ch/fritteli/labyrinth/generator/model/TileTest.java
@@ -1,4 +1,4 @@
-package ch.fritteli.labyrinth.model;
+package ch.fritteli.labyrinth.generator.model;
 
 import io.vavr.control.Option;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/fritteli/labyrinth/model/WallsTest.java b/src/test/java/ch/fritteli/labyrinth/generator/model/WallsTest.java
similarity index 98%
rename from src/test/java/ch/fritteli/labyrinth/model/WallsTest.java
rename to src/test/java/ch/fritteli/labyrinth/generator/model/WallsTest.java
index 69e19ba..78de732 100644
--- a/src/test/java/ch/fritteli/labyrinth/model/WallsTest.java
+++ b/src/test/java/ch/fritteli/labyrinth/generator/model/WallsTest.java
@@ -1,4 +1,4 @@
-package ch.fritteli.labyrinth.model;
+package ch.fritteli.labyrinth.generator.model;
 
 import io.vavr.collection.Stream;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/fritteli/labyrinth/renderer/text/CharDefinitionTest.java b/src/test/java/ch/fritteli/labyrinth/generator/renderer/text/CharDefinitionTest.java
similarity index 98%
rename from src/test/java/ch/fritteli/labyrinth/renderer/text/CharDefinitionTest.java
rename to src/test/java/ch/fritteli/labyrinth/generator/renderer/text/CharDefinitionTest.java
index a6b8b45..818771d 100644
--- a/src/test/java/ch/fritteli/labyrinth/renderer/text/CharDefinitionTest.java
+++ b/src/test/java/ch/fritteli/labyrinth/generator/renderer/text/CharDefinitionTest.java
@@ -1,4 +1,4 @@
-package ch.fritteli.labyrinth.renderer.text;
+package ch.fritteli.labyrinth.generator.renderer.text;
 
 import org.junit.jupiter.api.Test;