diff --git a/debug/org.eclipse.unittest.ui/build.properties b/debug/org.eclipse.unittest.ui/build.properties
index 136d1bca61b..405e8633ecb 100644
--- a/debug/org.eclipse.unittest.ui/build.properties
+++ b/debug/org.eclipse.unittest.ui/build.properties
@@ -19,6 +19,7 @@ bin.includes = plugin.xml,\
META-INF/
source.. = src/
+output.. = bin/
src.includes = about.html,\
schema/
diff --git a/platform/org.eclipse.platform/build.properties b/platform/org.eclipse.platform/build.properties
index fba7b951d4a..702cdeb5c90 100644
--- a/platform/org.eclipse.platform/build.properties
+++ b/platform/org.eclipse.platform/build.properties
@@ -48,6 +48,7 @@ bin.includes = about.html,\
700E4F39BC05364B.asc
src.includes = about.html
source.platform.jar = src-intro/
+output.platform.jar = bin-intro/
# Maven properties, see https://github.com/eclipse/tycho/wiki/Tycho-Pomless
tycho.pomless.parent = ../../
diff --git a/resources/bundles/org.eclipse.core.resources.spysupport/build.properties b/resources/bundles/org.eclipse.core.resources.spysupport/build.properties
index 0ab7009269a..bf96a0a90c7 100644
--- a/resources/bundles/org.eclipse.core.resources.spysupport/build.properties
+++ b/resources/bundles/org.eclipse.core.resources.spysupport/build.properties
@@ -12,6 +12,7 @@
# IBM Corporation - initial API and implementation
###############################################################################
source.. = src/
+output.. = bin/
src.includes=about.html
bin.includes=about.html, META-INF/,.
qualifier=context
diff --git a/resources/bundles/org.eclipse.core.resources/.classpath b/resources/bundles/org.eclipse.core.resources/.classpath
index ff541d27c29..3bf050a3e78 100644
--- a/resources/bundles/org.eclipse.core.resources/.classpath
+++ b/resources/bundles/org.eclipse.core.resources/.classpath
@@ -3,6 +3,6 @@
-
+
diff --git a/resources/bundles/org.eclipse.core.resources/.gitignore b/resources/bundles/org.eclipse.core.resources/.gitignore
index 85d0d8e3ab9..3b8b98010a5 100644
--- a/resources/bundles/org.eclipse.core.resources/.gitignore
+++ b/resources/bundles/org.eclipse.core.resources/.gitignore
@@ -1,3 +1,3 @@
temp.folder
-src_ant_bin
+bin_ant
ant_tasks
\ No newline at end of file
diff --git a/resources/bundles/org.eclipse.core.resources/build.properties b/resources/bundles/org.eclipse.core.resources/build.properties
index c621029a6aa..a37441247a9 100644
--- a/resources/bundles/org.eclipse.core.resources/build.properties
+++ b/resources/bundles/org.eclipse.core.resources/build.properties
@@ -11,8 +11,10 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-source..=src/
-source.ant_tasks/resources-ant.jar=src_ant/
+source.. = src/
+output.. = bin/
+source.ant_tasks/resources-ant.jar = src_ant/
+output.ant_tasks/resources-ant.jar = bin_ant/
src.includes = about.html,\
schema/,\
natives/
diff --git a/resources/bundles/org.eclipse.core.tools.resources/build.properties b/resources/bundles/org.eclipse.core.tools.resources/build.properties
index b2afb009d32..dfac95d3825 100644
--- a/resources/bundles/org.eclipse.core.tools.resources/build.properties
+++ b/resources/bundles/org.eclipse.core.tools.resources/build.properties
@@ -12,6 +12,7 @@
# IBM Corporation - initial API and implementation
###############################################################################
source.. = src/
+output.. = bin/
src.includes=*.html
bin.includes=plugin.xml,icons/,doc/,*.html,.options, META-INF/,.
qualifier=context
diff --git a/resources/tests/org.eclipse.core.tests.resources.saveparticipant/build.properties b/resources/tests/org.eclipse.core.tests.resources.saveparticipant/build.properties
index d5e62fc7b47..87f7e0c5b35 100644
--- a/resources/tests/org.eclipse.core.tests.resources.saveparticipant/build.properties
+++ b/resources/tests/org.eclipse.core.tests.resources.saveparticipant/build.properties
@@ -12,7 +12,8 @@
# IBM Corporation - initial API and implementation
# Mickael Istria (Red Hat Inc.) - 417025 Get rid of nested jars
###############################################################################
-source..=src/
+source.. = src/
+output.. = bin/
bin.includes = .,\
META-INF/,\
about.html
diff --git a/resources/tests/org.eclipse.core.tests.resources.saveparticipant1/build.properties b/resources/tests/org.eclipse.core.tests.resources.saveparticipant1/build.properties
index d5e62fc7b47..87f7e0c5b35 100644
--- a/resources/tests/org.eclipse.core.tests.resources.saveparticipant1/build.properties
+++ b/resources/tests/org.eclipse.core.tests.resources.saveparticipant1/build.properties
@@ -12,7 +12,8 @@
# IBM Corporation - initial API and implementation
# Mickael Istria (Red Hat Inc.) - 417025 Get rid of nested jars
###############################################################################
-source..=src/
+source.. = src/
+output.. = bin/
bin.includes = .,\
META-INF/,\
about.html
diff --git a/resources/tests/org.eclipse.core.tests.resources.saveparticipant2/build.properties b/resources/tests/org.eclipse.core.tests.resources.saveparticipant2/build.properties
index d5e62fc7b47..87f7e0c5b35 100644
--- a/resources/tests/org.eclipse.core.tests.resources.saveparticipant2/build.properties
+++ b/resources/tests/org.eclipse.core.tests.resources.saveparticipant2/build.properties
@@ -12,7 +12,8 @@
# IBM Corporation - initial API and implementation
# Mickael Istria (Red Hat Inc.) - 417025 Get rid of nested jars
###############################################################################
-source..=src/
+source.. = src/
+output.. = bin/
bin.includes = .,\
META-INF/,\
about.html
diff --git a/resources/tests/org.eclipse.core.tests.resources.saveparticipant3/build.properties b/resources/tests/org.eclipse.core.tests.resources.saveparticipant3/build.properties
index 859e11b42b4..359407053eb 100644
--- a/resources/tests/org.eclipse.core.tests.resources.saveparticipant3/build.properties
+++ b/resources/tests/org.eclipse.core.tests.resources.saveparticipant3/build.properties
@@ -12,7 +12,8 @@
# IBM Corporation - initial API and implementation
# Mickael Istria (Red Hat Inc.) - 417025 Get rid of nested jars
###############################################################################
-source..=src/
+source.. = src/
+output.. = bin/
bin.includes = .,\
META-INF/,\
about.html
diff --git a/resources/tests/org.eclipse.core.tests.resources/build.properties b/resources/tests/org.eclipse.core.tests.resources/build.properties
index c8ae13c26b4..3e6225a82e8 100644
--- a/resources/tests/org.eclipse.core.tests.resources/build.properties
+++ b/resources/tests/org.eclipse.core.tests.resources/build.properties
@@ -12,7 +12,8 @@
# IBM Corporation - initial API and implementation
# Mickael Istria (Red Hat Inc.) - 417025 Get rid of nested jars
###############################################################################
-source..=src/
+source.. = src/
+output.. = bin/
bin.includes = plugin.xml,\
.,\
MultipleProjectTestFiles/,\
diff --git a/runtime/bundles/org.eclipse.core.contenttype/build.properties b/runtime/bundles/org.eclipse.core.contenttype/build.properties
index 9baf4a01860..0c5896f498a 100644
--- a/runtime/bundles/org.eclipse.core.contenttype/build.properties
+++ b/runtime/bundles/org.eclipse.core.contenttype/build.properties
@@ -23,4 +23,3 @@ bin.includes = META-INF/,\
OSGI-INF/
src.includes = about.html,\
schema/
-source.. = src/
diff --git a/runtime/bundles/org.eclipse.core.expressions/build.properties b/runtime/bundles/org.eclipse.core.expressions/build.properties
index 5e339971626..597493c8b11 100644
--- a/runtime/bundles/org.eclipse.core.expressions/build.properties
+++ b/runtime/bundles/org.eclipse.core.expressions/build.properties
@@ -20,3 +20,4 @@ bin.includes = plugin.xml,\
src.includes = about.html,\
schema/
source.. = src/
+output.. = bin/
diff --git a/runtime/bundles/org.eclipse.core.runtime/build.properties b/runtime/bundles/org.eclipse.core.runtime/build.properties
index e4c737241a3..52900f7790f 100644
--- a/runtime/bundles/org.eclipse.core.runtime/build.properties
+++ b/runtime/bundles/org.eclipse.core.runtime/build.properties
@@ -18,5 +18,6 @@ bin.includes = .options,\
.,\
META-INF/
source.. = src/
+output.. = bin/
src.includes = about.html,\
schema/
diff --git a/runtime/bundles/org.eclipse.core.tools/build.properties b/runtime/bundles/org.eclipse.core.tools/build.properties
index e87cb522f18..b0d9780d0bb 100644
--- a/runtime/bundles/org.eclipse.core.tools/build.properties
+++ b/runtime/bundles/org.eclipse.core.tools/build.properties
@@ -12,6 +12,7 @@
# IBM Corporation - initial API and implementation
###############################################################################
source.. = src/
+output.. = bin/
src.includes=*.html
bin.includes = plugin.xml,\
icons/,\
diff --git a/runtime/tests/org.eclipse.core.contenttype.tests/build.properties b/runtime/tests/org.eclipse.core.contenttype.tests/build.properties
index a8f9ba70885..7b537962866 100644
--- a/runtime/tests/org.eclipse.core.contenttype.tests/build.properties
+++ b/runtime/tests/org.eclipse.core.contenttype.tests/build.properties
@@ -12,6 +12,7 @@
# Mickael Istria (Red Hat Inc.) - initial API and implementation
###############################################################################
source.. = src/
+output.. = bin/
bin.includes = test.xml,\
about.html,\
plugin.properties,\
diff --git a/runtime/tests/org.eclipse.core.expressions.tests/build.properties b/runtime/tests/org.eclipse.core.expressions.tests/build.properties
index 09288f0a4ff..084dfddf8f7 100644
--- a/runtime/tests/org.eclipse.core.expressions.tests/build.properties
+++ b/runtime/tests/org.eclipse.core.expressions.tests/build.properties
@@ -14,6 +14,7 @@
# Lars Vogel - Bug 474642
###############################################################################
source.. = src/
+output.. = bin/
bin.includes = plugin.xml,\
test.xml,\
about.html,\
diff --git a/runtime/tests/org.eclipse.core.tests.harness/build.properties b/runtime/tests/org.eclipse.core.tests.harness/build.properties
index 9e06a237bfb..0e561518209 100644
--- a/runtime/tests/org.eclipse.core.tests.harness/build.properties
+++ b/runtime/tests/org.eclipse.core.tests.harness/build.properties
@@ -14,6 +14,7 @@
# Lars Vogel - Bug 474642
###############################################################################
source.. = src/
+output.. = bin/
bin.includes = .,\
about.html,\
META-INF/
diff --git a/runtime/tests/org.eclipse.core.tests.runtime/build.properties b/runtime/tests/org.eclipse.core.tests.runtime/build.properties
index dd447c29e59..d2154dcb351 100644
--- a/runtime/tests/org.eclipse.core.tests.runtime/build.properties
+++ b/runtime/tests/org.eclipse.core.tests.runtime/build.properties
@@ -14,6 +14,7 @@
# Lars Vogel - Bug 474642
###############################################################################
source.. = src/
+output.. = bin/
bin.includes = plugin.xml,\
.,\
Plugin_Testing/,\
diff --git a/team/bundles/org.eclipse.core.net.linux/build.properties b/team/bundles/org.eclipse.core.net.linux/build.properties
index aeb64d809d8..6614e3beff5 100644
--- a/team/bundles/org.eclipse.core.net.linux/build.properties
+++ b/team/bundles/org.eclipse.core.net.linux/build.properties
@@ -17,3 +17,4 @@ bin.includes = fragment.properties,\
about.html
src.includes = about.html
source.. = src/
+output.. = bin/
diff --git a/team/bundles/org.eclipse.core.net.win32/build.properties b/team/bundles/org.eclipse.core.net.win32/build.properties
index b05379ff613..5651f24eab5 100644
--- a/team/bundles/org.eclipse.core.net.win32/build.properties
+++ b/team/bundles/org.eclipse.core.net.win32/build.properties
@@ -17,3 +17,4 @@ bin.includes = fragment.properties,\
META-INF/
src.includes = about.html
source.. = src/
+output.. = bin/
diff --git a/team/bundles/org.eclipse.team.core/build.properties b/team/bundles/org.eclipse.team.core/build.properties
index 23678d6d519..2a12130ead6 100644
--- a/team/bundles/org.eclipse.team.core/build.properties
+++ b/team/bundles/org.eclipse.team.core/build.properties
@@ -18,5 +18,6 @@ bin.includes = about.html,\
.,\
.options,\
META-INF/
-source..=src/
-src.includes=about.html,schema/
+source.. = src/
+output.. = bin/
+src.includes = about.html,schema/
diff --git a/team/bundles/org.eclipse.team.ui/build.properties b/team/bundles/org.eclipse.team.ui/build.properties
index 7e8745623e5..59caf6e68ab 100644
--- a/team/bundles/org.eclipse.team.ui/build.properties
+++ b/team/bundles/org.eclipse.team.ui/build.properties
@@ -19,5 +19,6 @@ bin.includes = about.html,\
.,\
META-INF/,\
.options
-source..=src/
-src.includes=about.html,schema/
+source.. = src/
+output.. = bin/
+src.includes = about.html,schema/
diff --git a/team/examples/org.eclipse.compare.examples.xml/.classpath b/team/examples/org.eclipse.compare.examples.xml/.classpath
index 95ec5ed5f53..509acd28af6 100644
--- a/team/examples/org.eclipse.compare.examples.xml/.classpath
+++ b/team/examples/org.eclipse.compare.examples.xml/.classpath
@@ -3,6 +3,10 @@
-
+
+
+
+
+
diff --git a/team/examples/org.eclipse.compare.examples.xml/.gitignore b/team/examples/org.eclipse.compare.examples.xml/.gitignore
new file mode 100644
index 00000000000..65a6a86cd52
--- /dev/null
+++ b/team/examples/org.eclipse.compare.examples.xml/.gitignore
@@ -0,0 +1 @@
+bin_tests/
\ No newline at end of file
diff --git a/team/examples/org.eclipse.compare.examples.xml/build.properties b/team/examples/org.eclipse.compare.examples.xml/build.properties
index 79ef02fe5b5..fe133ca8ac7 100644
--- a/team/examples/org.eclipse.compare.examples.xml/build.properties
+++ b/team/examples/org.eclipse.compare.examples.xml/build.properties
@@ -13,7 +13,7 @@
# Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
###############################################################################
source.. = src/
-
+output.. = bin/
bin.includes = doc-html/,\
about.html,\
plugin.properties,\
diff --git a/team/examples/org.eclipse.compare.examples/build.properties b/team/examples/org.eclipse.compare.examples/build.properties
index 5df2345b39b..b83b39a34b2 100644
--- a/team/examples/org.eclipse.compare.examples/build.properties
+++ b/team/examples/org.eclipse.compare.examples/build.properties
@@ -13,7 +13,7 @@
# Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
###############################################################################
source.. = src/
-
+output.. = bin/
bin.includes = doc-html/,\
about.html,\
plugin.properties,\
diff --git a/team/examples/org.eclipse.team.examples.filesystem/build.properties b/team/examples/org.eclipse.team.examples.filesystem/build.properties
index 4dc59621cd1..18cf8a6a3e6 100644
--- a/team/examples/org.eclipse.team.examples.filesystem/build.properties
+++ b/team/examples/org.eclipse.team.examples.filesystem/build.properties
@@ -13,8 +13,9 @@
# Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
###############################################################################
# Eclipse build contribution
-source..=src/
-src.includes=about.html
+source.. = src/
+output.. = bin/
+src.includes = about.html
bin.includes = about.html,\
icons/,\
doc-html/,\
diff --git a/team/tests/org.eclipse.compare.tests/build.properties b/team/tests/org.eclipse.compare.tests/build.properties
index 072b6f7651b..9d777e6e779 100644
--- a/team/tests/org.eclipse.compare.tests/build.properties
+++ b/team/tests/org.eclipse.compare.tests/build.properties
@@ -22,7 +22,8 @@ bin.includes = plugin.properties,\
src.includes = about.html
-source..= src/
+source.. = src/
+output.. = bin/
# Maven/Tycho pom model adjustments
pom.model.property.testClass = org.eclipse.compare.tests.AllCompareTests
diff --git a/team/tests/org.eclipse.team.tests.core/build.properties b/team/tests/org.eclipse.team.tests.core/build.properties
index 8523909812a..a4f032ff300 100644
--- a/team/tests/org.eclipse.team.tests.core/build.properties
+++ b/team/tests/org.eclipse.team.tests.core/build.properties
@@ -12,7 +12,8 @@
# IBM Corporation - initial API and implementation
# Mickael Istria (Red Hat Inc.) - 419531 Get rid of nested jars
###############################################################################
-source..=src/
+source.. = src/
+output.. = bin/
bin.includes = about.html,\
plugin.xml,\
.,\
diff --git a/ua/org.eclipse.help.base/build.properties b/ua/org.eclipse.help.base/build.properties
index 91260ec8e23..b1323e48594 100644
--- a/ua/org.eclipse.help.base/build.properties
+++ b/ua/org.eclipse.help.base/build.properties
@@ -11,10 +11,10 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-source..=src/,\
- src_demo/
-src.includes=schema/,about.html
+source.. = src/,\
+ src_demo/
output.. = bin/
+src.includes = schema/,about.html
bin.includes = doc/,\
plugin.xml,\
preferences.ini,\
diff --git a/ua/org.eclipse.help.ui/build.properties b/ua/org.eclipse.help.ui/build.properties
index 2eb338aab4e..f3a43bee59f 100644
--- a/ua/org.eclipse.help.ui/build.properties
+++ b/ua/org.eclipse.help.ui/build.properties
@@ -11,8 +11,9 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-source..=src/
-src.includes=schema/,about.html
+source.. = src/
+output.. = bin/
+src.includes = schema/,about.html
bin.includes = icons/,\
plugin.xml,\
.,\
diff --git a/ua/org.eclipse.help/build.properties b/ua/org.eclipse.help/build.properties
index 098b2d34611..e5d11a13566 100644
--- a/ua/org.eclipse.help/build.properties
+++ b/ua/org.eclipse.help/build.properties
@@ -11,8 +11,9 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-source..=src/
-src.includes=schema/,about.html
+source.. = src/
+output.. = bin/
+src.includes = schema/,about.html
bin.includes = livehelp.js,\
plugin.xml,\
preferences.ini,\
diff --git a/ua/org.eclipse.ui.cheatsheets/build.properties b/ua/org.eclipse.ui.cheatsheets/build.properties
index 681aa85a090..291d6700b50 100644
--- a/ua/org.eclipse.ui.cheatsheets/build.properties
+++ b/ua/org.eclipse.ui.cheatsheets/build.properties
@@ -18,5 +18,6 @@ bin.includes = plugin.properties,\
about.html,\
META-INF/
source.. = src/
+output.. = bin/
src.includes = schema/,\
about.html
diff --git a/ua/org.eclipse.ui.intro.quicklinks.examples/build.properties b/ua/org.eclipse.ui.intro.quicklinks.examples/build.properties
index 2b63999577f..4ca9b1b7a76 100644
--- a/ua/org.eclipse.ui.intro.quicklinks.examples/build.properties
+++ b/ua/org.eclipse.ui.intro.quicklinks.examples/build.properties
@@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/ua/org.eclipse.ui.intro.solstice.examples/build.properties b/ua/org.eclipse.ui.intro.solstice.examples/build.properties
index 3374fd6ddbe..4a299cb104b 100644
--- a/ua/org.eclipse.ui.intro.solstice.examples/build.properties
+++ b/ua/org.eclipse.ui.intro.solstice.examples/build.properties
@@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/ua/org.eclipse.ui.intro/build.properties b/ua/org.eclipse.ui.intro/build.properties
index 395d4441e83..349f4e42a8d 100644
--- a/ua/org.eclipse.ui.intro/build.properties
+++ b/ua/org.eclipse.ui.intro/build.properties
@@ -12,6 +12,7 @@
# IBM Corporation - initial API and implementation
###############################################################################
source.. = src/
+output.. = bin/
bin.includes = plugin.xml,\
.,\
icons/,\
diff --git a/update/org.eclipse.update.configurator/build.properties b/update/org.eclipse.update.configurator/build.properties
index 278633700a4..789dcce919b 100644
--- a/update/org.eclipse.update.configurator/build.properties
+++ b/update/org.eclipse.update.configurator/build.properties
@@ -19,6 +19,7 @@ bin.includes = .options,\
OSGI-INF/
src.includes = about.html
source.. = src/
+output.. = bin/
# Maven properties, see https://github.com/eclipse/tycho/wiki/Tycho-Pomless
tycho.pomless.parent = ../../