diff --git a/.gitignore b/.gitignore
index e27d1c75..9e582d10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 *.class
 *.jar
 bin
-xtend-gen
 target
 .DS_Store
diff --git a/README.md b/README.md
index 451a3e2b..bab5c329 100644
--- a/README.md
+++ b/README.md
@@ -13,12 +13,12 @@ Go to http://www.xpect-tests.org (and look for an Eclipse update-site).
 
 **The Fast Way:** Download [OOMPH](https://wiki.eclipse.org/Eclipse_Oomph_Installer) and point it to [Xpect.setup](https://github.com/meysholdt/Xpect/raw/master/org.xpect.releng/Xpect.setup).
 
-**The Manual Way:** Prerequisite: Java 1.6 or newer; Eclipse 3.8 or 4.2 or newer; Xtext 2.4. 
+**The Manual Way:** Prerequisite: Java 1.6 or newer; Eclipse 3.8 or 4.2 or newer; Xtext 2.9.2.
 
  1. Clone https://github.com/meysholdt/Xpect (this repository)
  2. Import all projects into your Eclipse workspace.
- 3. Set target platform /org.xpect.releng/target-platforms/org.xpect.target.target
- 4. Run /org.xpect/src/org/xpect/GenerateXpect.mwe2. Now your projects should be without errors markers. 
+ 3. Set target platform to /org.xpect.releng/target-platforms/eclipse_4_6_3-xtext_2_9_2/org.xpect.target.eclipse_4_6_3-xtext_2_9_2.target (Preferences -> Plug-in Development -> Target Platform)
+ 4. Run /org.xpect/src/org/xpect/GenerateXpect.mwe2, /org.xtext.example.arithmetics/src/org/xpect/example/arithmetics/GenerateXpect.mwe2, /org.xtext.example.domainmodel/src/org/xtext/example/domainmodel/GenerateDomainmodel.mwe2. Now your projects should be without errors markers. Sometimes, even after these steps, several projects still have error markers. However, this is a refresh problem in Eclipse. Simply clean build the projects with error markers will solve the issues.
  5. Run "mvn clean install" to build artefacts and create a p2 repository (formerly known as update site).
 
 
diff --git a/org.eclipse.xtext.example.domainmodel.xpect.tests/.gitignore b/org.eclipse.xtext.example.domainmodel.xpect.tests/.gitignore
deleted file mode 100644
index ef54b8c3..00000000
--- a/org.eclipse.xtext.example.domainmodel.xpect.tests/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-src-gen
-xtend-gen
diff --git a/org.eclipse.xtext.example.domainmodel.xpect.tests/xtend-gen/.gitignore b/org.eclipse.xtext.example.domainmodel.xpect.tests/xtend-gen/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/org.eclipse.xtext.example.domainmodel.xpect.tests/xtend-gen/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/org.xpect.releng/GenerateArithmetics.launch b/org.xpect.releng/GenerateArithmetics.launch
new file mode 100644
index 00000000..d46d38fc
--- /dev/null
+++ b/org.xpect.releng/GenerateArithmetics.launch
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.xpect"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/xtext/example/arithmetics/GenerateArithmetics.mwe2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.xtext.example.arithmetics"/>
+</launchConfiguration>
diff --git a/org.xpect.releng/GenerateDomainmodel.launch b/org.xpect.releng/GenerateDomainmodel.launch
new file mode 100644
index 00000000..58a50af5
--- /dev/null
+++ b/org.xpect.releng/GenerateDomainmodel.launch
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.xpect"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/xtext/example/domainmodel/GenerateDomainmodel.mwe2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.xtext.example.domainmodel"/>
+</launchConfiguration>
diff --git a/org.xpect.releng/Xpect.setup b/org.xpect.releng/Xpect.setup
index c8d9d6b9..57377cdf 100644
--- a/org.xpect.releng/Xpect.setup
+++ b/org.xpect.releng/Xpect.setup
@@ -31,7 +31,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="Luna"
+      defaultValue="Neon"
       storageURI="scope://Workspace"/>
   <setupTask
       xsi:type="setup.workingsets:WorkingSetTask">
@@ -98,7 +98,8 @@
         <requirement
             name="org.eclipse.xtext.example.domainmodel.xpect.tests"/>
         <sourceLocator
-            rootFolder="${git.clone.location}"/>
+            rootFolder="${git.clone.location}"
+            locateNestedProjects="true"/>
         <repositoryList
             name="Neon">
           <repository
@@ -180,6 +181,17 @@
           name="org.eclipse.m2e.feature.feature.group"/>
       <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
     </setupTask>
+    <setupTask
+      xsi:type="projects:ProjectsBuildTask"
+      refresh="true"/>
+  <setupTask
+      xsi:type="setup:CompoundTask"
+      name="org.eclipse.debug.ui">
+    <setupTask
+        xsi:type="setup:PreferenceTask"
+        key="/instance/org.eclipse.debug.ui/org.eclipse.debug.ui.cancel_launch_with_compile_errors"
+        value="always"/>
+  </setupTask>
     <setupTask
         xsi:type="launching:LaunchTask"
         id="GenerateXpectLanguage"
@@ -188,9 +200,15 @@
     </setupTask>
     <setupTask
         xsi:type="launching:LaunchTask"
-        id="GenerateXpectLanguage2"
-        launcher="/org.xpect.releng/GenerateXpect.launch">
-      <description>Run Task again, workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=457947</description>
+        id="GenerateArithmetics"
+        launcher="/org.xpect.releng/GenerateArithmetics.launch">
+      <description>Generate Arithmetics</description>
+    </setupTask>
+    <setupTask
+        xsi:type="launching:LaunchTask"
+        id="GenerateDomainmodel"
+        launcher="/org.xpect.releng/GenerateDomainmodel.launch">
+      <description>Generate Domain Model</description>
     </setupTask>
     <stream
         name="master"/>
diff --git a/org.xpect.releng/xtext-examples/.gitignore b/org.xpect.releng/xtext-examples/.gitignore
deleted file mode 100644
index 1ac4ba16..00000000
--- a/org.xpect.releng/xtext-examples/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-src-gen
\ No newline at end of file
diff --git a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ide/.classpath b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ide/.classpath
index f05f8b78..c1f31893 100644
--- a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ide/.classpath
+++ b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ide/.classpath
@@ -3,7 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="xtend-gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ide/build.properties b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ide/build.properties
index c9446bbb..aa2969a9 100644
--- a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ide/build.properties
+++ b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ide/build.properties
@@ -1,5 +1,4 @@
-source.. = src/,\
-           src-gen/,\
-           xtend-gen/
+source.. = src-gen/
+
 bin.includes = .,\
                META-INF/
diff --git a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ide/src-gen/.gitignore b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ide/src-gen/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ide/src-gen/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.tests/src-gen/.gitignore b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.tests/src-gen/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.tests/src-gen/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.tests/xtend-gen/.gitignore b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.tests/xtend-gen/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.tests/xtend-gen/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ui/src-gen/.gitignore b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ui/src-gen/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ui/src-gen/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ui/xtend-gen/.gitignore b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ui/xtend-gen/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics.ui/xtend-gen/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics/src-gen/.gitignore b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics/src-gen/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics/src-gen/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics/xtend-gen/.gitignore b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics/xtend-gen/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.arithmetics/xtend-gen/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel.tests/src-gen/.gitignore b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel.tests/src-gen/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel.tests/src-gen/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel.tests/xtend-gen/.gitignore b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel.tests/xtend-gen/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel.tests/xtend-gen/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/.gitignore b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel/src-gen/.gitignore b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel/src-gen/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel/src-gen/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel/xtend-gen/.gitignore b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel/xtend-gen/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/org.xpect.releng/xtext-examples/org.eclipse.xtext.example.domainmodel/xtend-gen/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/org.xpect.tests/xtend-gen/.gitignore b/org.xpect.tests/xtend-gen/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/org.xpect.tests/xtend-gen/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file