diff --git a/.project b/.project
index 259ea2655..1ace49604 100644
--- a/.project
+++ b/.project
@@ -5,11 +5,6 @@
-
- org.eclipse.buildship.core.gradleprojectbuilder
-
-
-
org.eclipse.buildship.core.gradleprojectnature
diff --git a/org.eclipse.xtext.ide.tests/.classpath b/org.eclipse.xtext.ide.tests/.classpath
index 15bdd0fa1..0043d86df 100644
--- a/org.eclipse.xtext.ide.tests/.classpath
+++ b/org.eclipse.xtext.ide.tests/.classpath
@@ -1,24 +1,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
diff --git a/org.eclipse.xtext.ide.tests/.project b/org.eclipse.xtext.ide.tests/.project
index 189d0c567..b63881c1c 100644
--- a/org.eclipse.xtext.ide.tests/.project
+++ b/org.eclipse.xtext.ide.tests/.project
@@ -15,11 +15,6 @@
-
- org.eclipse.buildship.core.gradleprojectbuilder
-
-
-
org.eclipse.buildship.core.gradleprojectnature
diff --git a/org.eclipse.xtext.ide/.classpath b/org.eclipse.xtext.ide/.classpath
index 2c86cbae2..ff4de9542 100644
--- a/org.eclipse.xtext.ide/.classpath
+++ b/org.eclipse.xtext.ide/.classpath
@@ -1,15 +1,7 @@
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/org.eclipse.xtext.ide/.project b/org.eclipse.xtext.ide/.project
index 19a65ecb5..1d9b1562e 100644
--- a/org.eclipse.xtext.ide/.project
+++ b/org.eclipse.xtext.ide/.project
@@ -15,11 +15,6 @@
-
- org.eclipse.buildship.core.gradleprojectbuilder
-
-
-
org.eclipse.buildship.core.gradleprojectnature
diff --git a/org.eclipse.xtext.testing/.classpath b/org.eclipse.xtext.testing/.classpath
index 8ab566493..e044adede 100644
--- a/org.eclipse.xtext.testing/.classpath
+++ b/org.eclipse.xtext.testing/.classpath
@@ -1,20 +1,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/org.eclipse.xtext.testing/.project b/org.eclipse.xtext.testing/.project
index c3ecece48..f86f2856b 100644
--- a/org.eclipse.xtext.testing/.project
+++ b/org.eclipse.xtext.testing/.project
@@ -15,11 +15,6 @@
-
- org.eclipse.buildship.core.gradleprojectbuilder
-
-
-
org.eclipse.buildship.core.gradleprojectnature
diff --git a/org.eclipse.xtext.testlanguages.ide/.classpath b/org.eclipse.xtext.testlanguages.ide/.classpath
index 61b3660a4..6911d19cd 100644
--- a/org.eclipse.xtext.testlanguages.ide/.classpath
+++ b/org.eclipse.xtext.testlanguages.ide/.classpath
@@ -1,14 +1,9 @@
-
-
-
-
-
+
-
diff --git a/org.eclipse.xtext.testlanguages.ide/.project b/org.eclipse.xtext.testlanguages.ide/.project
index 175d535a2..5fb7de12c 100644
--- a/org.eclipse.xtext.testlanguages.ide/.project
+++ b/org.eclipse.xtext.testlanguages.ide/.project
@@ -15,11 +15,6 @@
-
- org.eclipse.buildship.core.gradleprojectbuilder
-
-
-
org.eclipse.buildship.core.gradleprojectnature
diff --git a/org.eclipse.xtext.testlanguages/.classpath b/org.eclipse.xtext.testlanguages/.classpath
index 95bc5ae57..f10cbac4b 100644
--- a/org.eclipse.xtext.testlanguages/.classpath
+++ b/org.eclipse.xtext.testlanguages/.classpath
@@ -1,19 +1,10 @@
-
-
-
-
-
-
-
-
-
-
+
+
-
diff --git a/org.eclipse.xtext.testlanguages/.project b/org.eclipse.xtext.testlanguages/.project
index 8ea51f710..3f909b41e 100644
--- a/org.eclipse.xtext.testlanguages/.project
+++ b/org.eclipse.xtext.testlanguages/.project
@@ -15,11 +15,6 @@
-
- org.eclipse.buildship.core.gradleprojectbuilder
-
-
-
org.eclipse.buildship.core.gradleprojectnature
diff --git a/org.eclipse.xtext.tests/.classpath b/org.eclipse.xtext.tests/.classpath
index 76839ce42..b62832fcf 100644
--- a/org.eclipse.xtext.tests/.classpath
+++ b/org.eclipse.xtext.tests/.classpath
@@ -1,41 +1,22 @@
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
diff --git a/org.eclipse.xtext.tests/.project b/org.eclipse.xtext.tests/.project
index f42e37da1..08876e895 100644
--- a/org.eclipse.xtext.tests/.project
+++ b/org.eclipse.xtext.tests/.project
@@ -15,11 +15,6 @@
-
- org.eclipse.buildship.core.gradleprojectbuilder
-
-
-
org.eclipse.buildship.core.gradleprojectnature
diff --git a/org.eclipse.xtext.util/.classpath b/org.eclipse.xtext.util/.classpath
index 2c86cbae2..ff4de9542 100644
--- a/org.eclipse.xtext.util/.classpath
+++ b/org.eclipse.xtext.util/.classpath
@@ -1,15 +1,7 @@
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/org.eclipse.xtext.util/.project b/org.eclipse.xtext.util/.project
index 92f779a2d..2bd39eea9 100644
--- a/org.eclipse.xtext.util/.project
+++ b/org.eclipse.xtext.util/.project
@@ -15,11 +15,6 @@
-
- org.eclipse.buildship.core.gradleprojectbuilder
-
-
-
org.eclipse.buildship.core.gradleprojectnature
diff --git a/org.eclipse.xtext.xtext.bootstrap/.classpath b/org.eclipse.xtext.xtext.bootstrap/.classpath
index 8a20c8f74..6eda8c172 100644
--- a/org.eclipse.xtext.xtext.bootstrap/.classpath
+++ b/org.eclipse.xtext.xtext.bootstrap/.classpath
@@ -1,15 +1,7 @@
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/org.eclipse.xtext.xtext.bootstrap/.project b/org.eclipse.xtext.xtext.bootstrap/.project
index 771577e67..e9ae22b81 100644
--- a/org.eclipse.xtext.xtext.bootstrap/.project
+++ b/org.eclipse.xtext.xtext.bootstrap/.project
@@ -15,11 +15,6 @@
-
- org.eclipse.buildship.core.gradleprojectbuilder
-
-
-
org.eclipse.jdt.core.javanature
diff --git a/org.eclipse.xtext.xtext.generator/.classpath b/org.eclipse.xtext.xtext.generator/.classpath
index 95bc5ae57..f10cbac4b 100644
--- a/org.eclipse.xtext.xtext.generator/.classpath
+++ b/org.eclipse.xtext.xtext.generator/.classpath
@@ -1,19 +1,10 @@
-
-
-
-
-
-
-
-
-
-
+
+
-
diff --git a/org.eclipse.xtext.xtext.generator/.project b/org.eclipse.xtext.xtext.generator/.project
index a6e80ff8d..2ed4d6fd8 100644
--- a/org.eclipse.xtext.xtext.generator/.project
+++ b/org.eclipse.xtext.xtext.generator/.project
@@ -15,11 +15,6 @@
-
- org.eclipse.buildship.core.gradleprojectbuilder
-
-
-
org.eclipse.buildship.core.gradleprojectnature
diff --git a/org.eclipse.xtext.xtext.ide/.classpath b/org.eclipse.xtext.xtext.ide/.classpath
index 61b3660a4..6911d19cd 100644
--- a/org.eclipse.xtext.xtext.ide/.classpath
+++ b/org.eclipse.xtext.xtext.ide/.classpath
@@ -1,14 +1,9 @@
-
-
-
-
-
+
-
diff --git a/org.eclipse.xtext.xtext.ide/.project b/org.eclipse.xtext.xtext.ide/.project
index 9d143a2fb..71297fddb 100644
--- a/org.eclipse.xtext.xtext.ide/.project
+++ b/org.eclipse.xtext.xtext.ide/.project
@@ -2,25 +2,23 @@
org.eclipse.xtext.xtext.ide
Xtext Language generic IDE support.
-
+
+
+
+
+ org.eclipse.xtext.ui.shared.xtextBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
org.eclipse.xtext.ui.shared.xtextNature
-
-
- org.eclipse.xtext.ui.shared.xtextBuilder
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
- org.eclipse.buildship.core.gradleprojectbuilder
-
-
-
-
diff --git a/org.eclipse.xtext.xtext.wizard/.classpath b/org.eclipse.xtext.xtext.wizard/.classpath
index 98c52cad1..d1d14ee8a 100644
--- a/org.eclipse.xtext.xtext.wizard/.classpath
+++ b/org.eclipse.xtext.xtext.wizard/.classpath
@@ -1,20 +1,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/org.eclipse.xtext.xtext.wizard/.project b/org.eclipse.xtext.xtext.wizard/.project
index cf0f054bf..df4bb4b44 100644
--- a/org.eclipse.xtext.xtext.wizard/.project
+++ b/org.eclipse.xtext.xtext.wizard/.project
@@ -15,11 +15,6 @@
-
- org.eclipse.buildship.core.gradleprojectbuilder
-
-
-
org.eclipse.buildship.core.gradleprojectnature
diff --git a/org.eclipse.xtext/.classpath b/org.eclipse.xtext/.classpath
index 56700aed2..72a5f84c9 100644
--- a/org.eclipse.xtext/.classpath
+++ b/org.eclipse.xtext/.classpath
@@ -1,32 +1,18 @@
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
diff --git a/org.eclipse.xtext/.project b/org.eclipse.xtext/.project
index e30585a4c..c6c3ec72d 100644
--- a/org.eclipse.xtext/.project
+++ b/org.eclipse.xtext/.project
@@ -15,11 +15,6 @@
-
- org.eclipse.buildship.core.gradleprojectbuilder
-
-
-
org.eclipse.buildship.core.gradleprojectnature