Bug 502937 - Need an update for Neon.1

Change-Id: I2f75a54ac98e5f019b3c5f7c3e6d3a3b71d674f8
Signed-off-by: David Williams <david_williams@acm.org>
diff --git a/XWT.b3aggrcon b/XWT.b3aggrcon
index 7a0c1fc..70e03ea 100644
--- a/XWT.b3aggrcon
+++ b/XWT.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="XWT - Declarative UI in XML for Eclipse" label="XWT">
-  <repositories location="http://download.eclipse.org/xwt/release-1.2.0">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="XWT - Declarative UI in XML for Eclipse" label="XWT">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features description="XWT Runtime" name="org.eclipse.xwt.feature.feature.group" versionRange="1.0.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='Programming%20Languages']"/>
diff --git a/actf.b3aggrcon b/actf.b3aggrcon
index 05e7015..1d91373 100644
--- a/actf.b3aggrcon
+++ b/actf.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="ACTF">
-  <repositories location="http://download.eclipse.org/technology/actf/1.4/update-site/" description="ACTF 1.4">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="ACTF">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="ACTF 1.4">
     <features name="org.eclipse.actf.visualization.sdk.feature.group" versionRange="[1.4.0.R201606071115]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/amalgam.b3aggrcon b/amalgam.b3aggrcon
index 6dddd0a..4f174b5 100644
--- a/amalgam.b3aggrcon
+++ b/amalgam.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Amalgam">
-  <repositories location="http://download.eclipse.org/modeling/amalgam/updates/milestones/1.7RC3" description="Amalgam Stable Milestones">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Amalgam">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Amalgam Stable Milestones">
     <features name="org.eclipse.amalgam.discovery.feature.group" versionRange="[1.4.0,2.0.0]"/>
     <features name="org.eclipse.amalgam.explorer.activity.source.feature.group" versionRange="[1.4.0,2.0.0]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
diff --git a/andmore.b3aggrcon b/andmore.b3aggrcon
index 94c5ff7..50b81dd 100644
--- a/andmore.b3aggrcon
+++ b/andmore.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Andmore">
-  <repositories location="http://download.eclipse.org/andmore/0.5/" description="Andmore">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Andmore">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Andmore">
     <features name="org.eclipse.andmore.android.basic.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Mobile%20and%20Device%20Development']"/>
     </features>
diff --git a/birt.b3aggrcon b/birt.b3aggrcon
index df4a0bb..0808d6e 100644
--- a/birt.b3aggrcon
+++ b/birt.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="BIRT">
-  <repositories location="http://download.eclipse.org/birt/update-site/4.6/" description="BIRT interim">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="BIRT">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="BIRT interim">
     <features name="org.eclipse.birt.feature.group" versionRange="4.6.0.v201606072122">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Business%20Intelligence%2C%20Reporting%20and%20Charting']"/>
     </features>
diff --git a/buildship.b3aggrcon b/buildship.b3aggrcon
index 5c3fd32..3b04a43 100644
--- a/buildship.b3aggrcon
+++ b/buildship.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Buildship: Eclipse Plug-ins for Gradle" label="Buildship">
-  <repositories location="http://download.eclipse.org/buildship/updates/e46/releases/1.0/1.0.18.v20160817-1550">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="Buildship: Eclipse Plug-ins for Gradle" label="Buildship">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.buildship.feature.group" versionRange="1.0.18">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/cdt.b3aggrcon b/cdt.b3aggrcon
index 9343748..bc5b92c 100644
--- a/cdt.b3aggrcon
+++ b/cdt.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="CDT">
-  <repositories location="http://download.eclipse.org/tools/cdt/builds/neon/milestones/ur1-rc4" description="CDT updates">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="CDT">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="CDT updates">
     <bundles name="org.eclipse.cdt.core.aix"/>
     <bundles name="org.eclipse.cdt.core.linux"/>
     <bundles name="org.eclipse.cdt.core.linux.ppc64"/>
@@ -62,7 +62,7 @@
     </features>
     <features name="org.eclipse.cdt.debug.standalone.feature.group"/>
   </repositories>
-  <repositories location="http://download.eclipse.org/tools/cdt/launchbar/neon.1" description="LaunchBar Updates">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="LaunchBar Updates">
     <features name="org.eclipse.launchbar.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/cft.b3aggrcon b/cft.b3aggrcon
index 07315ae..9876b75 100644
--- a/cft.b3aggrcon
+++ b/cft.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Eclipse Tools for Cloud Foundry" label="CFT">
-  <repositories location="http://download.eclipse.org/cft/1.0.1.RC2/">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="Eclipse Tools for Cloud Foundry" label="CFT">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.cft.server.core.feature.feature.group" versionRange="[1.1.0.v201608300659]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Cloud%20Tools']"/>
     </features>
diff --git a/dltk.b3aggrcon b/dltk.b3aggrcon
index 379dfd6..4f9645a 100644
--- a/dltk.b3aggrcon
+++ b/dltk.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="DLTK">
-  <repositories location="http://download.eclipse.org/technology/dltk/updates-dev/milestone/5.6rc2/" description="DLTK 5.6">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="DLTK">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="DLTK 5.6">
     <features name="org.eclipse.dltk.core.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/dtp.b3aggrcon b/dtp.b3aggrcon
index a32417a..c2110dc 100644
--- a/dtp.b3aggrcon
+++ b/dtp.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="DataTools">
-  <repositories location="http://download.eclipse.org/datatools/updates/1.13/1.13.0.201603142002/repository">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="DataTools">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.datatools.sdk.feature.feature.group" versionRange="[1.13.0.201603142002]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Database%20Development']"/>
     </features>
diff --git a/ecf.b3aggrcon b/ecf.b3aggrcon
index a52cd89..a1ba0ce 100644
--- a/ecf.b3aggrcon
+++ b/ecf.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="ECF">
-  <repositories location="http://download.eclipse.org/rt/ecf/3.13.2/site.p2" description="ECF updates">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="ECF">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="ECF updates">
     <features name="org.eclipse.ecf.core.feature.group" versionRange="3.13.2.v20160823-2221">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Collaboration']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/>
