diff --git a/org.eclipse.xtext.ide.tests/build.properties b/org.eclipse.xtext.ide.tests/build.properties
new file mode 100644
index 000000000..643815097
--- /dev/null
+++ b/org.eclipse.xtext.ide.tests/build.properties
@@ -0,0 +1,12 @@
+bin.includes = .,\
+               META-INF/,\
+               plugin.properties,\
+               about.html
+source.. = src-gen/,\
+           src/,\
+           xtend-gen/,\
+           testlang-src/,\
+           testlang-src-gen/,\
+           suites
+output.. = bin/test/
+src.includes = about.html
\ No newline at end of file
diff --git a/org.eclipse.xtext.ide.tests/plugin.properties b/org.eclipse.xtext.ide.tests/plugin.properties
new file mode 100644
index 000000000..56e5152fb
--- /dev/null
+++ b/org.eclipse.xtext.ide.tests/plugin.properties
@@ -0,0 +1,2 @@
+pluginName = Xtext IDE Tests
+providerName = Eclipse Xtext
diff --git a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF
index cad68183d..0968461ca 100644
--- a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.ide;singleton:=true
 Bundle-Version: 2.20.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
 Bundle-Vendor: Eclipse Xtext
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.eclipse.xtend.lib,
diff --git a/org.eclipse.xtext.ide/build.properties b/org.eclipse.xtext.ide/build.properties
new file mode 100644
index 000000000..1c0fbe056
--- /dev/null
+++ b/org.eclipse.xtext.ide/build.properties
@@ -0,0 +1,8 @@
+bin.includes = .,\
+               META-INF/,\
+               plugin.properties,\
+               about.html
+source.. = src/,\
+           xtend-gen/
+output.. = bin/main/
+src.includes = about.html
diff --git a/org.eclipse.xtext.ide/plugin.properties b/org.eclipse.xtext.ide/plugin.properties
new file mode 100644
index 000000000..b1f23b65c
--- /dev/null
+++ b/org.eclipse.xtext.ide/plugin.properties
@@ -0,0 +1,2 @@
+pluginName = Xtext IDE Core
+providerName = Eclipse Xtext
diff --git a/org.eclipse.xtext.testing/build.properties b/org.eclipse.xtext.testing/build.properties
new file mode 100644
index 000000000..497941aff
--- /dev/null
+++ b/org.eclipse.xtext.testing/build.properties
@@ -0,0 +1,8 @@
+bin.includes = .,\
+               META-INF/,\
+               about.html
+source.. = src/,\
+           xtend-gen/,\
+           tests
+output.. = bin/main/
+src.includes = about.html
diff --git a/org.eclipse.xtext.testlanguages.ide/build.properties b/org.eclipse.xtext.testlanguages.ide/build.properties
index 63f97de38..c2f1926b7 100644
--- a/org.eclipse.xtext.testlanguages.ide/build.properties
+++ b/org.eclipse.xtext.testlanguages.ide/build.properties
@@ -1,4 +1,6 @@
-source.. = src-gen/
-output.. = bin/
+source.. = src-gen/,\
+           src/,\
+           xtend-gen/
+output.. = bin/main/
 bin.includes = META-INF/,\
                .
diff --git a/org.eclipse.xtext.testlanguages/build.properties b/org.eclipse.xtext.testlanguages/build.properties
new file mode 100644
index 000000000..810a0a9ab
--- /dev/null
+++ b/org.eclipse.xtext.testlanguages/build.properties
@@ -0,0 +1,10 @@
+bin.includes = .,\
+               META-INF/,\
+               plugin.xml,\
+               about.html,\
+               model/
+source.. = src-gen/,\
+           src/,\
+           xtend-gen/
+output.. = bin/main/
+src.includes = about.html
diff --git a/org.eclipse.xtext.tests/build.properties b/org.eclipse.xtext.tests/build.properties
index 6a74b724a..74df7a437 100644
--- a/org.eclipse.xtext.tests/build.properties
+++ b/org.eclipse.xtext.tests/build.properties
@@ -1,11 +1,17 @@
-#
-
-bin.includes = model/generated/,\
-               .,\
-               model/,\
+bin.includes = .,\
                META-INF/,\
                plugin.xml,\
