diff --git a/.classpath b/.classpath
deleted file mode 100644
index 371c09c423e4afdd0d12d2cc2d1aa432b654cc73..0000000000000000000000000000000000000000
--- a/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="parser"/>
- <classpathentry kind="src" path="test"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="lib" path="lib/kodkod.jar"/>
- <classpathentry kind="lib" path="lib/prolog.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..fdc00a4aeac54cd9499c45f1c488ccd8fff3766b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+bin/
+build/
+.gradle/
+.settings/
+.classpath
+.project
\ No newline at end of file
diff --git a/.project b/.project
deleted file mode 100644
index 26c40f481fb2eea1635c60688c742b63568d15fb..0000000000000000000000000000000000000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>probkodkod</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..1758433ce6b84db98690a645a1be2ef312bbd67d
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,72 @@
+project.version = '1.0.1-SNAPSHOT';
+project.group = 'de.stups'
+
+apply plugin: 'java'
+apply plugin: 'eclipse'
+apply plugin: 'maven'
+
+repositories {
+ maven {
+ name "cobra"
+ url "http://cobra.cs.uni-duesseldorf.de/artifactory/repo"
+ }
+}
+configurations {
+ sablecc
+}
+
+sourceSets {
+ main {
+ java {
+ srcDirs = ['build/temp','src/main/java']
+ }
+ }
+}
+
+sourceSets.test.runtimeClasspath += files(sourceSets.main.java.srcDirs)
+
+
+dependencies {
+ sablecc(group: 'de.stups', name: 'sablecc', version: '3.2.7-SNAPSHOT', changing: true)
+ compile 'de.prob:prologlib:2.4.15'
+ compile 'kodkod:kodkod:1.0.0'
+ compile 'org.sat4j:org.sat4j.core:2.3.1'
+ testCompile 'junit:junit:4.8.2'
+ }
+
+ task genParser(type:JavaExec) {
+ doFirst{ file('build/temp').mkdirs() }
+ inputs.dir new File('src/main/resources')
+ outputs.dir new File('build/temp')
+ main = 'org.sablecc.sablecc.SableCC'
+ classpath = configurations.sablecc
+ maxHeapSize = '1024m'
+ args = ['-d','build/temp','src/main/resources/problem.grammar']
+}
+
+compileJava {
+ dependsOn = ['genParser']
+}
+
+test {
+ doFirst {
+ println "testing"
+ }
+
+}
+
+
+jar {
+ from(configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }) {
+ exclude "META-INF/*.SF"
+ exclude "META-INF/*.DSA"
+ exclude "META-INF/*.RSA"
+ }
+
+ manifest {
+ attributes 'Implementation-Title': 'ProB Kodkod',
+ 'Implementation-Version': project.version,
+ 'Built-Date': new Date(),
+ 'Built-JDK': System.getProperty('java.version')
+ }
+}
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 1f8b959c122ab86cfe019a86809e037b1aabab60..0000000000000000000000000000000000000000
--- a/build.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0"?>
-<project name="probkodkod" default="jar" basedir=".">
-
- <property name="src" value="src"/>
- <property name="test" value="test"/>
- <property name="build" value="build"/>
- <property name="parser" value="parser"/>
- <property name="jar" value="${build}/jar"/>
- <property name="testbin" value="${build}/testbin"/>
- <property name="main.class" value="de.stups.probkodkod.KodkodInteraction"/>
- <property name="lib" value="lib"/>
- <property name="kodkod" value="${lib}/kodkod.jar"/>
- <property name="sat4jjar" value="org.sat4j.core.jar"/>
- <property name="sat4j" value="${lib}/${sat4jjar}"/>
- <property name="prolog" value="${lib}/prolog.jar"/>
- <property name="junit" value="${lib}/junit-4.8.2.jar"/>
- <property name="uptodate" value="uptodate"/>
- <property name="testresultdir" value="${build}/testresult"/>
- <property name="target" value="1.5"/>
-
- <taskdef name="sablecc" classname="org.sablecc.ant.taskdef.Sablecc"/>
-
- <target name="init">
- <mkdir dir="${build}"/>
- <mkdir dir="${jar}"/>
- </target>
-
- <target name="is_uptodate">
- <uptodate property="parser.uptodate">
- <srcfiles dir="${src}" includes="*.grammar"/>
- <mapper type="merge" to="../${parser}/${uptodate}"/>
- </uptodate>
- </target>
-
- <target name="clear" depends="init">
- <delete> <fileset dir="${build}" includes="**/*"/> </delete>
- <delete includeemptydirs="yes"> <fileset dir="${parser}" includes="**/*"/> </delete>
- </target>
-
- <target name="parser" depends="is_uptodate,init" unless="parser.uptodate" description="Generate the parser classes">
- <delete> <fileset dir="${parser}" includes="**/*"/> </delete>
- <sablecc src="${src}" includes="*.grammar" outputdirectory="${parser}"/>
- <touch file="${parser}/${uptodate}"/>
- </target>
-
- <target name="compile" depends="init,parser">
- <!-- Compile the java code -->
- <javac srcdir="${parser}" destdir="${jar}" debug="true" target="${target}"/>
- <javac srcdir="${src}" destdir="${jar}" debug="true" target="${target}">
- <classpath location="${kodkod}"/>
- <classpath location="${prolog}"/>
- </javac>
- <copy todir="${jar}">
- <fileset dir="${parser}">
- <exclude name="**/*.java"/>
- <exclude name="${uptodate}"/>
- </fileset>
- </copy>
- </target>
-
- <target name="compiletests" depends="compile">
- <mkdir dir="${testbin}"/>
- <javac srcdir="${test}" destdir="${testbin}" debug="true" target="${target}">
- <classpath location="${kodkod}"/>
- <classpath location="${prolog}"/>
- <classpath location="${junit}"/>
- <classpath location="${jar}"/>
- </javac>
- <copy todir="${testbin}">
- <fileset dir="${test}">
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
- </target>
-
- <target name="test" depends="compiletests" description="Test">
- <mkdir dir="${testresultdir}"/>
- <junit haltonerror="true" fork="true">
- <classpath location="${testbin}"/>
- <classpath location="${kodkod}"/>
- <classpath location="${prolog}"/>
- <classpath location="${junit}"/>
- <classpath location="${sat4j}"/>
- <classpath location="${jar}"/>
- <jvmarg value="-Djava.library.path=${lib}"/>
- <formatter type="plain" usefile="true" />
- <batchtest todir="${testresultdir}">
- <fileset dir="${testbin}" includes="**/*Test.class"/>
- </batchtest>
- </junit>
- </target>
-
- <target name="manifest" depends="init">
- <manifest file="${build}/MANIFEST.MF">
- <attribute name="Built-By" value="${user.name}"/>
- <attribute name="Main-Class" value="${main.class}"/>
- <attribute name="Class-Path" value="${sat4jjar}"/>
- </manifest>
- </target>
-
- <target name="jar" depends="clear,test,manifest" description="Build the jar file">
- <jar destfile="${build}/probkodkod.jar"
- basedir="${jar}"
- manifest="${build}/MANIFEST.MF">
- <zipfileset src="${kodkod}"/>
- <zipfileset src="${prolog}"/>
- </jar>
- </target>
-
- <target name="tar" depends="jar" description="Build a tar file with all needed files">
- <tar destfile="${build}/probkodkod.tar.gz"
- compression="gzip">
- <tarfileset dir="${build}"> <include name="probkodkod.jar"/> </tarfileset>
- <tarfileset dir="${lib}">
- <include name="kodkod.jar"/>
- <include name="libminisat.so"/>
- </tarfileset>
- </tar>
- </target>
-</project>
\ No newline at end of file
diff --git a/lib/junit-4.8.2.jar b/lib/junit-4.8.2.jar
deleted file mode 100644
index 5b4bb849af9583fec1ea0a0ccc0d571ef49aa8ba..0000000000000000000000000000000000000000
Binary files a/lib/junit-4.8.2.jar and /dev/null differ
diff --git a/lib/kodkod.jar b/lib/kodkod.jar
deleted file mode 100644
index 80a4756f6d00f8bdfcb4da62936b1ed84772303d..0000000000000000000000000000000000000000
Binary files a/lib/kodkod.jar and /dev/null differ
diff --git a/lib/libminisat.so b/lib/libminisat.so
deleted file mode 100644
index 55576b9b9f17500da4b13a6a9c6ca2653f25e567..0000000000000000000000000000000000000000
Binary files a/lib/libminisat.so and /dev/null differ
diff --git a/lib/libminisatprover.so b/lib/libminisatprover.so
deleted file mode 100644
index 74c8b50b302fa547039a695a8a0f63307184adb7..0000000000000000000000000000000000000000
Binary files a/lib/libminisatprover.so and /dev/null differ
diff --git a/lib/libzchaff.so b/lib/libzchaff.so
deleted file mode 100644
index ea16e7b72a80332a17e3b4ecd74fe901a685804d..0000000000000000000000000000000000000000
Binary files a/lib/libzchaff.so and /dev/null differ
diff --git a/lib/org.sat4j.core.jar b/lib/org.sat4j.core.jar
deleted file mode 100644
index 9e0f01e366b546e7523146f07c0db34f39708930..0000000000000000000000000000000000000000
Binary files a/lib/org.sat4j.core.jar and /dev/null differ
diff --git a/lib/prolog.jar b/lib/prolog.jar
deleted file mode 100644
index 0dc30f4211425a07b9841e7ef3cd719b5c921d9e..0000000000000000000000000000000000000000
Binary files a/lib/prolog.jar and /dev/null differ
diff --git a/lib/sablecc.jar b/lib/sablecc.jar
deleted file mode 100644
index 1580cd04bf357f45624d6fc9f3429c4f48abaee9..0000000000000000000000000000000000000000
Binary files a/lib/sablecc.jar and /dev/null differ
diff --git a/src/de/stups/probkodkod/EOFLexer.java b/src/main/java/de/stups/probkodkod/EOFLexer.java
similarity index 100%
rename from src/de/stups/probkodkod/EOFLexer.java
rename to src/main/java/de/stups/probkodkod/EOFLexer.java
diff --git a/src/de/stups/probkodkod/ImmutableProblem.java b/src/main/java/de/stups/probkodkod/ImmutableProblem.java
similarity index 100%
rename from src/de/stups/probkodkod/ImmutableProblem.java
rename to src/main/java/de/stups/probkodkod/ImmutableProblem.java
diff --git a/src/de/stups/probkodkod/IntegerIntervall.java b/src/main/java/de/stups/probkodkod/IntegerIntervall.java
similarity index 100%
rename from src/de/stups/probkodkod/IntegerIntervall.java
rename to src/main/java/de/stups/probkodkod/IntegerIntervall.java
diff --git a/src/de/stups/probkodkod/KodkodAnalysis.java b/src/main/java/de/stups/probkodkod/KodkodAnalysis.java
similarity index 100%
rename from src/de/stups/probkodkod/KodkodAnalysis.java
rename to src/main/java/de/stups/probkodkod/KodkodAnalysis.java
diff --git a/src/de/stups/probkodkod/KodkodInteraction.java b/src/main/java/de/stups/probkodkod/KodkodInteraction.java
similarity index 100%
rename from src/de/stups/probkodkod/KodkodInteraction.java
rename to src/main/java/de/stups/probkodkod/KodkodInteraction.java
diff --git a/src/de/stups/probkodkod/KodkodSession.java b/src/main/java/de/stups/probkodkod/KodkodSession.java
similarity index 100%
rename from src/de/stups/probkodkod/KodkodSession.java
rename to src/main/java/de/stups/probkodkod/KodkodSession.java
diff --git a/src/de/stups/probkodkod/Problem.java b/src/main/java/de/stups/probkodkod/Problem.java
similarity index 100%
rename from src/de/stups/probkodkod/Problem.java
rename to src/main/java/de/stups/probkodkod/Problem.java
diff --git a/src/de/stups/probkodkod/RelationInfo.java b/src/main/java/de/stups/probkodkod/RelationInfo.java
similarity index 100%
rename from src/de/stups/probkodkod/RelationInfo.java
rename to src/main/java/de/stups/probkodkod/RelationInfo.java
diff --git a/src/de/stups/probkodkod/Request.java b/src/main/java/de/stups/probkodkod/Request.java
similarity index 100%
rename from src/de/stups/probkodkod/Request.java
rename to src/main/java/de/stups/probkodkod/Request.java
diff --git a/src/de/stups/probkodkod/SolverChecker.java b/src/main/java/de/stups/probkodkod/SolverChecker.java
similarity index 100%
rename from src/de/stups/probkodkod/SolverChecker.java
rename to src/main/java/de/stups/probkodkod/SolverChecker.java
diff --git a/src/de/stups/probkodkod/bounds/AbstractBound.java b/src/main/java/de/stups/probkodkod/bounds/AbstractBound.java
similarity index 100%
rename from src/de/stups/probkodkod/bounds/AbstractBound.java
rename to src/main/java/de/stups/probkodkod/bounds/AbstractBound.java
diff --git a/src/de/stups/probkodkod/bounds/ExactBound.java b/src/main/java/de/stups/probkodkod/bounds/ExactBound.java
similarity index 100%
rename from src/de/stups/probkodkod/bounds/ExactBound.java
rename to src/main/java/de/stups/probkodkod/bounds/ExactBound.java
diff --git a/src/de/stups/probkodkod/bounds/SubsetBound.java b/src/main/java/de/stups/probkodkod/bounds/SubsetBound.java
similarity index 100%
rename from src/de/stups/probkodkod/bounds/SubsetBound.java
rename to src/main/java/de/stups/probkodkod/bounds/SubsetBound.java
diff --git a/src/de/stups/probkodkod/bounds/TypeBound.java b/src/main/java/de/stups/probkodkod/bounds/TypeBound.java
similarity index 100%
rename from src/de/stups/probkodkod/bounds/TypeBound.java
rename to src/main/java/de/stups/probkodkod/bounds/TypeBound.java
diff --git a/src/de/stups/probkodkod/tools/IntTools.java b/src/main/java/de/stups/probkodkod/tools/IntTools.java
similarity index 100%
rename from src/de/stups/probkodkod/tools/IntTools.java
rename to src/main/java/de/stups/probkodkod/tools/IntTools.java
diff --git a/src/de/stups/probkodkod/tools/LogReader.java b/src/main/java/de/stups/probkodkod/tools/LogReader.java
similarity index 100%
rename from src/de/stups/probkodkod/tools/LogReader.java
rename to src/main/java/de/stups/probkodkod/tools/LogReader.java
diff --git a/src/de/stups/probkodkod/tools/LogWriter.java b/src/main/java/de/stups/probkodkod/tools/LogWriter.java
similarity index 100%
rename from src/de/stups/probkodkod/tools/LogWriter.java
rename to src/main/java/de/stups/probkodkod/tools/LogWriter.java
diff --git a/src/de/stups/probkodkod/tools/MergeWriter.java b/src/main/java/de/stups/probkodkod/tools/MergeWriter.java
similarity index 100%
rename from src/de/stups/probkodkod/tools/MergeWriter.java
rename to src/main/java/de/stups/probkodkod/tools/MergeWriter.java
diff --git a/src/de/stups/probkodkod/types/AtomsType.java b/src/main/java/de/stups/probkodkod/types/AtomsType.java
similarity index 100%
rename from src/de/stups/probkodkod/types/AtomsType.java
rename to src/main/java/de/stups/probkodkod/types/AtomsType.java
diff --git a/src/de/stups/probkodkod/types/IntsetType.java b/src/main/java/de/stups/probkodkod/types/IntsetType.java
similarity index 100%
rename from src/de/stups/probkodkod/types/IntsetType.java
rename to src/main/java/de/stups/probkodkod/types/IntsetType.java
diff --git a/src/de/stups/probkodkod/types/Pow2Type.java b/src/main/java/de/stups/probkodkod/types/Pow2Type.java
similarity index 100%
rename from src/de/stups/probkodkod/types/Pow2Type.java
rename to src/main/java/de/stups/probkodkod/types/Pow2Type.java
diff --git a/src/de/stups/probkodkod/types/SetEnabledType.java b/src/main/java/de/stups/probkodkod/types/SetEnabledType.java
similarity index 100%
rename from src/de/stups/probkodkod/types/SetEnabledType.java
rename to src/main/java/de/stups/probkodkod/types/SetEnabledType.java
diff --git a/src/de/stups/probkodkod/types/TupleType.java b/src/main/java/de/stups/probkodkod/types/TupleType.java
similarity index 100%
rename from src/de/stups/probkodkod/types/TupleType.java
rename to src/main/java/de/stups/probkodkod/types/TupleType.java
diff --git a/src/de/stups/probkodkod/types/Type.java b/src/main/java/de/stups/probkodkod/types/Type.java
similarity index 100%
rename from src/de/stups/probkodkod/types/Type.java
rename to src/main/java/de/stups/probkodkod/types/Type.java
diff --git a/src/problem.grammar b/src/main/resources/problem.grammar
similarity index 100%
rename from src/problem.grammar
rename to src/main/resources/problem.grammar
diff --git a/test/de/stups/probkodkod/IntToolsTest.java b/src/test/java/de/stups/probkodkod/IntToolsTest.java
similarity index 100%
rename from test/de/stups/probkodkod/IntToolsTest.java
rename to src/test/java/de/stups/probkodkod/IntToolsTest.java
diff --git a/test/de/stups/probkodkod/InteractionTestBase.java b/src/test/java/de/stups/probkodkod/InteractionTestBase.java
similarity index 98%
rename from test/de/stups/probkodkod/InteractionTestBase.java
rename to src/test/java/de/stups/probkodkod/InteractionTestBase.java
index 561ef428dfe15709c4f1decc25101ed7bd23b251..4c9e6286f03b7605136303380072c3dc9eca11ea 100644
--- a/test/de/stups/probkodkod/InteractionTestBase.java
+++ b/src/test/java/de/stups/probkodkod/InteractionTestBase.java
@@ -57,7 +57,7 @@ public class InteractionTestBase {
}
protected static String load(final String filename) throws IOException {
- InputStream input = KodkodTest.class.getResourceAsStream("problems/"
+ InputStream input = KodkodTest.class.getClassLoader().getResourceAsStream("problems/"
+ filename);
int c = input.read();
StringBuffer buf = new StringBuffer();
diff --git a/test/de/stups/probkodkod/KodkodTest.java b/src/test/java/de/stups/probkodkod/KodkodTest.java
similarity index 100%
rename from test/de/stups/probkodkod/KodkodTest.java
rename to src/test/java/de/stups/probkodkod/KodkodTest.java
diff --git a/test/de/stups/probkodkod/MergeWriterTest.java b/src/test/java/de/stups/probkodkod/MergeWriterTest.java
similarity index 100%
rename from test/de/stups/probkodkod/MergeWriterTest.java
rename to src/test/java/de/stups/probkodkod/MergeWriterTest.java
diff --git a/test/de/stups/probkodkod/NegativeIntTest.java b/src/test/java/de/stups/probkodkod/NegativeIntTest.java
similarity index 100%
rename from test/de/stups/probkodkod/NegativeIntTest.java
rename to src/test/java/de/stups/probkodkod/NegativeIntTest.java
diff --git a/test/de/stups/probkodkod/ProblemTest.java b/src/test/java/de/stups/probkodkod/ProblemTest.java
similarity index 100%
rename from test/de/stups/probkodkod/ProblemTest.java
rename to src/test/java/de/stups/probkodkod/ProblemTest.java
diff --git a/test/de/stups/probkodkod/test/KodkodUtil.java b/src/test/java/de/stups/probkodkod/test/KodkodUtil.java
similarity index 100%
rename from test/de/stups/probkodkod/test/KodkodUtil.java
rename to src/test/java/de/stups/probkodkod/test/KodkodUtil.java
diff --git a/test/de/stups/probkodkod/test/Permutations.java b/src/test/java/de/stups/probkodkod/test/Permutations.java
similarity index 100%
rename from test/de/stups/probkodkod/test/Permutations.java
rename to src/test/java/de/stups/probkodkod/test/Permutations.java
diff --git a/test/de/stups/probkodkod/test/Result.java b/src/test/java/de/stups/probkodkod/test/Result.java
similarity index 100%
rename from test/de/stups/probkodkod/test/Result.java
rename to src/test/java/de/stups/probkodkod/test/Result.java
diff --git a/test/de/stups/probkodkod/test/ResultSetBuilder.java b/src/test/java/de/stups/probkodkod/test/ResultSetBuilder.java
similarity index 100%
rename from test/de/stups/probkodkod/test/ResultSetBuilder.java
rename to src/test/java/de/stups/probkodkod/test/ResultSetBuilder.java
diff --git a/test/de/stups/probkodkod/test/TestInteraction.java b/src/test/java/de/stups/probkodkod/test/TestInteraction.java
similarity index 100%
rename from test/de/stups/probkodkod/test/TestInteraction.java
rename to src/test/java/de/stups/probkodkod/test/TestInteraction.java
diff --git a/test/de/stups/probkodkod/types/AtomsTypeTest.java b/src/test/java/de/stups/probkodkod/types/AtomsTypeTest.java
similarity index 100%
rename from test/de/stups/probkodkod/types/AtomsTypeTest.java
rename to src/test/java/de/stups/probkodkod/types/AtomsTypeTest.java
diff --git a/test/de/stups/probkodkod/types/IntsetTypeTest.java b/src/test/java/de/stups/probkodkod/types/IntsetTypeTest.java
similarity index 100%
rename from test/de/stups/probkodkod/types/IntsetTypeTest.java
rename to src/test/java/de/stups/probkodkod/types/IntsetTypeTest.java
diff --git a/test/de/stups/probkodkod/types/Pow2TypeTest.java b/src/test/java/de/stups/probkodkod/types/Pow2TypeTest.java
similarity index 100%
rename from test/de/stups/probkodkod/types/Pow2TypeTest.java
rename to src/test/java/de/stups/probkodkod/types/Pow2TypeTest.java
diff --git a/test/de/stups/probkodkod/types/TupleTypeTest.java b/src/test/java/de/stups/probkodkod/types/TupleTypeTest.java
similarity index 100%
rename from test/de/stups/probkodkod/types/TupleTypeTest.java
rename to src/test/java/de/stups/probkodkod/types/TupleTypeTest.java
diff --git a/test/de/stups/probkodkod/problems/functions.kodkod b/src/test/resources/problems/functions.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/problems/functions.kodkod
rename to src/test/resources/problems/functions.kodkod
diff --git a/test/de/stups/probkodkod/problems/integercast.kodkod b/src/test/resources/problems/integercast.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/problems/integercast.kodkod
rename to src/test/resources/problems/integercast.kodkod
diff --git a/test/de/stups/probkodkod/problems/integers.kodkod b/src/test/resources/problems/integers.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/problems/integers.kodkod
rename to src/test/resources/problems/integers.kodkod
diff --git a/test/de/stups/probkodkod/problems/intrange.kodkod b/src/test/resources/problems/intrange.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/problems/intrange.kodkod
rename to src/test/resources/problems/intrange.kodkod
diff --git a/test/de/stups/probkodkod/problems/intvar.kodkod b/src/test/resources/problems/intvar.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/problems/intvar.kodkod
rename to src/test/resources/problems/intvar.kodkod
diff --git a/test/de/stups/probkodkod/problems/loop.kodkod b/src/test/resources/problems/loop.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/problems/loop.kodkod
rename to src/test/resources/problems/loop.kodkod
diff --git a/test/de/stups/probkodkod/problems/negative.kodkod b/src/test/resources/problems/negative.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/problems/negative.kodkod
rename to src/test/resources/problems/negative.kodkod
diff --git a/test/de/stups/probkodkod/problems/projection.kodkod b/src/test/resources/problems/projection.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/problems/projection.kodkod
rename to src/test/resources/problems/projection.kodkod
diff --git a/test/de/stups/probkodkod/problems/relquant.kodkod b/src/test/resources/problems/relquant.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/problems/relquant.kodkod
rename to src/test/resources/problems/relquant.kodkod
diff --git a/test/de/stups/probkodkod/problems/returnzero.kodkod b/src/test/resources/problems/returnzero.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/problems/returnzero.kodkod
rename to src/test/resources/problems/returnzero.kodkod
diff --git a/test/de/stups/probkodkod/problems/sendmoremoney.kodkod b/src/test/resources/problems/sendmoremoney.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/problems/sendmoremoney.kodkod
rename to src/test/resources/problems/sendmoremoney.kodkod
diff --git a/test/de/stups/probkodkod/problems/simpletwovars.kodkod b/src/test/resources/problems/simpletwovars.kodkod
similarity index 100%
rename from test/de/stups/probkodkod/problems/simpletwovars.kodkod
rename to src/test/resources/problems/simpletwovars.kodkod