diff --git a/ecp.b3aggrcon b/ecp.b3aggrcon
index fc1053c..d1d4501 100644
--- a/ecp.b3aggrcon
+++ b/ecp.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="ECP">
-  <repositories location="http://download.eclipse.org/ecp/rt/1100" description="ECP 1.10.0">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="ECP">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="ECP 1.10.0">
     <features name="org.eclipse.emf.ecp.sdk.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/efxclipse.b3aggrcon b/efxclipse.b3aggrcon
index d013fa2..c633a98 100644
--- a/efxclipse.b3aggrcon
+++ b/efxclipse.b3aggrcon
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="e(fx)clipse - JavaFX Tooling and Runtime" label="e(fx)clipse">
-  <repositories location="http://download.eclipse.org/efxclipse/runtime-shared-released/2.4.0/site">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="e(fx)clipse - JavaFX Tooling and Runtime" label="e(fx)clipse">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.fx.runtime.min.feature.feature.group"/>
   </repositories>
-  <repositories location="http://download.eclipse.org/efxclipse/updates-released/2.4.0/site">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.fx.ide.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/egerrit.b3aggrcon b/egerrit.b3aggrcon
index 5bc0a21..8d9b0f3 100644
--- a/egerrit.b3aggrcon
+++ b/egerrit.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="EGerrit" label="EGerrit">
-  <repositories location="http://download.eclipse.org/egerrit/updates/release/657">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="EGerrit" label="EGerrit">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.egerrit.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Collaboration']"/>
     </features>
diff --git a/egit.b3aggrcon b/egit.b3aggrcon
index abdafd3..2a5c160 100644
--- a/egit.b3aggrcon
+++ b/egit.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EGit">
-  <repositories location="http://download.eclipse.org/egit/updates-4.4.1" description="EGit Updates">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="EGit">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="EGit Updates">
     <bundles name="org.eclipse.egit.ui.smartimport" versionRange="[4.4.1.201607150455-r]"/>
     <features name="org.eclipse.jgit.feature.group" versionRange="[4.4.1.201607150455-r]"/>
     <features name="org.eclipse.jgit.pgm.feature.group" versionRange="[4.4.1.201607150455-r]"/>
@@ -18,7 +18,7 @@
       <categories href="simrel.b3aggr#//@customCategories[identifier='Collaboration']"/>
     </features>
   </repositories>
-  <repositories location="http://download.eclipse.org/egit/github/updates-4.4" description="EGit GitHub Updates">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="EGit GitHub Updates">
     <features name="org.eclipse.mylyn.github.feature.feature.group" versionRange="[4.4.0.201606070830-r]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Collaboration']"/>
     </features>
diff --git a/emf-cdo.b3aggrcon b/emf-cdo.b3aggrcon
index ea78342..e60aadb 100644
--- a/emf-cdo.b3aggrcon
+++ b/emf-cdo.b3aggrcon
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF CDO">
-  <repositories location="http://download.eclipse.org/modeling/emf/cdo/drops/R20160607-1209" description="EMF CDO">
+<?xml version="1.0" encoding="ASCII"?>
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="EMF CDO">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="EMF CDO">
     <features name="org.eclipse.net4j.sdk.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emf-compare.b3aggrcon b/emf-compare.b3aggrcon
index 96630de..3cc49c6 100644
--- a/emf-compare.b3aggrcon
+++ b/emf-compare.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF COMPARE">
-  <repositories location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201608311750">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="EMF COMPARE">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.emf.compare.feature.group" versionRange="[3.2.0,3.3.0)"/>
     <features name="org.eclipse.emf.compare.source.feature.group" versionRange="[3.2.0,3.3.0)"/>
     <features name="org.eclipse.emf.compare.ide.ui.feature.group" versionRange="[3.2.0,3.3.0)">
diff --git a/emf-diffmerge.b3aggrcon b/emf-diffmerge.b3aggrcon
index 1163ed8..e1c6a64 100644
--- a/emf-diffmerge.b3aggrcon
+++ b/emf-diffmerge.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF Diff/Merge">
-  <repositories location="http://download.eclipse.org/diffmerge/updates/neon/official" description="EMF Diff/Merge Releases">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="EMF Diff/Merge">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="EMF Diff/Merge Releases">
     <features name="org.eclipse.emf.diffmerge.sdk.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emf-emf-rap.b3aggrcon b/emf-emf-rap.b3aggrcon
index e2c7dd2..fb6d9bc 100644
--- a/emf-emf-rap.b3aggrcon
+++ b/emf-emf-rap.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF RAP(Runtime)">
-  <repositories location="http://download.eclipse.org/modeling/emf/emf/updates/2.12/" description="EMF 2.12">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="EMF RAP(Runtime)">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="EMF 2.12">
     <features name="org.eclipse.emf.rap.sdk.feature.group" versionRange="[2.12.0.v20160526-0356]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/>
     </features>
diff --git a/emf-emf.b3aggrcon b/emf-emf.b3aggrcon
index 6b9e383..371b303 100644
--- a/emf-emf.b3aggrcon
+++ b/emf-emf.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF (Core)">
-  <repositories location="http://download.eclipse.org/modeling/emf/emf/updates/2.12/" description="EMF 2.12">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="EMF (Core)">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="EMF 2.12">
     <features name="org.eclipse.emf.sdk.feature.group" versionRange="[2.12.0.v20160526-0356]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/>
diff --git a/emf-parsley.b3aggrcon b/emf-parsley.b3aggrcon
index 0677f9e..ab407c7 100644
--- a/emf-parsley.b3aggrcon
+++ b/emf-parsley.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF Parsley">
-  <repositories location="http://download.eclipse.org/emf-parsley/updates/1.0/" description="EMF Parsley">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="EMF Parsley">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="EMF Parsley">
     <features name="org.eclipse.emf.parsley.sdk.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emf-query.b3aggrcon b/emf-query.b3aggrcon