-               plugin.properties
-jars.compile.order = .
-source.. = src-gen/
-output.. = bin/
+               plugin.properties,\
+               about.html,\
+               testdata/
+source.. = src-gen/,\
+           emf-gen/,\
+           xtend-gen/,\
+           src/,\
+           generator/src/,\
+           generator/xtend-gen/,\
+           suites/
+output.. = bin/mwe2/,\
+           bin/test/
+src.includes = testdata/,\
+               about.html
diff --git a/org.eclipse.xtext.util/build.properties b/org.eclipse.xtext.util/build.properties
new file mode 100644
index 000000000..1c0fbe056
--- /dev/null
+++ b/org.eclipse.xtext.util/build.properties
@@ -0,0 +1,8 @@
+bin.includes = .,\
+               META-INF/,\
+               plugin.properties,\
+               about.html
+source.. = src/,\
+           xtend-gen/
+output.. = bin/main/
+src.includes = about.html
diff --git a/org.eclipse.xtext.xtext.generator/build.properties b/org.eclipse.xtext.xtext.generator/build.properties
new file mode 100644
index 000000000..8bef76503
--- /dev/null
+++ b/org.eclipse.xtext.xtext.generator/build.properties
@@ -0,0 +1,8 @@
+bin.includes = .,\
+               META-INF/,\
+               about.html
+source.. = src-gen/,\
+           src/,\
+           xtend-gen/
+output.. = bin/main/
+src.includes = about.html
diff --git a/org.eclipse.xtext.xtext.ide/build.properties b/org.eclipse.xtext.xtext.ide/build.properties
new file mode 100644
index 000000000..ebf3c04c0
--- /dev/null
+++ b/org.eclipse.xtext.xtext.ide/build.properties
@@ -0,0 +1,7 @@
+bin.includes = .,\
+               META-INF/,\
+               about.html
+source.. = src-gen/,\
+           src/
+output.. = bin/main/
+src.includes = about.html
diff --git a/org.eclipse.xtext.xtext.wizard/build.properties b/org.eclipse.xtext.xtext.wizard/build.properties
new file mode 100644
index 000000000..a82090e84
--- /dev/null
+++ b/org.eclipse.xtext.xtext.wizard/build.properties
@@ -0,0 +1,8 @@
+bin.includes = .,\
+               META-INF/,\
+               about.html
+source.. = resources/,\
+           src/,\
+           xtend-gen/
+output.. = bin/main/
+src.includes = about.html
diff --git a/org.eclipse.xtext/.cvsignore b/org.eclipse.xtext/.cvsignore
deleted file mode 100644
index 04df6fb01..000000000
--- a/org.eclipse.xtext/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-emf-gen
-emf-gen/
-emf-gen/*
-
diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF
index 65d310565..b8aec3c03 100644
--- a/org.eclipse.xtext/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext;singleton:=true
 Bundle-Version: 2.20.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Xtext
+Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.xtext,
  org.eclipse.xtext.build;x-friends:="org.eclipse.xtext.testing,
diff --git a/org.eclipse.xtext/build.properties b/org.eclipse.xtext/build.properties
new file mode 100644
index 000000000..e52649d1f
--- /dev/null
+++ b/org.eclipse.xtext/build.properties
@@ -0,0 +1,18 @@
+bin.includes = .,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html,\
+               about.ini,\
+               about.mappings,\
+               about.properties,\
+               xtext32.png,\
+               schema/,\
+               org/
+source.. = src-gen/,\
+           emf-gen/,\
+           packrat/,\
+           src/,\
+           xtend-gen/
+output.. = bin/main/
+src.includes = about.html
diff --git a/org.eclipse.xtext/plugin.properties b/org.eclipse.xtext/plugin.properties
new file mode 100644
index 000000000..3ff5c091b
--- /dev/null
+++ b/org.eclipse.xtext/plugin.properties
@@ -0,0 +1,2 @@
+pluginName = Xtext Core
+providerName = Eclipse Xtext