diff --git a/test/de/stups/probkodkod/InteractionTestBase.java b/test/de/stups/probkodkod/InteractionTestBase.java
index f000bc12f1d64391357d12bd47b4ffff60d828b6..1d7ec5ed006753d0f70dc9f7ba51f7716e10a604 100644
--- a/test/de/stups/probkodkod/InteractionTestBase.java
+++ b/test/de/stups/probkodkod/InteractionTestBase.java
@@ -57,7 +57,8 @@ public class InteractionTestBase {
 	}
 
 	protected static String load(final String filename) throws IOException {
-		InputStream input = KodkodTest.class.getResourceAsStream(filename);
+		InputStream input = KodkodTest.class.getResourceAsStream("problems/"
+				+ filename);
 		int c = input.read();
 		StringBuffer buf = new StringBuffer();
 		while (c >= 0) {
diff --git a/test/de/stups/probkodkod/functions.kodkod b/test/de/stups/probkodkod/problems/functions.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/functions.kodkod
rename to test/de/stups/probkodkod/problems/functions.kodkod
diff --git a/test/de/stups/probkodkod/integercast.kodkod b/test/de/stups/probkodkod/problems/integercast.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/integercast.kodkod
rename to test/de/stups/probkodkod/problems/integercast.kodkod
diff --git a/test/de/stups/probkodkod/integers.kodkod b/test/de/stups/probkodkod/problems/integers.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/integers.kodkod
rename to test/de/stups/probkodkod/problems/integers.kodkod
diff --git a/test/de/stups/probkodkod/intrange.kodkod b/test/de/stups/probkodkod/problems/intrange.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/intrange.kodkod
rename to test/de/stups/probkodkod/problems/intrange.kodkod
diff --git a/test/de/stups/probkodkod/intvar.kodkod b/test/de/stups/probkodkod/problems/intvar.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/intvar.kodkod
rename to test/de/stups/probkodkod/problems/intvar.kodkod
diff --git a/test/de/stups/probkodkod/loop.kodkod b/test/de/stups/probkodkod/problems/loop.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/loop.kodkod
rename to test/de/stups/probkodkod/problems/loop.kodkod
diff --git a/test/de/stups/probkodkod/negative.kodkod b/test/de/stups/probkodkod/problems/negative.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/negative.kodkod
rename to test/de/stups/probkodkod/problems/negative.kodkod
diff --git a/test/de/stups/probkodkod/projection.kodkod b/test/de/stups/probkodkod/problems/projection.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/projection.kodkod
rename to test/de/stups/probkodkod/problems/projection.kodkod
diff --git a/test/de/stups/probkodkod/relquant.kodkod b/test/de/stups/probkodkod/problems/relquant.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/relquant.kodkod
rename to test/de/stups/probkodkod/problems/relquant.kodkod
diff --git a/test/de/stups/probkodkod/returnzero.kodkod b/test/de/stups/probkodkod/problems/returnzero.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/returnzero.kodkod
rename to test/de/stups/probkodkod/problems/returnzero.kodkod
diff --git a/test/de/stups/probkodkod/simpletwovars.kodkod b/test/de/stups/probkodkod/problems/simpletwovars.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/simpletwovars.kodkod
rename to test/de/stups/probkodkod/problems/simpletwovars.kodkod