diff --git a/src/main/java/eu/m724/Crossword.java b/src/main/java/eu/m724/crossword/Crossword.java
similarity index 96%
rename from src/main/java/eu/m724/Crossword.java
rename to src/main/java/eu/m724/crossword/Crossword.java
index 1997454..15179a9 100644
--- a/src/main/java/eu/m724/Crossword.java
+++ b/src/main/java/eu/m724/crossword/Crossword.java
@@ -1,4 +1,4 @@
-package eu.m724;
+package eu.m724.crossword;
 
 /**
  * Represents the crossword<br>
diff --git a/src/main/java/eu/m724/CrosswordBuilder.java b/src/main/java/eu/m724/crossword/CrosswordBuilder.java
similarity index 99%
rename from src/main/java/eu/m724/CrosswordBuilder.java
rename to src/main/java/eu/m724/crossword/CrosswordBuilder.java
index 9f2d95d..0fc3ca4 100644
--- a/src/main/java/eu/m724/CrosswordBuilder.java
+++ b/src/main/java/eu/m724/crossword/CrosswordBuilder.java
@@ -1,4 +1,4 @@
-package eu.m724;
+package eu.m724.crossword;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/src/main/java/eu/m724/Generator.java b/src/main/java/eu/m724/crossword/Generator.java
similarity index 98%
rename from src/main/java/eu/m724/Generator.java
rename to src/main/java/eu/m724/crossword/Generator.java
index 6164d9d..4985798 100644
--- a/src/main/java/eu/m724/Generator.java
+++ b/src/main/java/eu/m724/crossword/Generator.java
@@ -1,4 +1,4 @@
-package eu.m724;
+package eu.m724.crossword;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/main/java/eu/m724/Main.java b/src/main/java/eu/m724/crossword/Main.java
similarity index 98%
rename from src/main/java/eu/m724/Main.java
rename to src/main/java/eu/m724/crossword/Main.java
index 9677f4b..294b2e3 100644
--- a/src/main/java/eu/m724/Main.java
+++ b/src/main/java/eu/m724/crossword/Main.java
@@ -1,4 +1,4 @@
-package eu.m724;
+package eu.m724.crossword;
 
 public class Main {
     public static void main(String[] args) throws CrosswordBuilder.SizeMismatchException {
diff --git a/src/main/java/eu/m724/PlacedWord.java b/src/main/java/eu/m724/crossword/PlacedWord.java
similarity index 93%
rename from src/main/java/eu/m724/PlacedWord.java
rename to src/main/java/eu/m724/crossword/PlacedWord.java
index 61b950c..c72f754 100644
--- a/src/main/java/eu/m724/PlacedWord.java
+++ b/src/main/java/eu/m724/crossword/PlacedWord.java
@@ -1,4 +1,4 @@
-package eu.m724;
+package eu.m724.crossword;
 
 /**
  * Represents a placement of a word
diff --git a/src/main/java/eu/m724/Renderer.java b/src/main/java/eu/m724/crossword/Renderer.java
similarity index 99%
rename from src/main/java/eu/m724/Renderer.java
rename to src/main/java/eu/m724/crossword/Renderer.java
index afe52aa..1274f49 100644
--- a/src/main/java/eu/m724/Renderer.java
+++ b/src/main/java/eu/m724/crossword/Renderer.java
@@ -1,4 +1,4 @@
-package eu.m724;
+package eu.m724.crossword;
 
 import org.jfree.svg.SVGGraphics2D;
 
diff --git a/src/main/java/eu/m724/Word.java b/src/main/java/eu/m724/crossword/Word.java
similarity index 91%
rename from src/main/java/eu/m724/Word.java
rename to src/main/java/eu/m724/crossword/Word.java
index ca708eb..e25ad3c 100644
--- a/src/main/java/eu/m724/Word.java
+++ b/src/main/java/eu/m724/crossword/Word.java
@@ -1,4 +1,4 @@
-package eu.m724;
+package eu.m724.crossword;
 
 /**
  * Represents a word and a hint.<br>