index f1d5ef1..44792e2 100644
--- a/emf-query.b3aggrcon
+++ b/emf-query.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF Query">
-  <repositories location="http://download.eclipse.org/modeling/emf/query/updates/releases" description="EMF Query milestones">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="EMF Query">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="EMF Query milestones">
     <features name="org.eclipse.emf.query.sdk.feature.group" versionRange="[1.10.0.201606071631]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emf-transaction.b3aggrcon b/emf-transaction.b3aggrcon
index 6dc1c4b..c840cf6 100644
--- a/emf-transaction.b3aggrcon
+++ b/emf-transaction.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF Transaction">
-  <repositories location="http://download.eclipse.org/modeling/emf/transaction/updates/releases" description="EMF Transaction milestones">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="EMF Transaction">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="EMF Transaction milestones">
     <features name="org.eclipse.emf.transaction.sdk.feature.group" versionRange="[1.10.0.201606071900]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emf-validation.b3aggrcon b/emf-validation.b3aggrcon
index 0d8e3f5..cc37900 100644
--- a/emf-validation.b3aggrcon
+++ b/emf-validation.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF Validation">
-  <repositories location="http://download.eclipse.org/modeling/emf/validation/updates/releases" description="EMF Validation milestones">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="EMF Validation">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="EMF Validation milestones">
     <features name="org.eclipse.emf.validation.sdk.feature.group" versionRange="[1.10.0.201606071713]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emfstore.b3aggrcon b/emfstore.b3aggrcon
index 7ccafb6..564df0c 100644
--- a/emfstore.b3aggrcon
+++ b/emfstore.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMFStore">
-  <repositories location="http://download.eclipse.org/emfstore/rt/180" description="EMFStore 1.8.0">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="EMFStore">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="EMFStore 1.8.0">
     <features name="org.eclipse.emf.emfstore.sdk.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emft-ecoretools.b3aggrcon b/emft-ecoretools.b3aggrcon
index f7446ea..32571a4 100644
--- a/emft-ecoretools.b3aggrcon
+++ b/emft-ecoretools.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMFT Ecore Tools">
-  <repositories location="http://download.eclipse.org/ecoretools/updates/milestones/3.1.0RC3/neon" description="EMFT Ecore Tools Releases">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="EMFT Ecore Tools">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="EMFT Ecore Tools Releases">
     <features name="org.eclipse.emf.ecoretools.sdk.feature.group" versionRange="[3.0.0,4.0.0]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emft-eef.b3aggrcon b/emft-eef.b3aggrcon
index fdea2e5..278881c 100644
--- a/emft-eef.b3aggrcon
+++ b/emft-eef.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Extended Editing Framework (EEF)">
-  <repositories location="http://download.eclipse.org/modeling/emft/eef/updates/releases/1.5/R201601141612/">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Extended Editing Framework (EEF)">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.emf.eef.sdk-feature.feature.group" versionRange="[1.5.0,1.6.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
@@ -8,7 +8,7 @@
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
   </repositories>
-  <repositories location="http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.6/S20160906114506">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.eef.sdk.feature.feature.group"/>
     <features name="org.eclipse.eef.sdk.feature.source.feature.group"/>
   </repositories>
diff --git a/emft-egf.b3aggrcon b/emft-egf.b3aggrcon
index 2427b9a..a489f99 100644
--- a/emft-egf.b3aggrcon
+++ b/emft-egf.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF EGF">
-  <repositories location="http://download.eclipse.org/egf/updates/neon/official" description="EMF EGF Releases">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="EMF EGF">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="EMF EGF Releases">
     <features name="org.eclipse.egf.sdk.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emft-emffacet.b3aggrcon b/emft-emffacet.b3aggrcon
index 5cb6f8f..55c8ad2 100644
--- a/emft-emffacet.b3aggrcon
+++ b/emft-emffacet.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF Facet">
-  <repositories location="http://download.eclipse.org/facet/updates/release/1.1.0/" description="EMF Facet">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="EMF Facet">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="EMF Facet">
     <features name="org.eclipse.emf.facet.sdk.feature.feature.group" versionRange="1.1.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emft-mwe.b3aggrcon b/emft-mwe.b3aggrcon
index 65d4f60..2c67c1b 100644
--- a/emft-mwe.b3aggrcon
+++ b/emft-mwe.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMFT MWE">
-  <repositories location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.0/" description="MWE2 Lang p2 repository">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="EMFT MWE">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="MWE2 Lang p2 repository">
     <features name="org.eclipse.emf.mwe2.runtime.sdk.feature.group" versionRange="2.9.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/ep.b3aggrcon b/ep.b3aggrcon
index 1dc4f4a..0100156 100644
--- a/ep.b3aggrcon
+++ b/ep.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Eclipse">
-  <repositories location="http://download.eclipse.org/eclipse/updates/4.6-M-builds/M-4.6.1RC4-201609071200/" description="Eclipse and Equinox">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Eclipse">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Eclipse and Equinox">
     <products name="org.eclipse.sdk.ide"/>
     <products name="org.eclipse.platform.ide"/>
     <products name="org.eclipse.platform.sdk"/>
