diff --git a/cp-to-solution.sh b/cp-to-solution.sh
index 00c6a00f347f216c5d81174a883be8ebd88e3fb9..6746d80da9f9a14188f78f53d8c5e0e33dcafdc5 100755
--- a/cp-to-solution.sh
+++ b/cp-to-solution.sh
@@ -64,7 +64,7 @@ function build() {
 
 function prepare_namelookup() {
   # deactivate preprocess
-  sed -i 's|^jastadd.dependsOn preprocess|//jastadd.dependsOn preprocess|g' solve/build.gradle
+  sed -i 's|^generateAst.dependsOn preprocess|//generateAst.dependsOn preprocess|g' solve/build.gradle
   # remove generated AST and helper files, activate namelookup AST and helper jadd files
   ( cd solve/src/main/jastadd &&
     rm SocialNetworkGen.ast SocialNetworkGen.jadd &&
@@ -74,7 +74,7 @@ function prepare_namelookup() {
 
 function revert_namelookup() {
   # activate preprocess
-  sed -i 's|//jastadd.dependsOn preprocess|jastadd.dependsOn preprocess|g' solve/build.gradle
+  sed -i 's|//generateAst.dependsOn preprocess|generateAst.dependsOn preprocess|g' solve/build.gradle
   # deactivate normal AST and helper jadd files
   ( cd solve/src/main/jastadd &&
     mv Refs.jadd Refs.jadd.unused &&
diff --git a/namelookup-xml-flush/.gitignore b/namelookup-xml-flush/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..bef26b50e99f1e8efd8d681885b6ea2870f80b3d
--- /dev/null
+++ b/namelookup-xml-flush/.gitignore
@@ -0,0 +1,6 @@
+/src/gen/
+/src/gen-res/
+/build/
+events.txt
+/src/main/jastadd/SocialNetworkGen.ast
+/src/main/jastadd/SocialNetworkGen.jadd
diff --git a/namelookup-xml-flush/build.gradle b/namelookup-xml-flush/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..ad75fcf3d2826bc1d14f0fafbd59ce46e099d234
--- /dev/null
+++ b/namelookup-xml-flush/build.gradle
@@ -0,0 +1,19 @@
+buildscript {
+    repositories.mavenCentral()
+    dependencies {
+        classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3'
+    }
+}
+
+plugins {
+    id 'application'
+    id 'maven'
+    id 'java'
+    id 'idea'
+}
+
+apply from: '../solve/gradle-parts/base.gradle'
+
+apply from: '../solve/gradle-parts/inc-flush.gradle'
+
+apply from: '../solve/gradle-parts/rel-namelookup.gradle'
diff --git a/namelookup-xml-flush/jastadd_modules b/namelookup-xml-flush/jastadd_modules
new file mode 100644
index 0000000000000000000000000000000000000000..9efe1ba9707be7c13319808dbcfcf7656100119b
--- /dev/null
+++ b/namelookup-xml-flush/jastadd_modules
@@ -0,0 +1,10 @@
+module("solve") {
+    jastadd {
+        basedir "src/"
+        include "main/jastadd/**/*.ast"
+        include "main/jastadd/**/*.jadd"
+        include "main/jastadd/**/*.jrag"
+        include "main/namelookup-jastadd/**/*.jadd"
+        include "main/namelookup-jastadd/**/*.ast"
+    }
+}
diff --git a/namelookup-xml-flush/libs b/namelookup-xml-flush/libs
new file mode 120000
index 0000000000000000000000000000000000000000..8810c453ce71cee07a5f9bc4c23d35e3fb40a7c3
--- /dev/null
+++ b/namelookup-xml-flush/libs
@@ -0,0 +1 @@
+../solve/libs
\ No newline at end of file
diff --git a/namelookup-xml-flush/src/main b/namelookup-xml-flush/src/main
new file mode 120000
index 0000000000000000000000000000000000000000..009e6afff58b3370e41626fcb30e244be792621d
--- /dev/null
+++ b/namelookup-xml-flush/src/main
@@ -0,0 +1 @@
+../../solve/src/main
\ No newline at end of file
diff --git a/namelookup-xml-flush/src/test b/namelookup-xml-flush/src/test
new file mode 120000
index 0000000000000000000000000000000000000000..86aebbfd9eae4fb213d30a0be66b27c796277633
--- /dev/null
+++ b/namelookup-xml-flush/src/test
@@ -0,0 +1 @@
+../../solve/src/test
\ No newline at end of file
diff --git a/namelookup-xml-inc/.gitignore b/namelookup-xml-inc/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..bef26b50e99f1e8efd8d681885b6ea2870f80b3d
--- /dev/null
+++ b/namelookup-xml-inc/.gitignore
@@ -0,0 +1,6 @@
+/src/gen/
+/src/gen-res/
+/build/
+events.txt
+/src/main/jastadd/SocialNetworkGen.ast
+/src/main/jastadd/SocialNetworkGen.jadd
diff --git a/namelookup-xml-inc/build.gradle b/namelookup-xml-inc/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..90725364c4ff084650b0dbe96a6340990c9956b9
--- /dev/null
+++ b/namelookup-xml-inc/build.gradle
@@ -0,0 +1,19 @@
+buildscript {
+    repositories.mavenCentral()
+    dependencies {
+        classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3'
+    }
+}
+
+plugins {
+    id 'application'
+    id 'maven'
+    id 'java'
+    id 'idea'
+}
+
+apply from: '../solve/gradle-parts/base.gradle'
+
+apply from: '../solve/gradle-parts/inc-incremental.gradle'
+
+apply from: '../solve/gradle-parts/rel-namelookup.gradle'
diff --git a/namelookup-xml-inc/jastadd_modules b/namelookup-xml-inc/jastadd_modules
new file mode 100644
index 0000000000000000000000000000000000000000..9efe1ba9707be7c13319808dbcfcf7656100119b
--- /dev/null
+++ b/namelookup-xml-inc/jastadd_modules
@@ -0,0 +1,10 @@
+module("solve") {
+    jastadd {
+        basedir "src/"
+        include "main/jastadd/**/*.ast"
+        include "main/jastadd/**/*.jadd"
+        include "main/jastadd/**/*.jrag"
+        include "main/namelookup-jastadd/**/*.jadd"
+        include "main/namelookup-jastadd/**/*.ast"
+    }
+}
diff --git a/namelookup-xml-inc/libs b/namelookup-xml-inc/libs
new file mode 120000
index 0000000000000000000000000000000000000000..8810c453ce71cee07a5f9bc4c23d35e3fb40a7c3
--- /dev/null
+++ b/namelookup-xml-inc/libs
@@ -0,0 +1 @@
+../solve/libs
\ No newline at end of file
diff --git a/namelookup-xml-inc/src/main b/namelookup-xml-inc/src/main
new file mode 120000
index 0000000000000000000000000000000000000000..009e6afff58b3370e41626fcb30e244be792621d
--- /dev/null
+++ b/namelookup-xml-inc/src/main
@@ -0,0 +1 @@
+../../solve/src/main
\ No newline at end of file
diff --git a/namelookup-xml-inc/src/test b/namelookup-xml-inc/src/test
new file mode 120000
index 0000000000000000000000000000000000000000..86aebbfd9eae4fb213d30a0be66b27c796277633
--- /dev/null
+++ b/namelookup-xml-inc/src/test
@@ -0,0 +1 @@
+../../solve/src/test
\ No newline at end of file
diff --git a/relast-xml-flush/.gitignore b/relast-xml-flush/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..bef26b50e99f1e8efd8d681885b6ea2870f80b3d
--- /dev/null
+++ b/relast-xml-flush/.gitignore
@@ -0,0 +1,6 @@
+/src/gen/
+/src/gen-res/
+/build/
+events.txt
+/src/main/jastadd/SocialNetworkGen.ast
+/src/main/jastadd/SocialNetworkGen.jadd
diff --git a/relast-xml-flush/build.gradle b/relast-xml-flush/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..f4619e2e7e5c5e53ebb6aa1270aeca2e9184b047
--- /dev/null
+++ b/relast-xml-flush/build.gradle
@@ -0,0 +1,19 @@
+buildscript {
+    repositories.mavenCentral()
+    dependencies {
+        classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3'
+    }
+}
+
+plugins {
+    id 'application'
+    id 'maven'
+    id 'java'
+    id 'idea'
+}
+
+apply from: '../solve/gradle-parts/base.gradle'
+
+apply from: '../solve/gradle-parts/inc-flush.gradle'
+
+apply from: '../solve/gradle-parts/rel-relast.gradle'
diff --git a/relast-xml-flush/jastadd_modules b/relast-xml-flush/jastadd_modules
new file mode 100644
index 0000000000000000000000000000000000000000..e126e375acbfd3b3823af0faea003458f6329796
--- /dev/null
+++ b/relast-xml-flush/jastadd_modules
@@ -0,0 +1,10 @@
+module("solve") {
+    jastadd {
+        basedir "src/"
+        include "main/jastadd/**/*.ast"
+        include "main/jastadd/**/*.jadd"
+        include "main/jastadd/**/*.jrag"
+        include "gen/jastadd/**/*.ast"
+        include "gen/jastadd/**/*.jadd"
+    }
+}
diff --git a/relast-xml-flush/libs b/relast-xml-flush/libs
new file mode 120000
index 0000000000000000000000000000000000000000..8810c453ce71cee07a5f9bc4c23d35e3fb40a7c3
--- /dev/null
+++ b/relast-xml-flush/libs
@@ -0,0 +1 @@
+../solve/libs
\ No newline at end of file
diff --git a/relast-xml-flush/src/main b/relast-xml-flush/src/main
new file mode 120000
index 0000000000000000000000000000000000000000..009e6afff58b3370e41626fcb30e244be792621d
--- /dev/null
+++ b/relast-xml-flush/src/main
@@ -0,0 +1 @@
+../../solve/src/main
\ No newline at end of file
diff --git a/relast-xml-flush/src/test b/relast-xml-flush/src/test
new file mode 120000
index 0000000000000000000000000000000000000000..86aebbfd9eae4fb213d30a0be66b27c796277633
--- /dev/null
+++ b/relast-xml-flush/src/test
@@ -0,0 +1 @@
+../../solve/src/test
\ No newline at end of file
diff --git a/relast-xml-inc/.gitignore b/relast-xml-inc/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..bef26b50e99f1e8efd8d681885b6ea2870f80b3d
--- /dev/null
+++ b/relast-xml-inc/.gitignore
@@ -0,0 +1,6 @@
+/src/gen/
+/src/gen-res/
+/build/
+events.txt
+/src/main/jastadd/SocialNetworkGen.ast
+/src/main/jastadd/SocialNetworkGen.jadd
diff --git a/relast-xml-inc/build.gradle b/relast-xml-inc/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..36dae736dc36b295cfba1ab9663727a022f4d9bd
--- /dev/null
+++ b/relast-xml-inc/build.gradle
@@ -0,0 +1,19 @@
+buildscript {
+    repositories.mavenCentral()
+    dependencies {
+        classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3'
+    }
+}
+
+plugins {
+    id 'application'
+    id 'maven'
+    id 'java'
+    id 'idea'
+}
+
+apply from: '../solve/gradle-parts/base.gradle'
+
+apply from: '../solve/gradle-parts/inc-incremental.gradle'
+
+apply from: '../solve/gradle-parts/rel-relast.gradle'
diff --git a/relast-xml-inc/jastadd_modules b/relast-xml-inc/jastadd_modules
new file mode 100644
index 0000000000000000000000000000000000000000..e126e375acbfd3b3823af0faea003458f6329796
--- /dev/null
+++ b/relast-xml-inc/jastadd_modules
@@ -0,0 +1,10 @@
+module("solve") {
+    jastadd {
+        basedir "src/"
+        include "main/jastadd/**/*.ast"
+        include "main/jastadd/**/*.jadd"
+        include "main/jastadd/**/*.jrag"
+        include "gen/jastadd/**/*.ast"
+        include "gen/jastadd/**/*.jadd"
+    }
+}
diff --git a/relast-xml-inc/libs b/relast-xml-inc/libs
new file mode 120000
index 0000000000000000000000000000000000000000..8810c453ce71cee07a5f9bc4c23d35e3fb40a7c3
--- /dev/null
+++ b/relast-xml-inc/libs
@@ -0,0 +1 @@
+../solve/libs
\ No newline at end of file
diff --git a/relast-xml-inc/src/main b/relast-xml-inc/src/main
new file mode 120000
index 0000000000000000000000000000000000000000..009e6afff58b3370e41626fcb30e244be792621d
--- /dev/null
+++ b/relast-xml-inc/src/main
@@ -0,0 +1 @@
+../../solve/src/main
\ No newline at end of file
diff --git a/relast-xml-inc/src/test b/relast-xml-inc/src/test
new file mode 120000
index 0000000000000000000000000000000000000000..86aebbfd9eae4fb213d30a0be66b27c796277633
--- /dev/null
+++ b/relast-xml-inc/src/test
@@ -0,0 +1 @@
+../../solve/src/test
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 3bb24870f302bbdba9fa344454cb957732758681..b50f78ca90047d8b8d72dbfe44bcacc070af6738 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,5 @@
 include ':solve'
+include ':relast-xml-flush'
+include ':relast-xml-inc'
+include ':namelookup-xml-flush'
+include ':namelookup-xml-inc'
diff --git a/solve/build.gradle b/solve/build.gradle
index 7918701021ae6bb2639badd2c851055e7da69f75..36dae736dc36b295cfba1ab9663727a022f4d9bd 100644
--- a/solve/build.gradle
+++ b/solve/build.gradle
@@ -12,127 +12,8 @@ plugins {
     id 'idea'
 }
 
-group 'de.tudresden.inf.st'
-version '1.0-SNAPSHOT'
+apply from: '../solve/gradle-parts/base.gradle'
 
-sourceCompatibility = 11
-targetCompatibility = 11
+apply from: '../solve/gradle-parts/inc-incremental.gradle'
 
-repositories {
-    mavenCentral()
-}
-
-apply plugin: 'jastadd'
-
-dependencies {
-    jastadd2 "org.jastadd:jastadd:2.3.5"
-
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.3'
-    runtime 'com.sun.xml.bind:jaxb-impl:3.0.0'
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.0'
-    implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.ecore', version: '2.23.0'
-    implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.ecore.xmi', version: '2.16.0'
-    implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.common', version: '2.22.0'
-    implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.mwe.core', version: '1.6.1'
-
-    testImplementation group: 'junit', name: 'junit', version: junitVersion
-    testImplementation group: 'org.hamcrest', name: 'hamcrest-junit', version: '1.0.0.0'
-    testImplementation 'com.opencsv:opencsv:3.8'
-    testImplementation 'com.github.stefanbirkner:system-rules:1.19.0'
-}
-
-mainClassName = 'de.tudresden.inf.st.ttc18live.LiveContestDriverEMF'
-
-task testMain(type: JavaExec, dependsOn: assemble) {
-    group "application"
-    classpath = sourceSets.test.runtimeClasspath
-    main = 'de.tudresden.inf.st.ttc18live.Main'
-}
-
-task preprocess(type: JavaExec) {
-    group = 'Build'
-    main = "-jar"
-    args = [
-            "libs/relast-compiler.jar",
-            "--grammarName=src/main/jastadd/SocialNetworkGen",
-            "--listClass=java.util.ArrayList",
-            "--useJastAddNames",
-            "--file",
-            "src/main/jastadd/SocialNetwork.relast"
-    ]
-
-    inputs.files file("./src/main/jastadd/SocialNetwork.relast")
-    outputs.files file("./src/main/jastadd/SocialNetworkGen.ast"), file("./src/main/jastadd/SocialNetworkGen.jadd")
-}
-
-jastadd {
-    configureModuleBuild()
-    modules {
-        //noinspection GroovyAssignabilityCheck
-        module("solve") {
-
-//            java {
-//                basedir "src/"
-//                include "main/**/*.java"
-//                include "gen/**/*.java"
-//            }
-
-            jastadd {
-                basedir "src/"
-                include "main/jastadd/**/*.ast"
-                include "main/jastadd/**/*.jadd"
-                include "main/jastadd/**/*.jrag"
-                include "gen/jastadd/**/*.ast"
-                include "gen/jastadd/**/*.jadd"
-                include "gen/jastadd/**/*.jrag"
-            }
-        }
-    }
-
-    cleanGen.doFirst {
-        delete "src/gen/java/de"
-        delete "src/gen-res/BuildInfo.properties"
-    }
-
-//    preprocessParser.doFirst {
-//        args += ["--no-beaver-symbol"]
-//    }
-
-    module = "solve"
-
-    astPackage = 'de.tudresden.inf.st.ttc18live.jastadd.model'
-
-    genDir = 'src/gen/java'
-
-    buildInfoDir = 'src/gen-res'
-
-    // jastaddOptions = ["--lineColumnNumbers", "--visitCheck=true", "--rewrite=cnta", "--cache=all"]
-    // default options are: '--rewrite=cnta', '--safeLazy', '--visitCheck=false', '--cacheCycle=false'
-    extraJastAddOptions = [
-            '--lineColumnNumbers',
-            '--cache=all',
-            "--flush=api",
-            "--incremental=param,debug",
-            "--tracing=api",
-    ]
-}
-
-cleanGen.doFirst {
-    delete "src/gen/jastadd"
-}
-
-File genSrc = file("src/gen/java")
-sourceSets.main.java.srcDir genSrc
-idea.module.generatedSourceDirs += genSrc
-
-// Workflow configuration for phases
-generateAst.dependsOn preprocess
-
-// always run tests
-test.outputs.upToDateWhen {false}
-
-// disable distribution
-jar.enabled = false
-distTar.enabled = false
-distZip.enabled=false // always disabled
-packageSources.enabled=false // always disabled
+apply from: '../solve/gradle-parts/rel-relast.gradle'
diff --git a/solve/gradle-parts/base.gradle b/solve/gradle-parts/base.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..19543bfba6eef84677bfac2b1be4895fe2fe8ecc
--- /dev/null
+++ b/solve/gradle-parts/base.gradle
@@ -0,0 +1,100 @@
+
+group 'de.tudresden.inf.st'
+version '1.0-SNAPSHOT'
+
+sourceCompatibility = 11
+targetCompatibility = 11
+
+repositories {
+    mavenCentral()
+}
+
+apply plugin: 'jastadd'
+
+dependencies {
+    jastadd2 "org.jastadd:jastadd:2.3.5"
+
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.3'
+    runtime 'com.sun.xml.bind:jaxb-impl:3.0.0'
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.0'
+    implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.ecore', version: '2.23.0'
+    implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.ecore.xmi', version: '2.16.0'
+    implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.common', version: '2.22.0'
+    implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.mwe.core', version: '1.6.1'
+
+    testImplementation group: 'junit', name: 'junit', version: junitVersion
+    testImplementation group: 'org.hamcrest', name: 'hamcrest-junit', version: '1.0.0.0'
+    testImplementation 'com.opencsv:opencsv:3.8'
+    testImplementation 'com.github.stefanbirkner:system-rules:1.19.0'
+}
+
+mainClassName = 'de.tudresden.inf.st.ttc18live.LiveContestDriverXml'
+
+jar {
+    manifest {
+        attributes "Main-Class": 'de.tudresden.inf.st.ttc18live.LiveContestDriverXml'
+    }
+
+    from {
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+    }
+
+    exclude('META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA')
+
+    archiveBaseName = 'solve'
+}
+task preprocess(type: JavaExec) {
+    group = 'Build'
+    main = "-jar"
+    args = [
+            "libs/relast-compiler.jar",
+            "--grammarName=src/gen/jastadd/SocialNetworkGen",
+            "--listClass=java.util.ArrayList",
+            "--useJastAddNames",
+            "--file",
+            "src/main/jastadd/SocialNetwork.relast"
+    ]
+
+    inputs.files file("./src/main/jastadd/SocialNetwork.relast")
+    outputs.files file("./src/main/jastadd/SocialNetworkGen.ast"), file("./src/main/jastadd/SocialNetworkGen.jadd")
+}
+
+jastadd {
+    configureModuleBuild()
+    modules "jastadd_modules"
+
+    cleanGen.doFirst {
+        delete "src/gen/java/de"
+        delete "src/gen-res/BuildInfo.properties"
+    }
+
+    module = "solve"
+    astPackage = 'de.tudresden.inf.st.ttc18live.jastadd.model'
+    genDir = 'src/gen/java'
+    buildInfoDir = 'src/gen-res'
+
+    // default options are: '--rewrite=cnta', '--safeLazy', '--visitCheck=false', '--cacheCycle=false'
+    extraJastAddOptions = [
+            '--lineColumnNumbers',
+            '--cache=all',
+            "--flush=api",
+            "--incremental=param,debug",
+            "--tracing=api",
+    ]
+}
+
+cleanGen.doFirst {
+    delete "src/gen/jastadd"
+}
+
+File genSrc = file("src/gen/java")
+sourceSets.main.java.srcDir genSrc
+idea.module.generatedSourceDirs += genSrc
+
+// always run tests
+test.outputs.upToDateWhen {false}
+
+// disable distribution
+distTar.enabled = false
+distZip.enabled=false // always disabled
+packageSources.enabled=false // always disabled
diff --git a/solve/gradle-parts/inc-flush.gradle b/solve/gradle-parts/inc-flush.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/solve/gradle-parts/inc-incremental.gradle b/solve/gradle-parts/inc-incremental.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/solve/gradle-parts/rel-namelookup.gradle b/solve/gradle-parts/rel-namelookup.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/solve/gradle-parts/rel-relast.gradle b/solve/gradle-parts/rel-relast.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..d03416bb4c2adb7fc4e78f35fcfe5b1b8be370c4
--- /dev/null
+++ b/solve/gradle-parts/rel-relast.gradle
@@ -0,0 +1 @@
+generateAst.dependsOn preprocess
diff --git a/solve/jastadd_modules b/solve/jastadd_modules
index 5e0b8484e7ceb3917b8c07a7c69f6cd5239055ad..e126e375acbfd3b3823af0faea003458f6329796 100644
--- a/solve/jastadd_modules
+++ b/solve/jastadd_modules
@@ -1,15 +1,10 @@
-module("pe") {
-
-	java {
-		basedir "src/main/java/"
-		include "**/*.java"
-	}
-
-	jastadd {
-		basedir "src/main/jastadd/"
-		include "**/*.ast"
-		include "**/*.jadd"
-		include "**/*.jrag"
-	}
-
+module("solve") {
+    jastadd {
+        basedir "src/"
+        include "main/jastadd/**/*.ast"
+        include "main/jastadd/**/*.jadd"
+        include "main/jastadd/**/*.jrag"
+        include "gen/jastadd/**/*.ast"
+        include "gen/jastadd/**/*.jadd"
+    }
 }
diff --git a/solve/src/main/jastadd/NTA.jrag b/solve/src/main/jastadd/NTA.jrag
index f55db69b88a25ee3329720ca85da87a97e8707f8..78f84cdcdf28d1abd83859bb1a013faff91a8cef 100644
--- a/solve/src/main/jastadd/NTA.jrag
+++ b/solve/src/main/jastadd/NTA.jrag
@@ -2,4 +2,4 @@ aspect NTA {
   inh Post Comment.getPost();
   eq Post.getComment().getPost() = this;
   eq ModelChangeSet.getPendingNewElement().getPost() = null;
-}
\ No newline at end of file
+}
diff --git a/solve/src/main/jastadd/Refs.jadd.unused b/solve/src/main/namelookup-jastadd/Refs.jadd
similarity index 100%
rename from solve/src/main/jastadd/Refs.jadd.unused
rename to solve/src/main/namelookup-jastadd/Refs.jadd
diff --git a/solve/src/main/jastadd/SocialNetworkNamelookup.ast.unused b/solve/src/main/namelookup-jastadd/SocialNetworkNamelookup.ast
similarity index 100%
rename from solve/src/main/jastadd/SocialNetworkNamelookup.ast.unused
rename to solve/src/main/namelookup-jastadd/SocialNetworkNamelookup.ast
diff --git a/time-q1.sh b/time-q1.sh
new file mode 100755
index 0000000000000000000000000000000000000000..67987dc40e4d991c151b8d43ebcdc95d582b5b66
--- /dev/null
+++ b/time-q1.sh
@@ -0,0 +1,2 @@
+# ./gradlew installDist
+time ChangeSet=$1 ChangePath=solve/src/test/resources/models/$1/ Sequences=20 Query=Q1 java -jar solve/build/libs/solve-1.0-SNAPSHOT.jar