diff --git a/.gitignore b/.gitignore
index 0b917098f..1f904e865 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,5 @@
bin/
.gradle/
build/
-.project
-.classpath
-org.eclipse.buildship.core.prefs
-org.eclipse.jdt.core.prefs
*._trace
*.xtendbin
diff --git a/.project b/.project
new file mode 100644
index 000000000..e91831a53
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+
+
+ xtext-core
+ Project xtext-core created by Buildship.
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectnature
+
+
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..5aec851a5
--- /dev/null
+++ b/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,5 @@
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+project.path=\:
diff --git a/org.eclipse.xtext.ide.tests/.classpath b/org.eclipse.xtext.ide.tests/.classpath
new file mode 100644
index 000000000..72bfd10f1
--- /dev/null
+++ b/org.eclipse.xtext.ide.tests/.classpath
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.eclipse.xtext.ide.tests/.project b/org.eclipse.xtext.ide.tests/.project
new file mode 100644
index 000000000..189d0c567
--- /dev/null
+++ b/org.eclipse.xtext.ide.tests/.project
@@ -0,0 +1,29 @@
+
+
+ org.eclipse.xtext.ide.tests
+ Project org.eclipse.xtext.ide.tests created by Buildship.
+
+
+
+
+ org.eclipse.xtext.ui.shared.xtextBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectnature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.xtext.ui.shared.xtextNature
+
+
diff --git a/org.eclipse.xtext.ide.tests/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..78f048f6b
--- /dev/null
+++ b/org.eclipse.xtext.ide.tests/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,7 @@
+build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=..
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
+project.path=\:org.eclipse.xtext.ide.tests
diff --git a/org.eclipse.xtext.ide/.classpath b/org.eclipse.xtext.ide/.classpath
new file mode 100644
index 000000000..8a20c8f74
--- /dev/null
+++ b/org.eclipse.xtext.ide/.classpath
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.eclipse.xtext.ide/.project b/org.eclipse.xtext.ide/.project
new file mode 100644
index 000000000..19a65ecb5
--- /dev/null
+++ b/org.eclipse.xtext.ide/.project
@@ -0,0 +1,29 @@
+
+
+ org.eclipse.xtext.ide
+ Project org.eclipse.xtext.ide created by Buildship.
+
+
+
+
+ org.eclipse.xtext.ui.shared.xtextBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectnature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.xtext.ui.shared.xtextNature
+
+
diff --git a/org.eclipse.xtext.ide/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.ide/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..6a418d2d8
--- /dev/null
+++ b/org.eclipse.xtext.ide/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,7 @@
+build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=..
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
+project.path=\:org.eclipse.xtext.ide
diff --git a/org.eclipse.xtext.testing/.classpath b/org.eclipse.xtext.testing/.classpath
new file mode 100644
index 000000000..5ba0b724a
--- /dev/null
+++ b/org.eclipse.xtext.testing/.classpath
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.eclipse.xtext.testing/.project b/org.eclipse.xtext.testing/.project
new file mode 100644
index 000000000..c3ecece48
--- /dev/null
+++ b/org.eclipse.xtext.testing/.project
@@ -0,0 +1,29 @@
+
+
+ org.eclipse.xtext.testing
+ Project org.eclipse.xtext.testing created by Buildship.
+
+
+
+
+ org.eclipse.xtext.ui.shared.xtextBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectnature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.xtext.ui.shared.xtextNature
+
+
diff --git a/org.eclipse.xtext.testing/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.testing/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..c0b779ad6
--- /dev/null
+++ b/org.eclipse.xtext.testing/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,7 @@
+build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=..
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
+project.path=\:org.eclipse.xtext.testing
diff --git a/org.eclipse.xtext.testlanguages.ide/.classpath b/org.eclipse.xtext.testlanguages.ide/.classpath
new file mode 100644
index 000000000..c93a0ddb7
--- /dev/null
+++ b/org.eclipse.xtext.testlanguages.ide/.classpath
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/org.eclipse.xtext.testlanguages.ide/.project b/org.eclipse.xtext.testlanguages.ide/.project
new file mode 100644
index 000000000..175d535a2
--- /dev/null
+++ b/org.eclipse.xtext.testlanguages.ide/.project
@@ -0,0 +1,29 @@
+
+
+ org.eclipse.xtext.testlanguages.ide
+ Project org.eclipse.xtext.testlanguages.ide created by Buildship.
+
+
+
+
+ org.eclipse.xtext.ui.shared.xtextBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectnature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.xtext.ui.shared.xtextNature
+
+
diff --git a/org.eclipse.xtext.testlanguages.ide/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.testlanguages.ide/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..f5623944e
--- /dev/null
+++ b/org.eclipse.xtext.testlanguages.ide/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,7 @@
+build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=..
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
+project.path=\:org.eclipse.xtext.testlanguages.ide
diff --git a/org.eclipse.xtext.testlanguages/.classpath b/org.eclipse.xtext.testlanguages/.classpath
new file mode 100644
index 000000000..5b4213581
--- /dev/null
+++ b/org.eclipse.xtext.testlanguages/.classpath
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.eclipse.xtext.testlanguages/.project b/org.eclipse.xtext.testlanguages/.project
new file mode 100644
index 000000000..8ea51f710
--- /dev/null
+++ b/org.eclipse.xtext.testlanguages/.project
@@ -0,0 +1,29 @@
+
+
+ org.eclipse.xtext.testlanguages
+ Project org.eclipse.xtext.testlanguages created by Buildship.
+
+
+
+
+ org.eclipse.xtext.ui.shared.xtextBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectnature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.xtext.ui.shared.xtextNature
+
+
diff --git a/org.eclipse.xtext.testlanguages/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.testlanguages/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..889ab9cdd
--- /dev/null
+++ b/org.eclipse.xtext.testlanguages/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,7 @@
+build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=..
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
+project.path=\:org.eclipse.xtext.testlanguages
diff --git a/org.eclipse.xtext.tests/.classpath b/org.eclipse.xtext.tests/.classpath
new file mode 100644
index 000000000..e0e3b6f3e
--- /dev/null
+++ b/org.eclipse.xtext.tests/.classpath
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.eclipse.xtext.tests/.project b/org.eclipse.xtext.tests/.project
new file mode 100644
index 000000000..f42e37da1
--- /dev/null
+++ b/org.eclipse.xtext.tests/.project
@@ -0,0 +1,29 @@
+
+
+ org.eclipse.xtext.tests
+ Project org.eclipse.xtext.tests created by Buildship.
+
+
+
+
+ org.eclipse.xtext.ui.shared.xtextBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectnature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.xtext.ui.shared.xtextNature
+
+
diff --git a/org.eclipse.xtext.tests/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.tests/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..df3be6bcb
--- /dev/null
+++ b/org.eclipse.xtext.tests/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,7 @@
+build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=..
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
+project.path=\:org.eclipse.xtext.tests
diff --git a/org.eclipse.xtext.util/.classpath b/org.eclipse.xtext.util/.classpath
new file mode 100644
index 000000000..8a20c8f74
--- /dev/null
+++ b/org.eclipse.xtext.util/.classpath
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.eclipse.xtext.util/.project b/org.eclipse.xtext.util/.project
new file mode 100644
index 000000000..92f779a2d
--- /dev/null
+++ b/org.eclipse.xtext.util/.project
@@ -0,0 +1,29 @@
+
+
+ org.eclipse.xtext.util
+ Project org.eclipse.xtext.util created by Buildship.
+
+
+
+
+ org.eclipse.xtext.ui.shared.xtextBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectnature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.xtext.ui.shared.xtextNature
+
+
diff --git a/org.eclipse.xtext.util/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.util/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..f7e708fb9
--- /dev/null
+++ b/org.eclipse.xtext.util/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,7 @@
+build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=..
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
+project.path=\:org.eclipse.xtext.util
diff --git a/org.eclipse.xtext.xtext.generator/.classpath b/org.eclipse.xtext.xtext.generator/.classpath
new file mode 100644
index 000000000..5b4213581
--- /dev/null
+++ b/org.eclipse.xtext.xtext.generator/.classpath
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.eclipse.xtext.xtext.generator/.project b/org.eclipse.xtext.xtext.generator/.project
new file mode 100644
index 000000000..a6e80ff8d
--- /dev/null
+++ b/org.eclipse.xtext.xtext.generator/.project
@@ -0,0 +1,29 @@
+
+
+ org.eclipse.xtext.xtext.generator
+ Project org.eclipse.xtext.xtext.generator created by Buildship.
+
+
+
+
+ org.eclipse.xtext.ui.shared.xtextBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectnature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.xtext.ui.shared.xtextNature
+
+
diff --git a/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..fae4dd7ed
--- /dev/null
+++ b/org.eclipse.xtext.xtext.generator/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,7 @@
+build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=..
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
+project.path=\:org.eclipse.xtext.xtext.generator
diff --git a/org.eclipse.xtext.xtext.wizard/.classpath b/org.eclipse.xtext.xtext.wizard/.classpath
new file mode 100644
index 000000000..30c1e09f3
--- /dev/null
+++ b/org.eclipse.xtext.xtext.wizard/.classpath
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.eclipse.xtext.xtext.wizard/.project b/org.eclipse.xtext.xtext.wizard/.project
new file mode 100644
index 000000000..cf0f054bf
--- /dev/null
+++ b/org.eclipse.xtext.xtext.wizard/.project
@@ -0,0 +1,29 @@
+
+
+ org.eclipse.xtext.xtext.wizard
+ Project org.eclipse.xtext.xtext.wizard created by Buildship.
+
+
+
+
+ org.eclipse.xtext.ui.shared.xtextBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectnature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.xtext.ui.shared.xtextNature
+
+
diff --git a/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..ebe65234d
--- /dev/null
+++ b/org.eclipse.xtext.xtext.wizard/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,7 @@
+build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=..
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
+project.path=\:org.eclipse.xtext.xtext.wizard
diff --git a/org.eclipse.xtext/.classpath b/org.eclipse.xtext/.classpath
new file mode 100644
index 000000000..2a152fac3
--- /dev/null
+++ b/org.eclipse.xtext/.classpath
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.eclipse.xtext/.project b/org.eclipse.xtext/.project
new file mode 100644
index 000000000..e30585a4c
--- /dev/null
+++ b/org.eclipse.xtext/.project
@@ -0,0 +1,29 @@
+
+
+ org.eclipse.xtext
+ Project org.eclipse.xtext created by Buildship.
+
+
+
+
+ org.eclipse.xtext.ui.shared.xtextBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectnature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.xtext.ui.shared.xtextNature
+
+
diff --git a/org.eclipse.xtext/.settings/org.eclipse.buildship.core.prefs b/org.eclipse.xtext/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..e2458baad
--- /dev/null
+++ b/org.eclipse.xtext/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,7 @@
+build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.xtext.ui.shared.xtextBuilder
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=..
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+natures=org.eclipse.jdt.core.javanature,org.eclipse.xtext.ui.shared.xtextNature
+project.path=\:org.eclipse.xtext