diff --git a/epp-logging.b3aggrcon b/epp-logging.b3aggrcon
index 19e2721..57111e6 100644
--- a/epp-logging.b3aggrcon
+++ b/epp-logging.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="EPP Logging - Automated Error Reporting Feature" label="EPP Logging">
-  <repositories location="http://download.eclipse.org/technology/epp/logging/milestones/">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="EPP Logging - Automated Error Reporting Feature" label="EPP Logging">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.epp.logging.aeri.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/epp-mpc.b3aggrcon b/epp-mpc.b3aggrcon
index 0189628..1150823 100644
--- a/epp-mpc.b3aggrcon
+++ b/epp-mpc.b3aggrcon
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EPP Marketplace Client">
-  <repositories location="http://download.eclipse.org/mpc/releases/1.5.1" description="EPP Marketplace Client">
-    <features name="org.eclipse.epp.mpc.feature.group" versionRange="[1.5.1,1.5.2)">
+  <repositories location="http://download.eclipse.org/mpc/releases/1.5.2" description="EPP Marketplace Client">
+    <features name="org.eclipse.epp.mpc.feature.group" versionRange="[1.5.2,1.5.3)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
-    <features name="org.eclipse.epp.mpc.source.feature.group" versionRange="[1.5.1,1.5.2)"/>
+    <features name="org.eclipse.epp.mpc.source.feature.group" versionRange="[1.5.2,1.5.3)"/>
   </repositories>
   <contacts href="simrel.b3aggr#//@contacts[email='wayne@eclipse.org']"/>
   <contacts href="simrel.b3aggr#//@contacts[email='steffen.pingel@tasktop.com']"/>
diff --git a/equinox.b3aggrcon b/equinox.b3aggrcon
index 043b238..f6afe2e 100644
--- a/equinox.b3aggrcon
+++ b/equinox.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Equinox">
-  <repositories location="http://download.eclipse.org/eclipse/updates/4.6-M-builds/M-4.6.1RC4-201609071200/" description="Eclipse Projec and Equinox">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Equinox">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Eclipse Projec and Equinox">
     <products name="org.eclipse.rcp.sdk.id"/>
     <features name="org.eclipse.equinox.sdk.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/>
diff --git a/gef.b3aggrcon b/gef.b3aggrcon
index 810e58d..e4145e9 100644
--- a/gef.b3aggrcon
+++ b/gef.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="GEF">
-  <repositories location="http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952" description="GEF 3.x milestones">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="GEF">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="GEF 3.x milestones">
     <features name="org.eclipse.gef.sdk.feature.group" versionRange="[3.11.0.201606061308]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
@@ -8,7 +8,7 @@
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
   </repositories>
-  <repositories location="http://download.eclipse.org/tools/gef/gef4/updates/milestones/4.1.0RC3_gef4-maintenance_182" description="GEF4 milestones">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="GEF4 milestones">
     <features name="org.eclipse.gef4.common.sdk.feature.group" versionRange="[1.1.0.201609060946]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Application%20Development%20Frameworks']"/>
     </features>
diff --git a/gmf-tooling.b3aggrcon b/gmf-tooling.b3aggrcon
index b4404bd..60dc1eb 100644
--- a/gmf-tooling.b3aggrcon
+++ b/gmf-tooling.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="GMF Tooling">
-  <repositories location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" description="GMF Tooling repository">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="GMF Tooling">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="GMF Tooling repository">
     <features name="org.eclipse.gmf.tooling.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/gmp-gmf-notation.b3aggrcon b/gmp-gmf-notation.b3aggrcon
index 1da575e..4448a1c 100644
--- a/gmp-gmf-notation.b3aggrcon
+++ b/gmp-gmf-notation.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="GMF Notation">
-  <repositories location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases" description="GMF Notation milestones">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="GMF Notation">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="GMF Notation milestones">
     <features name="org.eclipse.gmf.runtime.notation.sdk.feature.group" versionRange="[1.10.0.201606071631]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/gmp-gmf-runtime.b3aggrcon b/gmp-gmf-runtime.b3aggrcon
index 0667813..f1451c7 100644
--- a/gmp-gmf-runtime.b3aggrcon
+++ b/gmp-gmf-runtime.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="GMF Runtime">
-  <repositories location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases" description="GMF Runtime milestones">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="GMF Runtime">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="GMF Runtime milestones">
     <features name="org.eclipse.gmf.feature.group" versionRange="[1.10.0.201606071959]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/gmp-graphiti.b3aggrcon b/gmp-graphiti.b3aggrcon
index 23529a9..4cb74a4 100644
--- a/gmp-graphiti.b3aggrcon
+++ b/gmp-graphiti.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="The Eclipse Modeling Graphiti project" label="Graphiti">
-  <repositories location="http://download.eclipse.org/graphiti/updates/maintenance/S-0.13.1Neon.1RC2-201608301309/" description="Graphiti Maintenance Update Site">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="The Eclipse Modeling Graphiti project" label="Graphiti">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Graphiti Maintenance Update Site">
     <features description="The feature containing the Graphiti framework" name="org.eclipse.graphiti.feature.feature.group" versionRange="[0.13.1,0.14.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/jubula.b3aggrcon b/jubula.b3aggrcon
index 0b3d788..ad01c2d 100644
--- a/jubula.b3aggrcon
+++ b/jubula.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Jubula">
-  <repositories location="http://download.eclipse.org/jubula/release/neon">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Jubula">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.jubula.feature.feature.group" versionRange="4.0.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Testing']"/>
     </features>
diff --git a/jwt.b3aggrcon b/jwt.b3aggrcon
index 5d5a90a..da398c7 100644
--- a/jwt.b3aggrcon
+++ b/jwt.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Java Workflow Tooling">
-  <repositories location="http://download.eclipse.org/jwt/update-site-neon/" description="JWT releases">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Java Workflow Tooling">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="JWT releases">
     <features name="org.eclipse.jwt.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='SOA%20Development']"/>
     </features>
diff --git a/ldt.b3aggrcon b/ldt.b3aggrcon
index e84974b..eef14c6 100644
--- a/ldt.b3aggrcon
+++ b/ldt.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="LDT">
-  <repositories location="http://download.eclipse.org/ldt/releases/milestones/1.4.1RC2" description="LDT updates">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="LDT">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="LDT updates">
     <features name="org.eclipse.ldt.feature.group" versionRange="1.4.1">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Programming%20Languages']"/>
     </features>
