diff --git a/src/dk/itu/mario/level/MyNewLevel.java b/src/dk/itu/mario/level/MyNewLevel.java
index 8c7cb17..24a1656 100644
--- a/src/dk/itu/mario/level/MyNewLevel.java
+++ b/src/dk/itu/mario/level/MyNewLevel.java
@@ -8,13 +8,13 @@ import dk.itu.mario.MarioInterface.LevelInterface;
 import dk.itu.mario.engine.DataRecorder;
 import dk.itu.mario.engine.sprites.Enemy;
 import dk.itu.mario.engine.sprites.SpriteTemplate;
-import dk.itu.mario.level.generator.ArchetypeMatcher;
-import dk.itu.mario.level.generator.GrammarTuner;
-import dk.itu.mario.level.generator.LevelArchetype;
-import dk.itu.mario.level.generator.LevelGrammar;
-import dk.itu.mario.level.generator.LevelGrammarFactory;
-import dk.itu.mario.level.generator.PlayerProfile;
-import dk.itu.mario.level.generator.ProfileMatcher;
+import dk.itu.mario.level.grammar.GrammarTuner;
+import dk.itu.mario.level.grammar.LevelGrammar;
+import dk.itu.mario.level.grammar.LevelGrammarFactory;
+import dk.itu.mario.level.matcher.ArchetypeMatcher;
+import dk.itu.mario.level.matcher.LevelArchetype;
+import dk.itu.mario.level.matcher.PlayerProfile;
+import dk.itu.mario.level.matcher.ProfileMatcher;
 
 public class MyNewLevel extends Level {
 	public enum MazeLevel {
diff --git a/src/dk/itu/mario/level/generator/GrammarTuner.java b/src/dk/itu/mario/level/grammar/GrammarTuner.java
similarity index 53%
rename from src/dk/itu/mario/level/generator/GrammarTuner.java
rename to src/dk/itu/mario/level/grammar/GrammarTuner.java
index e050ec2..0eb2618 100644
--- a/src/dk/itu/mario/level/generator/GrammarTuner.java
+++ b/src/dk/itu/mario/level/grammar/GrammarTuner.java
@@ -1,4 +1,7 @@
-package dk.itu.mario.level.generator;
+package dk.itu.mario.level.grammar;
+
+import dk.itu.mario.level.matcher.LevelArchetype;
+import dk.itu.mario.level.matcher.PlayerProfile;
 
 public class GrammarTuner {
 	public static LevelGrammar tune(LevelGrammar grammar, PlayerProfile profile, LevelArchetype archetype) {
diff --git a/src/dk/itu/mario/level/generator/LevelGrammar.java b/src/dk/itu/mario/level/grammar/LevelGrammar.java
similarity index 97%
rename from src/dk/itu/mario/level/generator/LevelGrammar.java
rename to src/dk/itu/mario/level/grammar/LevelGrammar.java
index cbd298c..eed33cb 100644
--- a/src/dk/itu/mario/level/generator/LevelGrammar.java
+++ b/src/dk/itu/mario/level/grammar/LevelGrammar.java
@@ -1,4 +1,4 @@
-package dk.itu.mario.level.generator;
+package dk.itu.mario.level.grammar;
 
 import java.util.HashMap;
 import java.util.List;
@@ -7,6 +7,7 @@ import java.util.Random;
 import java.util.Set;
 import java.util.TreeSet;
 
+
 public class LevelGrammar {
 	private Variable start;
 	private Map<Variable, ProductionRule> ruleMap = new HashMap<Variable, ProductionRule>();
diff --git a/src/dk/itu/mario/level/generator/LevelGrammarFactory.java b/src/dk/itu/mario/level/grammar/LevelGrammarFactory.java
similarity index 80%
rename from src/dk/itu/mario/level/generator/LevelGrammarFactory.java
rename to src/dk/itu/mario/level/grammar/LevelGrammarFactory.java
index 239ab3e..287a884 100644
--- a/src/dk/itu/mario/level/generator/LevelGrammarFactory.java
+++ b/src/dk/itu/mario/level/grammar/LevelGrammarFactory.java
@@ -1,4 +1,7 @@
-package dk.itu.mario.level.generator;
+package dk.itu.mario.level.grammar;
+
+import dk.itu.mario.level.matcher.LevelArchetype;
+import dk.itu.mario.level.matcher.PlayerProfile;
 
 
 public class LevelGrammarFactory {
diff --git a/src/dk/itu/mario/level/generator/ProductionRule.java b/src/dk/itu/mario/level/grammar/ProductionRule.java
similarity index 91%
rename from src/dk/itu/mario/level/generator/ProductionRule.java
rename to src/dk/itu/mario/level/grammar/ProductionRule.java
index d98a9d9..1ca65b1 100644
--- a/src/dk/itu/mario/level/generator/ProductionRule.java
+++ b/src/dk/itu/mario/level/grammar/ProductionRule.java
@@ -1,8 +1,9 @@
-package dk.itu.mario.level.generator;
+package dk.itu.mario.level.grammar;
 
 import java.util.ArrayList;
 import java.util.List;
 
+
 public class ProductionRule {
 	private Variable lhs;
 	private List<Variable> rhs;
diff --git a/src/dk/itu/mario/level/generator/Variable.java b/src/dk/itu/mario/level/grammar/Variable.java
similarity index 91%
rename from src/dk/itu/mario/level/generator/Variable.java
rename to src/dk/itu/mario/level/grammar/Variable.java
index 2592994..41af9db 100644
--- a/src/dk/itu/mario/level/generator/Variable.java
+++ b/src/dk/itu/mario/level/grammar/Variable.java
@@ -1,4 +1,4 @@
-package dk.itu.mario.level.generator;
+package dk.itu.mario.level.grammar;
 
 public class Variable implements Comparable<Variable> {
 	private boolean terminal;
diff --git a/src/dk/itu/mario/level/generator/ArchetypeMatcher.java b/src/dk/itu/mario/level/matcher/ArchetypeMatcher.java
similarity index 79%
rename from src/dk/itu/mario/level/generator/ArchetypeMatcher.java
rename to src/dk/itu/mario/level/matcher/ArchetypeMatcher.java
index 0a82476..d0c3b94 100644
--- a/src/dk/itu/mario/level/generator/ArchetypeMatcher.java
+++ b/src/dk/itu/mario/level/matcher/ArchetypeMatcher.java
@@ -1,8 +1,8 @@
-package dk.itu.mario.level.generator;
+package dk.itu.mario.level.matcher;
 
 import dk.itu.mario.MarioInterface.GamePlay;
 import dk.itu.mario.engine.DataRecorder;
-import dk.itu.mario.level.generator.LevelArchetype.TYPE;
+import dk.itu.mario.level.matcher.LevelArchetype.TYPE;
 
 public class ArchetypeMatcher {
 	public static LevelArchetype getMatchingArchetype(GamePlay playerMetrics, DataRecorder detailedInfo) {
diff --git a/src/dk/itu/mario/level/generator/LevelArchetype.java b/src/dk/itu/mario/level/matcher/LevelArchetype.java
similarity index 95%
rename from src/dk/itu/mario/level/generator/LevelArchetype.java
rename to src/dk/itu/mario/level/matcher/LevelArchetype.java
index 989433d..f77d8e9 100644
--- a/src/dk/itu/mario/level/generator/LevelArchetype.java
+++ b/src/dk/itu/mario/level/matcher/LevelArchetype.java
@@ -1,4 +1,4 @@
-package dk.itu.mario.level.generator;
+package dk.itu.mario.level.matcher;
 
 public class LevelArchetype {
 	public static final int MAX_DIFFICULTY_LEVEL = 10;
diff --git a/src/dk/itu/mario/level/generator/PlayerProfile.java b/src/dk/itu/mario/level/matcher/PlayerProfile.java
similarity index 94%
rename from src/dk/itu/mario/level/generator/PlayerProfile.java
rename to src/dk/itu/mario/level/matcher/PlayerProfile.java
index 9f2d546..8b04c4e 100644
--- a/src/dk/itu/mario/level/generator/PlayerProfile.java
+++ b/src/dk/itu/mario/level/matcher/PlayerProfile.java
@@ -1,4 +1,4 @@
-package dk.itu.mario.level.generator;
+package dk.itu.mario.level.matcher;
 
 public class PlayerProfile {
 	//From Bartle/Yee models of player psychology: achiever, killer, explorer, manipulator
diff --git a/src/dk/itu/mario/level/generator/ProfileMatcher.java b/src/dk/itu/mario/level/matcher/ProfileMatcher.java
similarity index 70%
rename from src/dk/itu/mario/level/generator/ProfileMatcher.java
rename to src/dk/itu/mario/level/matcher/ProfileMatcher.java
index e2482fa..b260656 100644
--- a/src/dk/itu/mario/level/generator/ProfileMatcher.java
+++ b/src/dk/itu/mario/level/matcher/ProfileMatcher.java
@@ -1,9 +1,9 @@
-package dk.itu.mario.level.generator;
+package dk.itu.mario.level.matcher;
 
 import dk.itu.mario.MarioInterface.GamePlay;
 import dk.itu.mario.engine.DataRecorder;
-import dk.itu.mario.level.generator.PlayerProfile.SKILL_LEVEL;
-import dk.itu.mario.level.generator.PlayerProfile.TYPE;
+import dk.itu.mario.level.matcher.PlayerProfile.SKILL_LEVEL;
+import dk.itu.mario.level.matcher.PlayerProfile.TYPE;
 
 public class ProfileMatcher {
 	public static PlayerProfile getMatchingProfile(GamePlay playerMetrics, DataRecorder detailedInfo) {