diff --git a/.classpath b/.classpath
index e72ef7c..976ebf8 100644
--- a/.classpath
+++ b/.classpath
@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="src" path="mock"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/test/jrummikub/model/MockGameState.java b/mock/jrummikub/model/MockGameState.java
similarity index 100%
rename from test/jrummikub/model/MockGameState.java
rename to mock/jrummikub/model/MockGameState.java
diff --git a/test/jrummikub/model/MockHand.java b/mock/jrummikub/model/MockHand.java
similarity index 100%
rename from test/jrummikub/model/MockHand.java
rename to mock/jrummikub/model/MockHand.java
diff --git a/test/jrummikub/model/MockPlayer.java b/mock/jrummikub/model/MockPlayer.java
similarity index 100%
rename from test/jrummikub/model/MockPlayer.java
rename to mock/jrummikub/model/MockPlayer.java
diff --git a/test/jrummikub/model/MockTable.java b/mock/jrummikub/model/MockTable.java
similarity index 100%
rename from test/jrummikub/model/MockTable.java
rename to mock/jrummikub/model/MockTable.java
diff --git a/test/jrummikub/util/MockEvent.java b/mock/jrummikub/util/MockEvent.java
similarity index 100%
rename from test/jrummikub/util/MockEvent.java
rename to mock/jrummikub/util/MockEvent.java
diff --git a/test/jrummikub/util/MockEvent1.java b/mock/jrummikub/util/MockEvent1.java
similarity index 100%
rename from test/jrummikub/util/MockEvent1.java
rename to mock/jrummikub/util/MockEvent1.java
diff --git a/test/jrummikub/util/MockEvent2.java b/mock/jrummikub/util/MockEvent2.java
similarity index 100%
rename from test/jrummikub/util/MockEvent2.java
rename to mock/jrummikub/util/MockEvent2.java
diff --git a/test/jrummikub/view/MockHandPanel.java b/mock/jrummikub/view/MockHandPanel.java
similarity index 100%
rename from test/jrummikub/view/MockHandPanel.java
rename to mock/jrummikub/view/MockHandPanel.java
diff --git a/test/jrummikub/view/MockPlayerPanel.java b/mock/jrummikub/view/MockPlayerPanel.java
similarity index 100%
rename from test/jrummikub/view/MockPlayerPanel.java
rename to mock/jrummikub/view/MockPlayerPanel.java
diff --git a/test/jrummikub/view/MockStoneCollectionPanel.java b/mock/jrummikub/view/MockStoneCollectionPanel.java
similarity index 100%
rename from test/jrummikub/view/MockStoneCollectionPanel.java
rename to mock/jrummikub/view/MockStoneCollectionPanel.java
diff --git a/test/jrummikub/view/MockTablePanel.java b/mock/jrummikub/view/MockTablePanel.java
similarity index 100%
rename from test/jrummikub/view/MockTablePanel.java
rename to mock/jrummikub/view/MockTablePanel.java
diff --git a/test/jrummikub/view/MockView.java b/mock/jrummikub/view/MockView.java
similarity index 100%
rename from test/jrummikub/view/MockView.java
rename to mock/jrummikub/view/MockView.java