diff --git a/linuxtools.b3aggrcon b/linuxtools.b3aggrcon
index 56668f1..9c377ba 100644
--- a/linuxtools.b3aggrcon
+++ b/linuxtools.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Linux Tools">
-  <repositories location="http://download.eclipse.org/linuxtools/update-neon-1-rc4a" description="Linux Tools Updates">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Linux Tools">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Linux Tools Updates">
     <features name="org.eclipse.linuxtools.cdt.libhover.devhelp.feature.feature.group" versionRange="5.1.0.201609141916">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Linux%20Tools']"/>
     </features>
@@ -58,7 +58,7 @@
     <features name="org.eclipse.linuxtools.dataviewers.feature.source.feature.group" versionRange="5.1.0.201609141916"/>
     <features name="org.eclipse.linuxtools.man.source.feature.group" versionRange="5.1.0.201609141916"/>
   </repositories>
-  <repositories location="http://download.eclipse.org/linuxtools/update-neon-1-docker-rc4a" description="Linux Tools Docker Support Updates">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Linux Tools Docker Support Updates">
     <features name="org.eclipse.linuxtools.docker.feature.feature.group" versionRange="2.1.0.201609141916">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/m2e-wtp.b3aggrcon b/m2e-wtp.b3aggrcon
index 2c6266e..9aef8c9 100644
--- a/m2e-wtp.b3aggrcon
+++ b/m2e-wtp.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="m2e-wtp" label="m2e-wtp">
-  <repositories location="http://download.eclipse.org/m2e-wtp/milestones/neon/1.3/1.3.1.20160831-1005/" description="m2e-wtp Neon M build repo">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="m2e-wtp" label="m2e-wtp">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="m2e-wtp Neon M build repo">
     <features name="org.eclipse.m2e.wtp.feature.feature.group" versionRange="1.3.1">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
     </features>
diff --git a/m2e.b3aggrcon b/m2e.b3aggrcon
index 4e8f26a..c237910 100644
--- a/m2e.b3aggrcon
+++ b/m2e.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="m2e" label="m2e">
-  <repositories location="http://download.eclipse.org/technology/m2e/releases/1.7/1.7.0.20160603-1933" description="m2e 1.7.x milestones repository">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="m2e" label="m2e">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="m2e 1.7.x milestones repository">
     <features name="org.eclipse.m2e.feature.feature.group" versionRange="1.7.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/m2m-atl.b3aggrcon b/m2m-atl.b3aggrcon
index 9e3a41e..e401b48 100644
--- a/m2m-atl.b3aggrcon
+++ b/m2m-atl.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="M2M ATL">
-  <repositories location="http://download.eclipse.org/mmt/atl/updates/milestones/3.6/" description="M2M ATL milestones">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="M2M ATL">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="M2M ATL milestones">
     <features name="org.eclipse.m2m.atl.sdk.feature.group" versionRange="3.6.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/m2t-acceleo.b3aggrcon b/m2t-acceleo.b3aggrcon
index edb4f5b..4a62cc9 100644
--- a/m2t-acceleo.b3aggrcon
+++ b/m2t-acceleo.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="M2T ACCELEO">
-  <repositories location="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201608301456" description="M2T ACCELEO">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="M2T ACCELEO">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="M2T ACCELEO">
     <features name="org.eclipse.acceleo.feature.group" versionRange="[3.6.0,3.7.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/m2t-xpand.b3aggrcon b/m2t-xpand.b3aggrcon
index 0cc033e..e3af14b 100644
--- a/m2t-xpand.b3aggrcon
+++ b/m2t-xpand.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="M2T Xpand">
-  <repositories location="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/" description="M2T XPAND p2 repository">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="M2T Xpand">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="M2T XPAND p2 repository">
     <features name="org.eclipse.xpand.sdk.feature.group" versionRange="2.2.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/mat.b3aggrcon b/mat.b3aggrcon
index d9aee9c..fff7964 100644
--- a/mat.b3aggrcon
+++ b/mat.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Memory Analyzer (MAT)">
-  <repositories location="http://download.eclipse.org/mat/neon/RC3/update-site/" description="Memory Analyzer Updates">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Memory Analyzer (MAT)">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Memory Analyzer Updates">
     <features name="org.eclipse.mat.feature.feature.group" versionRange="1.6.0.201605311117">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Performance%2C%20Profiling%20and%20Tracing%20Tools']"/>
     </features>
diff --git a/mdt-bpmn2.b3aggrcon b/mdt-bpmn2.b3aggrcon
index 3044f96..6b5b68b 100644
--- a/mdt-bpmn2.b3aggrcon
+++ b/mdt-bpmn2.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="MDT BPMN2">
-  <repositories location="http://download.eclipse.org/modeling/mdt/bpmn2/updates/neon/1.3.0">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="MDT BPMN2">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.bpmn2.feature.feature.group" versionRange="1.3.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='SOA%20Development']"/>
     </features>
diff --git a/mdt-modisco.b3aggrcon b/mdt-modisco.b3aggrcon
index 3557fbb..7f8f731 100644
--- a/mdt-modisco.b3aggrcon
+++ b/mdt-modisco.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="MoDisco">
-  <repositories location="http://download.eclipse.org/modeling/mdt/modisco/updates/release/1.0.0/" description="MoDisco Milestones">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="MoDisco">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="MoDisco Milestones">
     <features name="org.eclipse.modisco.sdk.feature.feature.group" versionRange="1.0.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/mdt-ocl.b3aggrcon b/mdt-ocl.b3aggrcon
index 1b81774..496db18 100644
--- a/mdt-ocl.b3aggrcon
+++ b/mdt-ocl.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="MDT OCL 6.0">
-  <repositories location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.1/S201608201313" description="Eclipse OCL 6.1.1">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="MDT OCL 6.0">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Eclipse OCL 6.1.1">
     <features name="org.eclipse.ocl.all.sdk.feature.group" versionRange="[5.2.0,5.3.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
diff --git a/mdt-papyrus.b3aggrcon b/mdt-papyrus.b3aggrcon
index 657a774..00831e8 100644
--- a/mdt-papyrus.b3aggrcon
+++ b/mdt-papyrus.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Contribution of the Modeling Papyrus project" label="Papyrus">
-  <repositories location="http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/2.0/RC4/main" description="Papyrus">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="Contribution of the Modeling Papyrus project" label="Papyrus">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Papyrus">
     <features description="Papyrus SDK Feature" name="org.eclipse.papyrus.sdk.feature.feature.group" versionRange="2.0.1">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/mdt-uml2.b3aggrcon b/mdt-uml2.b3aggrcon
index 4d9d0de..0bfa61e 100644
--- a/mdt-uml2.b3aggrcon
+++ b/mdt-uml2.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="MDT UML2">
-  <repositories location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.2.x" description="UML2 5.2.x Maintenance Builds">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="MDT UML2">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="UML2 5.2.x Maintenance Builds">
     <features name="org.eclipse.uml2.sdk.feature.group" versionRange="[5.2.1.v20160822-0739]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/mmt-qvto.b3aggrcon b/mmt-qvto.b3aggrcon
index 80306c3..6d8e4c6 100644
--- a/mmt-qvto.b3aggrcon
+++ b/mmt-qvto.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="QVT Operational">
-  <repositories location="http://download.eclipse.org/mmt/qvto/updates/releases/3.6.0" description="QVT Operational 3.6.0 release">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="QVT Operational">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="QVT Operational 3.6.0 release">
     <features name="org.eclipse.m2m.qvt.oml.sdk.feature.group" versionRange="[3.6.0,3.7.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/mylyn.b3aggrcon b/mylyn.b3aggrcon
index 46b1712..5bf84d8 100644
--- a/mylyn.b3aggrcon
+++ b/mylyn.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Mylyn">
-  <repositories location="http://download.eclipse.org/mylyn/drops/3.20.0/v20160608-1917" description="Mylyn Updates">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Mylyn">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Mylyn Updates">
     <features name="org.eclipse.mylyn_feature.feature.group" versionRange="3.20.0.v20160608-1838">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Collaboration']"/>
     </features>
diff --git a/objectteams.b3aggrcon b/objectteams.b3aggrcon
index d4fa84f..884e93f 100644
--- a/objectteams.b3aggrcon
+++ b/objectteams.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Object Teams">
-  <repositories location="http://download.eclipse.org/objectteams/updates/ot2.5/201609131451">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Object Teams">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features description="Object Teams Development Tooling" name="org.eclipse.objectteams.otdt.feature.group" versionRange="2.5.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Programming%20Languages']"/>
     </features>
diff --git a/oomph.b3aggrcon b/oomph.b3aggrcon
index f54f9d5..86f47fa 100644
--- a/oomph.b3aggrcon
+++ b/oomph.b3aggrcon
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Oomph">
-  <repositories location="http://download.eclipse.org/oomph/drops//release/1.5.0" description="Oomph">
+<?xml version="1.0" encoding="ASCII"?>
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Oomph">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Oomph">
     <features name="org.eclipse.oomph.setup.sdk.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/pdt.b3aggrcon b/pdt.b3aggrcon
index 280074c..d0abf3c 100644
--- a/pdt.b3aggrcon
+++ b/pdt.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="PDT">
-  <repositories location="http://download.eclipse.org/tools/pdt/updates/4.1-rc4" description="PDT 4.1">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="PDT">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="PDT 4.1">
     <features name="org.eclipse.php.feature.group" versionRange="4.1.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='Programming%20Languages']"/>
diff --git a/ptp.b3aggrcon b/ptp.b3aggrcon
index ca40426..fb93267 100644
--- a/ptp.b3aggrcon
+++ b/ptp.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="PTP">
-  <repositories location="http://download.eclipse.org/tools/ptp/builds/neon/milestones/UR1-RC3" description="PTP updates">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="PTP">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="PTP updates">
     <features name="org.eclipse.ptp.feature.group" versionRange="9.0.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
@@ -35,7 +35,7 @@
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
   </repositories>
-  <repositories location="http://download.eclipse.org/tools/ptp/builds/remote/neon/milestones/UR1-RC3" description="Remote Services">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Remote Services">
     <features name="org.eclipse.remote.feature.group" versionRange="2.0.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/qvtd.b3aggrcon b/qvtd.b3aggrcon
index dc9064e..fefa7c4 100644
--- a/qvtd.b3aggrcon
+++ b/qvtd.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="QVT Declarative">
-  <repositories location="http://download.eclipse.org/mmt/qvtd/updates/releases/0.13.0" description="QVT Declarative 0.13.0 milestones (incubation)">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="QVT Declarative">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="QVT Declarative 0.13.0 milestones (incubation)">
     <features name="org.eclipse.qvtd.master.feature.group" versionRange="[0.13.0,1.0.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/rap-tools.b3aggrcon b/rap-tools.b3aggrcon
index 7281bce..fa34fcf 100644
--- a/rap-tools.b3aggrcon
+++ b/rap-tools.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="RAP Tools">
-  <repositories location="http://download.eclipse.org/rt/rap/tools/3.1/SR1-RC4-20160913-0451/" description="RAP 3.1 Tools Repository">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="RAP Tools">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="RAP 3.1 Tools Repository">
     <features name="org.eclipse.rap.tools.feature.feature.group" versionRange="[3.1.1,3.2.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
     </features>
diff --git a/rap.b3aggrcon b/rap.b3aggrcon
index fd96e8a..12c8028 100644
--- a/rap.b3aggrcon
+++ b/rap.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="RAP Runtime">
-  <repositories location="http://download.eclipse.org/rt/rap/3.1/SR1-RC4-20160913-0447/" description="RAP 3.1 Runtime Repository">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="RAP Runtime">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="RAP 3.1 Runtime Repository">
     <features name="org.eclipse.rap.feature.feature.group" versionRange="[3.1.1,3.2.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/>
     </features>
diff --git a/rcptt.b3aggrcon b/rcptt.b3aggrcon
index 1e84e90..b271284 100644
--- a/rcptt.b3aggrcon
+++ b/rcptt.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="RCPTT">
-  <repositories location="http://download.eclipse.org/rcptt/milestone/2.1.0/RC3a/repository/">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="RCPTT">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.rcptt.platform.feature.group" versionRange="2.1.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Testing']"/>
     </features>
diff --git a/recommenders.b3aggrcon b/recommenders.b3aggrcon
index 0ac2ede..fd7f025 100644
--- a/recommenders.b3aggrcon
+++ b/recommenders.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Code Recommenders">
-  <repositories location="http://download.eclipse.org/recommenders/updates/simrel/neon/2016-09-13_14-34-48">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Code Recommenders">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.recommenders.rcp.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Programming%20Languages']"/>
     </features>
diff --git a/riena.b3aggrcon b/riena.b3aggrcon
index 8141ab1..93d7d24 100644
--- a/riena.b3aggrcon
+++ b/riena.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Riena">
-  <repositories location="http://download.eclipse.org/rt/riena/6.1.0.RC1/e4-rap/" description="Riena Target Components (E4/RAP)">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Riena">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Riena Target Components (E4/RAP)">
     <features name="org.eclipse.riena.build.feature.sdk.e4.feature.group" versionRange="6.1.0.v20150520_6_1_0_RC1">
       <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/>
     </features>
diff --git a/sapphire.b3aggrcon b/sapphire.b3aggrcon
index 01cc2e0..61680fc 100644
--- a/sapphire.b3aggrcon
+++ b/sapphire.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Sapphire" label="Sapphire">
-  <repositories location="http://download.eclipse.org/sapphire/9.0.5/repository">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="Sapphire" label="Sapphire">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.sapphire.feature.group" versionRange="[9.0.5.201605181639]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Application%20Development%20Frameworks']"/>
     </features>
diff --git a/scout.b3aggrcon b/scout.b3aggrcon
index 1fbacb0..40682f5 100644
--- a/scout.b3aggrcon
+++ b/scout.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Eclipse Scout is a framework to develop Java based business applications.&#xA;The HTML5 front-end of Scout applications comes with multi-device support and is based on HTML5/CSS3/JavaScript. This package includes a SDK, useful developer tools and source code." label="Scout">
-  <repositories location="http://download.eclipse.org/scout/releases/6.0/6.0.100/RC4/" description="Scout SDK">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="Eclipse Scout is a framework to develop Java based business applications.&#10;The HTML5 front-end of Scout applications comes with multi-device support and is based on HTML5/CSS3/JavaScript. This package includes a SDK, useful developer tools and source code." label="Scout">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Scout SDK">
     <features description="Eclipse Scout SDK" name="org.eclipse.scout.sdk-feature.feature.group" versionRange="6.0.100">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Application%20Development%20Frameworks']"/>
     </features>
diff --git a/sirius.b3aggrcon b/sirius.b3aggrcon
index 7edb5ec..7e4215b 100644
--- a/sirius.b3aggrcon
+++ b/sirius.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Eclipse Sirius" label="Sirius">
-  <repositories location="http://download.eclipse.org/sirius/updates/releases/4.0.1/neon">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="Eclipse Sirius" label="Sirius">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.sirius.specifier.feature.group" versionRange="[4.0.0,4.1.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/soa-bpel.b3aggrcon b/soa-bpel.b3aggrcon
index b8e1bb3..2e509e9 100644
--- a/soa-bpel.b3aggrcon
+++ b/soa-bpel.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="SOA-BPEL">
-  <repositories location="http://download.eclipse.org/bpel/updates/neon/1.1.0">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="SOA-BPEL">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.bpel.common.feature.feature.group" versionRange="1.1.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='SOA%20Development']"/>
     </features>
diff --git a/soa-bpmn2-modeler.b3aggrcon b/soa-bpmn2-modeler.b3aggrcon
index 7ef6faa..a775ca3 100644
--- a/soa-bpmn2-modeler.b3aggrcon
+++ b/soa-bpmn2-modeler.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="SOA-BPMN2 Modeler">
-  <repositories location="http://download.eclipse.org/bpmn2-modeler/updates/neon/1.3.1">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="SOA-BPMN2 Modeler">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.bpmn2.modeler.feature.group" versionRange="1.3.1">
       <categories href="simrel.b3aggr#//@customCategories[identifier='SOA%20Development']"/>
     </features>
diff --git a/sphinx.b3aggrcon b/sphinx.b3aggrcon
index 138d566..fdaf6b9 100644
--- a/sphinx.b3aggrcon
+++ b/sphinx.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Sphinx (Incubation)" label="Sphinx">
-  <repositories location="http://download.eclipse.org/sphinx/updates/0.10.x">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="Sphinx (Incubation)" label="Sphinx">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.sphinx.sdk.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
diff --git a/stardust.b3aggrcon b/stardust.b3aggrcon
index 5614482..985d8c7 100644
--- a/stardust.b3aggrcon
+++ b/stardust.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Stardust allows you to model business processes in Eclipse, integrate them with your application services and UI components, run them in the Process Engine and access workflow functionality and document management capabilities in the Browser Portal. " label="Stardust">
-  <repositories location="http://download.eclipse.org/stardust/milestones/neon">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="Stardust allows you to model business processes in Eclipse, integrate them with your application services and UI components, run them in the Process Engine and access workflow functionality and document management capabilities in the Browser Portal. " label="Stardust">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.stardust.documentation.documentation-feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='SOA%20Development']"/>
     </features>
diff --git a/subversive.b3aggrcon b/subversive.b3aggrcon
index 7a83e27..bcef505 100644
--- a/subversive.b3aggrcon
+++ b/subversive.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Subversive">
-  <repositories location="http://download.eclipse.org/technology/subversive/4.0/neon-site/" description="Subversive for Eclipse Neon">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Subversive">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Subversive for Eclipse Neon">
     <features name="org.eclipse.team.svn.feature.group" versionRange="[4.0.0,5.0.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Collaboration']"/>
     </features>
diff --git a/swtbot.b3aggrcon b/swtbot.b3aggrcon
index d7f7066..4d37c22 100644
--- a/swtbot.b3aggrcon
+++ b/swtbot.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="SWTBot">
-  <repositories location="http://download.eclipse.org/technology/swtbot/milestones/neon-ur1-rc4/">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="SWTBot">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.swtbot.ide.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Testing']"/>
     </features>
diff --git a/tcf.b3aggrcon b/tcf.b3aggrcon
index 4334d60..c839de2 100644
--- a/tcf.b3aggrcon
+++ b/tcf.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="TCF">
-  <repositories location="http://download.eclipse.org/tools/tcf/builds/1.4/milestones/20160605" description="TCF 1.4 Milestones">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="TCF">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="TCF 1.4 Milestones">
     <features name="org.eclipse.tcf.cdt.feature.feature.group" versionRange="1.4.0.201606031137">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Mobile%20and%20Device%20Development']"/>
     </features>
diff --git a/thym.b3aggrcon b/thym.b3aggrcon
index cc9b435..e05c482 100644
--- a/thym.b3aggrcon
+++ b/thym.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="THyM">
-  <repositories location="http://download.eclipse.org/thym/releases/2.0.0" description="THyM : The Hybrid Mobile">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="THyM">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="THyM : The Hybrid Mobile">
     <features name="org.eclipse.thym.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Mobile%20and%20Device%20Development']"/>
     </features>
diff --git a/tm.b3aggrcon b/tm.b3aggrcon
index d9aa874..f6de682 100644
--- a/tm.b3aggrcon
+++ b/tm.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="TM">
-  <repositories location="http://download.eclipse.org/tm/updates/4.1milestones/20160321" description="TM 4.1 Milestones">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="TM">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="TM 4.1 Milestones">
     <features name="org.eclipse.rse.feature.group" versionRange="3.7.0.201505221634">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Mobile%20and%20Device%20Development']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
@@ -10,7 +10,7 @@
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
   </repositories>
-  <repositories location="http://download.eclipse.org/tm/terminal/updates/4.1milestones/20160605" description="TM Terminal 4.1 (Neon) Milestones">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="TM Terminal 4.1 (Neon) Milestones">
     <features name="org.eclipse.tm.terminal.feature.feature.group" versionRange="4.1.0.201606052351">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Mobile%20and%20Device%20Development']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
diff --git a/tmf-xtext.b3aggrcon b/tmf-xtext.b3aggrcon
index 883caf0..67f72de 100644
--- a/tmf-xtext.b3aggrcon
+++ b/tmf-xtext.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Xtext, Xtend">
-  <repositories location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.10.0/" description="Xtext p2 repository">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="Xtext, Xtend">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Xtext p2 repository">
     <features name="org.eclipse.xtext.sdk.feature.group" versionRange="2.10.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
diff --git a/tracecompass.b3aggrcon b/tracecompass.b3aggrcon
index b12b56b..e417b2e 100644
--- a/tracecompass.b3aggrcon
+++ b/tracecompass.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Trace Compass Updates" label="Trace Compass">
-  <repositories location="http://download.eclipse.org/tracecompass/neon/milestones/ur1-rc4" description="Trace Compass Updates">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="Trace Compass Updates" label="Trace Compass">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Trace Compass Updates">
     <features name="org.eclipse.tracecompass.lttng2.control.feature.group" versionRange="0.1.0"/>
     <features name="org.eclipse.tracecompass.lttng2.kernel.feature.group" versionRange="0.1.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Performance%2C%20Profiling%20and%20Tracing%20Tools']"/>
diff --git a/webtools.b3aggrcon b/webtools.b3aggrcon
index 520f0f1..db2be3e 100644
--- a/webtools.b3aggrcon
+++ b/webtools.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="WebTools">
-  <repositories location="http://download.eclipse.org/webtools/downloads/drops/R3.8.1/R-3.8.1-20160912100321/repository/" description="Web Tools 3.7 repository site">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" label="WebTools">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Web Tools 3.7 repository site">
     <features name="org.eclipse.wst.web_ui.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
     </features>
@@ -89,7 +89,7 @@
       <categories href="simrel.b3aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
     </features>
   </repositories>
-  <repositories location="http://download.eclipse.org/webtools/downloads/drops/C3.2.0/I-C3.2.0-20100614204142/repository/" description="Web Tools 3.2 capability site">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Web Tools 3.2 capability site">
     <bundles name="org.eclipse.wtp.epp.package.capabilities" versionRange="1.3.0.v201005102000"/>
     <bundles name="org.eclipse.wtp.epp.package.jee.intro" versionRange="1.3.0.v201005102030"/>
     <bundles name="org.eclipse.wtp.javascript.capabilities" versionRange="1.0.100.v201005102000"/>
@@ -97,7 +97,7 @@
     <bundles name="org.eclipse.wtp.web.capabilities" versionRange="1.0.100.v201005102000"/>
     <bundles name="org.eclipse.wtp.xml.capabilities" versionRange="1.0.100.v201005102000"/>
   </repositories>
-  <repositories location="http://download.eclipse.org/libra/releases/R-0.3.1-201609011955" description="Libra 0.3.1 repository site">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/" description="Libra 0.3.1 repository site">
     <features name="org.eclipse.libra.facet.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
     </features>
diff --git a/windowbuilder.b3aggrcon b/windowbuilder.b3aggrcon
index 4b9021e..46fc8cf 100644
--- a/windowbuilder.b3aggrcon
+++ b/windowbuilder.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Window Builder GUI Designer" label="Window Builder">
-  <repositories location="http://download.eclipse.org/windowbuilder/WB/release/4.6/">
+<aggregator:Contribution xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" xmlns:xmi="http://www.omg.org/XMI" xmi:version="2.0" description="Window Builder GUI Designer" label="Window Builder">
+  <repositories location="http://download.eclipse.org/releases/neon/201609281000/">
     <features name="org.eclipse.wb.core.feature.feature.group" versionRange="1.2.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>