diff --git a/setups/interim/Platform.setup b/setups/interim/Platform.setup
deleted file mode 100644
index 7635119..0000000
--- a/setups/interim/Platform.setup
+++ /dev/null
@@ -1,922 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<setup:Project
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
-    xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
-    xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
-    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
-    xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
-    xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
-    xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
-    xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
-    name="platform"
-    label="Platform">
-  <annotation
-      source="ConfigurationReference">
-    <reference
-        href="PlatformSDKConfiguration.setup#/"/>
-  </annotation>
-  <setupTask
-      xsi:type="setup:CompoundTask"
-      name="User Preferences">
-    <setupTask
-        xsi:type="setup:CompoundTask"
-        name="org.eclipse.core.resources">
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.core.resources/refresh.enabled"
-          value="true"/>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:CompoundTask"
-        name="org.eclipse.egit.core">
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.egit.core/core_autoIgnoreDerivedResources"
-          value="false"/>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:CompoundTask"
-        name="org.eclipse.epp.mpc.ui">
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.epp.mpc.ui/org.eclipse.epp.mpc.naturelookup"
-          value="false"/>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:CompoundTask"
-        name="org.eclipse.pde.api.tools">
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.pde.api.tools/missing_default_api_profile"
-          value="Ignore"/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.pde.api.tools/MISSING_EE_DESCRIPTIONS"
-          value="Warning"/>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:CompoundTask"
-        name="org.eclipse.egit.ui">
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.egit.ui/commit_dialog_signed_off_by"
-          value="true">
-        <description>Insert Signed-off-by Footer</description>
-      </setupTask>
-    </setupTask>
-  </setupTask>
-  <setupTask
-      xsi:type="setup.p2:P2Task"
-      label="Platform">
-    <requirement
-        name="org.eclipse.platform.feature.group"/>
-    <requirement
-        name="org.eclipse.jdt.feature.group"/>
-    <requirement
-        name="org.eclipse.pde.feature.group"/>
-    <requirement
-        name="org.eclipse.pde.api.tools.ee.feature.feature.group"/>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:VariableTask"
-      name="eclipse.target.platform"
-      value="${eclipse.target.platform.latest}"
-      storageURI="scope://Workspace"/>
-  <setupTask
-      xsi:type="setup:VariableTask"
-      name="eclipse.api.baseline.target.platform"
-      value="${eclipse.api.baseline.target.platform.latest.released}"
-      storageURI="scope://Workspace"/>
-  <setupTask
-      xsi:type="setup:EclipseIniTask"
-      option="-Xmx"
-      value="2048m"
-      vm="true"/>
-  <setupTask
-      xsi:type="setup:ResourceCreationTask"
-      excludedTriggers="STARTUP MANUAL"
-      targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"
-      encoding="UTF-8">
-    <content>
-      &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>
-      &lt;section name=&quot;Workbench&quot;>
-      	&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>
-      		&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>
-      		&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>
-      		&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>
-      		&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>
-      		&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>
-      	&lt;/section>
-      &lt;/section>
-
-    </content>
-  </setupTask>
-  <setupTask
-      xsi:type="jdt:JRETask"
-      version="JavaSE-11"
-      location="${jre.location-11}"/>
-  <setupTask
-      xsi:type="setup.targlets:TargletTask"
-      targetName="Modular API Baseline Target"
-      activateTarget="false">
-    <targlet
-        name="Platform"
-        activeRepositoryList="${eclipse.api.baseline.target.platform}"
-        includeSources="false">
-      <requirement
-          name="org.eclipse.platform.feature.group"/>
-      <requirement
-          name="org.eclipse.jdt.feature.group"/>
-      <requirement
-          name="org.eclipse.pde.feature.group"/>
-      <requirement
-          name="org.eclipse.equinox.executable.feature.group"/>
-    </targlet>
-  </setupTask>
-  <setupTask
-      xsi:type="setup.targlets:TargletTask">
-    <targlet
-        name="Platform"
-        activeRepositoryList="CBI+Orbit">
-      <requirement
-          name="org.eclipse.platform.feature.group"/>
-      <requirement
-          name="org.eclipse.jdt.feature.group"/>
-      <requirement
-          name="org.eclipse.pde.feature.group"/>
-      <requirement
-          name="org.eclipse.equinox.executable.feature.group"/>
-      <repositoryList
-          name="CBI+Orbit">
-        <repository
-            url="https://download.eclipse.org/cbi/updates/license"/>
-        <repository
-            url="https://download.eclipse.org/tools/orbit/downloads/latest-R"/>
-      </repositoryList>
-    </targlet>
-  </setupTask>
-  <project name="platform"
-      label="Base, Update, and Ant">
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="github.clone.platform"
-        remoteURI="eclipse-platform/eclipse.platform">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>github.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Platform Base, Update, and Ant Github Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <description>Platform Base, Update, and Ant</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Platform Base, Update, and Ant"
-          activeRepositoryList="${eclipse.target.platform}">
-        <requirement
-            name="*"/>
-        <sourceLocator
-            rootFolder="${github.clone.platform.location}"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Platform Base">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.platform"/>
-          <operand
-              xsi:type="predicates:LocationPredicate"
-              pattern=".*/eclipse\.platform/platform/.*"/>
-        </predicate>
-      </workingSet>
-      <workingSet
-          name="Platform Ant">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.ant.core"/>
-          <operand
-              xsi:type="predicates:LocationPredicate"
-              pattern=".*/eclipse\.platform/ant/.*"/>
-          <operand
-              xsi:type="workingsets:ExclusionPredicate"
-              excludedWorkingSet="//@projects[name='platform']/@setupTasks.2/@workingSets[name='Platform%20Ant%20Tests']"/>
-        </predicate>
-      </workingSet>
-      <workingSet
-          name="Platform Ant Tests">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.ant.tests.core"/>
-          <operand
-              xsi:type="predicates:LocationPredicate"
-              pattern=".*/eclipse\.platform/ant/.*\.tests\..*"/>
-        </predicate>
-      </workingSet>
-      <workingSet
-          name="Platform Update">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.update.configurator"/>
-          <operand
-              xsi:type="predicates:LocationPredicate"
-              pattern=".*/eclipse\.platform/update/.*"/>
-        </predicate>
-      </workingSet>
-    </setupTask>
-    <stream
-        name="master"
-        label="Master"/>
-  </project>
-  <project name="debug"
-      label="Debug">
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="github.clone.platform.debug"
-        remoteURI="eclipse-platform/eclipse.platform.debug">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>github.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Platform Debug Github Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <description>Platform Debug</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Platform Debug"
-          activeRepositoryList="${eclipse.target.platform}">
-        <requirement
-            name="*"/>
-        <sourceLocator
-            rootFolder="${github.clone.platform.debug.location}"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask"
-        id="platform.debug.workingsets">
-      <workingSet
-          name="Platform Debug">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.debug.core"/>
-          <operand
-              xsi:type="workingsets:ExclusionPredicate"
-              excludedWorkingSet="//'platform.debug.workingsets'/@workingSets[name='Platform%20Debug%20Tests'] //'platform.debug.workingsets'/@workingSets[name='Platform%20Debug%20Examples']"/>
-        </predicate>
-      </workingSet>
-      <workingSet
-          name="Platform Debug Tests">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.debug.tests"/>
-          <operand
-              xsi:type="predicates:NamePredicate"
-              pattern=".*\.tests.*"/>
-        </predicate>
-      </workingSet>
-      <workingSet
-          name="Platform Debug Examples">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:NamePredicate"
-              pattern=".*\.examples\..*"/>
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.debug.examples.core"/>
-        </predicate>
-      </workingSet>
-    </setupTask>
-    <stream
-        name="master"
-        label="Master"/>
-    <description>The Platform Debug support</description>
-  </project>
-  <project name="dependencies"
-      label="Dependencies">
-    <project
-        name="ecf"
-        label="ECF">
-      <setupTask
-          xsi:type="setup:CompoundTask"
-          name="User Preferences">
-        <setupTask
-            xsi:type="setup:CompoundTask"
-            name="org.eclipse.m2e.core">
-          <setupTask
-              xsi:type="setup:PreferenceTask"
-              key="/instance/org.eclipse.m2e.core/eclipse.m2.problem.notCoveredMojoExecution"
-              value="warning"/>
-          <setupTask
-              xsi:type="setup:PreferenceTask"
-              key="/instance/org.eclipse.m2e.core/eclipse.m2.problem.outofdateProjectConfig"
-              value="warning"/>
-        </setupTask>
-      </setupTask>
-      <setupTask
-          xsi:type="git:GitCloneTask"
-          id="github.clone.ecf"
-          remoteURI="eclipse/ecf">
-        <annotation
-            source="http://www.eclipse.org/oomph/setup/InducedChoices">
-          <detail
-              key="inherit">
-            <value>github.remoteURIs</value>
-          </detail>
-          <detail
-              key="label">
-            <value>ECF Github Repository</value>
-          </detail>
-          <detail
-              key="target">
-            <value>remoteURI</value>
-          </detail>
-        </annotation>
-        <description>ECF</description>
-      </setupTask>
-      <setupTask
-          xsi:type="setup:TextModifyTask"
-          excludedTriggers="BOOTSTRAP"
-          url="${github.clone.ecf.location|uri}/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java"
-          encoding="UTF-8">
-        <modification
-            pattern="(?im)public void log\(@SuppressWarnings\(&quot;rawtypes&quot;\) ServiceReference sr, int level, String message, Throwable exception\) \{\s+doLog\(sr, level, message, exception\);\s+\}\s+()\}(\s+)$">
-          <substitution>	public org.osgi.service.log.Logger getLogger(String name) {\2		throw new UnsupportedOperationException();\2	}\2\2	public org.osgi.service.log.Logger getLogger(Class&lt;?> clazz) {\2		throw new UnsupportedOperationException();\2	}\2\2	public &lt;L extends org.osgi.service.log.Logger> L getLogger(String name, Class&lt;L> LoggerType) {\2		throw new UnsupportedOperationException();\2	}\2\2	public &lt;L extends org.osgi.service.log.Logger> L getLogger(Class&lt;?> clazz, Class&lt;L> LoggerType) {\2		throw new UnsupportedOperationException();\2	}\2	public &lt;L extends org.osgi.service.log.Logger> L getLogger(org.osgi.framework.Bundle bundle, String name, Class&lt;L> LoggerType) {\2		throw new UnsupportedOperationException();\2	}\2</substitution>
-          <substitution>\2</substitution>
-        </modification>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.targlets:TargletTask">
-        <targlet
-            name="ECF Dependency">
-          <sourceLocator
-              rootFolder="${github.clone.ecf.location}"
-              locateNestedProjects="true"/>
-        </targlet>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Platform Dependency ECF">
-          <predicate
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.ecf"/>
-        </workingSet>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-      <description>The Platform's ECF dependencies</description>
-    </project>
-    <project
-        name="emf"
-        label="EMF">
-      <setupTask
-          xsi:type="git:GitCloneTask"
-          id="git.clone.emf"
-          remoteURI="emf/org.eclipse.emf">
-        <annotation
-            source="http://www.eclipse.org/oomph/setup/InducedChoices">
-          <detail
-              key="inherit">
-            <value>eclipse.git.gerrit.remoteURIs</value>
-          </detail>
-          <detail
-              key="label">
-            <value>EMF Git or Gerrit Repository</value>
-          </detail>
-          <detail
-              key="target">
-            <value>remoteURI</value>
-          </detail>
-        </annotation>
-        <configSections
-            name="gerrit">
-          <properties
-              key="createchangeid"
-              value="true"/>
-        </configSections>
-        <description>EMF</description>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.targlets:TargletTask">
-        <targlet
-            name="EMF Dependency">
-          <sourceLocator
-              rootFolder="${git.clone.emf.location}"/>
-        </targlet>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Platform Dependency EMF">
-          <predicate
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.emf.common"/>
-        </workingSet>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-      <description>The Platform's EMF dependencies</description>
-    </project>
-    <description>The Platform dependencies</description>
-  </project>
-  <project name="documentation"
-      label="Documentation">
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="github.clone.platform.common"
-        remoteURI="eclipse-platform/eclipse.platform.common">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>github.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Platform Documentation Github Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <description>Platform Documentation</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Platform Documentation"
-          activeRepositoryList="${eclipse.target.platform}">
-        <requirement
-            name="*"/>
-        <sourceLocator
-            rootFolder="${github.clone.platform.common.location}"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Platform Documentation">
-        <predicate
-            xsi:type="predicates:RepositoryPredicate"
-            project="org.eclipse.platform.doc.user"/>
-      </workingSet>
-    </setupTask>
-    <stream
-        name="master"
-        label="Master"/>
-    <description>The Platform documentation</description>
-  </project>
-  <project name="images"
-      label="Images">
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="github.clone.platform.images"
-        remoteURI="eclipse-platform/eclipse.platform.images">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>github.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Platform Images Github Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <description>Platform Images</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Platform Images">
-        <requirement
-            name="*"/>
-        <sourceLocator
-            rootFolder="${github.clone.platform.images.location}"
-            locateNestedProjects="true">
-          <excludedPath>org.eclipse.images/eclipse-svg/org.eclipse.m2e.core.ui</excludedPath>
-          <excludedPath>org.eclipse.images.renderer</excludedPath>
-        </sourceLocator>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Platform Images">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.images"/>
-        </predicate>
-      </workingSet>
-    </setupTask>
-    <stream
-        name="master"
-        label="Master"/>
-    <description>The Platform Images</description>
-  </project>
-  <project name="news"
-      label="News">
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="github.clone.platform.news"
-        remoteURI="eclipse-platform/www.eclipse.org-eclipse-news">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>github.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Platform News Github Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <description>Platform News</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Platform News">
-        <requirement
-            name="*"/>
-        <sourceLocator
-            rootFolder="${github.clone.platform.news.location}"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask"
-        id="platform.news.workingsets">
-      <workingSet
-          name="Platform News">
-        <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern="platform news"/>
-      </workingSet>
-    </setupTask>
-    <stream
-        name="master"
-        label="Master"/>
-    <description>The Platform news</description>
-  </project>
-  <project name="releng"
-      label="Releng">
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="github.clone.platform.releng"
-        remoteURI="eclipse-platform/eclipse.platform.releng">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>github.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Platform Releng Github Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <description>Platform Releng</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Platform Releng"
-          activeRepositoryList="EGit+JGit">
-        <requirement
-            name="*"/>
-        <requirement
-            name="org.eclipse.jgit"/>
-        <requirement
-            name="org.eclipse.egit.core"/>
-        <sourceLocator
-            rootFolder="${github.clone.platform.releng.location}"/>
-        <repositoryList
-            name="EGit+JGit">
-          <repository
-              url="https://download.eclipse.org/egit/updates"/>
-        </repositoryList>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Platform Releng">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.rcp"/>
-          <operand
-              xsi:type="workingsets:ExclusionPredicate"
-              excludedWorkingSet="//@projects[name='releng']/@setupTasks.2/@workingSets[name='Platform%20Releng%20Tests']"/>
-        </predicate>
-      </workingSet>
-      <workingSet
-          name="Platform Releng Tests">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.rcp"/>
-          <operand
-              xsi:type="predicates:NamePredicate"
-              pattern=".*tests?.*"/>
-        </predicate>
-      </workingSet>
-    </setupTask>
-    <stream
-        name="master"
-        label="Master"/>
-    <description>The Platform Releng components</description>
-  </project>
-  <project name="releng.aggregator"
-      label="Releng Aggregator">
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="github.clone.platform.releng.aggregator"
-        remoteURI="eclipse-platform/eclipse.platform.releng.aggregator">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>github.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Platform Releng Aggregator Github Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <description>Platform Releng Aggregator</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Platform Releng Aggregator">
-        <requirement
-            name="org.eclipse.platform.releng.tychoeclipsebuilder.plain.project"/>
-        <sourceLocator
-            rootFolder="${github.clone.platform.releng.aggregator.location}"
-            locateNestedProjects="true"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Platform Releng Aggregator">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.platform.releng.tychoeclipsebuilder"/>
-        </predicate>
-      </workingSet>
-    </setupTask>
-    <stream
-        name="master"
-        label="Master"/>
-    <description>The Platform Releng Agrregator components, including the Platform's products</description>
-  </project>
-  <project name="releng.buildtools"
-      label="Releng Build Tools">
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="github.clone.platform.releng.buildtools"
-        remoteURI="eclipse-platform/eclipse.platform.releng.buildtools">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>github.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Platform Releng Build Tools Github Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <description>Platform Releng Build Tools</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Platform Build Tools"
-          activeRepositoryList="egit">
-        <requirement
-            name="*"/>
-        <requirement
-            name="org.eclipse.egit.core"/>
-        <sourceLocator
-            rootFolder="${github.clone.platform.releng.buildtools.location}"
-            locateNestedProjects="true"/>
-        <repositoryList
-            name="egit">
-          <repository
-              url="https://download.eclipse.org/egit/updates"/>
-        </repositoryList>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Platform Releng Build Tools">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.build.tools"/>
-        </predicate>
-      </workingSet>
-    </setupTask>
-    <stream
-        name="master"
-        label="Master"/>
-    <description>The Platform Releng Build Tools</description>
-  </project>
-  <project href="https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.resources/master/bundles/org.eclipse.core.resources.releng/platformResources.setup#/"/>
-  <project href="https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.runtime/master/bundles/org.eclipse.core.runtime.releng/platformRuntime.setup#/"/>
-  <project href="https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.swt/master/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup#/"/>
-  <project href="https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.team/master/bundles/org.eclipse.team.releng/platformTeam.setup#/"/>
-  <project href="https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.text/master/org.eclipse.text.releng/platformText.setup#/"/>
-  <project href="https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.ua/master/org.eclipse.ua.releng/platformUa.setup#/"/>
-  <project href="https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.ui/master/releng/org.eclipse.ui.releng/platformUi.setup#/"/>
-  <project name="ui.tools"
-      label="UI Tools">
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="github.clone.platform.ui.tools"
-        remoteURI="eclipse-platform/eclipse.platform.ui.tools"
-        pushURI="">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>github.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Platform UI Github Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <description>Platform UI Tools</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Platform UI Tools"
-          activeRepositoryList="Nebula+EMF+GEF">
-        <requirement
-            name="*"/>
-        <sourceLocator
-            rootFolder="${github.clone.platform.ui.tools.location}"/>
-        <repositoryList
-            name="Nebula+EMF+GEF">
-          <repository
-              url="https://download.eclipse.org/nebula/snapshot"/>
-          <repository
-              url="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>
-          <repository
-              url="https://download.eclipse.org/tools/gef/updates/milestones"/>
-        </repositoryList>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Platform UI Tools">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.e4.core.tools.feature"/>
-        </predicate>
-      </workingSet>
-    </setupTask>
-    <stream
-        name="master"
-        label="Master"/>
-    <description>The Platform UI Tools support</description>
-  </project>
-  <project name="website"
-      label="Website">
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="github.clone.platform.website"
-        remoteURI="eclipse-platform/www.eclipse.org-eclipse"
-        pushURI="">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>github.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Platform Website Github Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <description>Platform Website</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Platform Website">
-        <requirement
-            name="*"/>
-        <sourceLocator
-            rootFolder="${github.clone.platform.website.location}"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask"
-        id="platform.website.workingsets">
-      <workingSet
-          name="Platform Website">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="eclipse"/>
-        </predicate>
-      </workingSet>
-    </setupTask>
-    <stream
-        name="master"
-        label="Master"/>
-    <description>The Platform Website</description>
-  </project>
-  <logicalProjectContainer
-      xsi:type="setup:ProjectCatalog"
-      href="../org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>
-  <description>The Eclipse platform</description>
-</setup:Project>
diff --git a/setups/interim/PlatformSDKConfiguration.setup b/setups/interim/PlatformSDKConfiguration.setup
deleted file mode 100644
index 2f5cbeb..0000000
--- a/setups/interim/PlatformSDKConfiguration.setup
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<setup:Configuration
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
-    label="Eclipse Platform SDK">
-  <annotation
-      source="http://www.eclipse.org/oomph/setup/BrandingInfo">
-    <detail
-        key="imageURI">
-      <value>https://www.eclipse.org/downloads/images/committers.png</value>
-    </detail>
-    <detail
-        key="badgeLabel">
-      <value>Platform SDK</value>
-    </detail>
-  </annotation>
-  <installation
-      name="platform.sdk.installation"
-      label="Platform SDK Installation">
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="installation.id.default"
-        value="platform-sdk"/>
-    <productVersion
-        href="index:/org.eclipse.setup#//@productCatalogs[name='org.eclipse.applications']/@products[name='eclipse.platform.sdk']/@versions[name='latest']"/>
-    <description>The Platform SDK installation provides the latest tools needed to work with the Eclipse Platform SDK's source code.</description>
-  </installation>
-  <workspace
-      name="platform.sdk.workspace"
-      label="Platform SDK Workspace">
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="workspace.id.default"
-        value="platform-sdk-ws"/>
-    <setupTask
-        xsi:type="setup:CompoundTask"
-        name="User Preferences">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/UserPreferences">
-        <detail
-            key="/instance/org.eclipse.oomph.setup.ui/showToolBarContributions">
-          <value>record</value>
-        </detail>
-      </annotation>
-      <setupTask
-          xsi:type="setup:CompoundTask"
-          name="org.eclipse.oomph.setup.ui">
-        <setupTask
-            xsi:type="setup:PreferenceTask"
-            key="/instance/org.eclipse.oomph.setup.ui/showToolBarContributions"
-            value="true"/>
-      </setupTask>
-      <setupTask
-          xsi:type="setup:CompoundTask"
-          name="org.eclipse.ui.ide">
-        <setupTask
-            xsi:type="setup:PreferenceTask"
-            key="/instance/org.eclipse.ui.ide/WORKSPACE_NAME"
-            value="Platform SDK"/>
-      </setupTask>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:ResourceCreationTask"
-        targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.debug.core/.launches/Runtime%20Workspace.launch"
-        encoding="UTF-8">
-      <content>
-        &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?>
-        &lt;launchConfiguration type=&quot;org.eclipse.pde.ui.RuntimeWorkbench&quot;>
-        &lt;setAttribute key=&quot;additional_plugins&quot;/>
-        &lt;booleanAttribute key=&quot;append.args&quot; value=&quot;true&quot;/>
-        &lt;booleanAttribute key=&quot;askclear&quot; value=&quot;true&quot;/>
-        &lt;booleanAttribute key=&quot;automaticAdd&quot; value=&quot;true&quot;/>
-        &lt;booleanAttribute key=&quot;automaticValidate&quot; value=&quot;true&quot;/>
-        &lt;stringAttribute key=&quot;bootstrap&quot; value=&quot;&quot;/>
-        &lt;stringAttribute key=&quot;checked&quot; value=&quot;[NONE]&quot;/>
-        &lt;booleanAttribute key=&quot;clearConfig&quot; value=&quot;false&quot;/>
-        &lt;booleanAttribute key=&quot;clearws&quot; value=&quot;false&quot;/>
-        &lt;booleanAttribute key=&quot;clearwslog&quot; value=&quot;false&quot;/>
-        &lt;stringAttribute key=&quot;configLocation&quot; value=&quot;$${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Runtime Workspace&quot;/>
-        &lt;booleanAttribute key=&quot;default&quot; value=&quot;false&quot;/>
-        &lt;stringAttribute key=&quot;featureDefaultLocation&quot; value=&quot;workspace&quot;/>
-        &lt;stringAttribute key=&quot;featurePluginResolution&quot; value=&quot;workspace&quot;/>
-        &lt;booleanAttribute key=&quot;generateProfile&quot; value=&quot;true&quot;/>
-        &lt;booleanAttribute key=&quot;includeOptional&quot; value=&quot;true&quot;/>
-        &lt;stringAttribute key=&quot;location&quot; value=&quot;$${workspace_loc}/../runtime-workspace&quot;/>
-        &lt;listAttribute key=&quot;org.eclipse.debug.ui.favoriteGroups&quot;>
-        &lt;listEntry value=&quot;org.eclipse.debug.ui.launchGroup.debug&quot;/>
-        &lt;listEntry value=&quot;org.eclipse.debug.ui.launchGroup.run&quot;/>
-        &lt;/listAttribute>
-        &lt;booleanAttribute key=&quot;org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD&quot; value=&quot;true&quot;/>
-        &lt;stringAttribute key=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; value=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11&quot;/>
-        &lt;stringAttribute key=&quot;org.eclipse.jdt.launching.PROGRAM_ARGUMENTS&quot; value=&quot;-os $${target.os} -ws $${target.ws} -arch $${target.arch} -nl $${target.nl} -consoleLog&quot;/>
-        &lt;stringAttribute key=&quot;org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER&quot; value=&quot;org.eclipse.pde.ui.workbenchClasspathProvider&quot;/>
-        &lt;stringAttribute key=&quot;org.eclipse.jdt.launching.VM_ARGUMENTS&quot; value=&quot;-Xms256m&amp;#13;&amp;#10;-Xmx2048m&quot;/>
-        &lt;stringAttribute key=&quot;pde.version&quot; value=&quot;3.3&quot;/>
-        &lt;stringAttribute key=&quot;product&quot; value=&quot;org.eclipse.sdk.ide&quot;/>
-        &lt;booleanAttribute key=&quot;restart&quot; value=&quot;true&quot;/>
-        &lt;setAttribute key=&quot;selected_features&quot;>
-        &lt;setEntry value=&quot;org.eclipse.e4.core.tools.feature:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.e4.rcp:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.ecf.core.feature:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.ecf.core.ssl.feature:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.ecf.filetransfer.feature:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.ecf.filetransfer.httpclient45.feature:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.ecf.filetransfer.ssl.feature:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.emf.common:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.emf.ecore:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.equinox.p2.core.feature:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.equinox.p2.extras.feature:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.equinox.p2.rcp.feature:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.equinox.p2.user.ui:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.help:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.jdt:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.pde:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.platform:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.rcp.source:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.rcp:default&quot;/>
-        &lt;setEntry value=&quot;org.eclipse.sdk:default&quot;/>
-        &lt;/setAttribute>
-        &lt;booleanAttribute key=&quot;show_selected_only&quot; value=&quot;false&quot;/>
-        &lt;stringAttribute key=&quot;templateConfig&quot; value=&quot;$${target_home}\configuration\config.ini&quot;/>
-        &lt;booleanAttribute key=&quot;tracing&quot; value=&quot;false&quot;/>
-        &lt;booleanAttribute key=&quot;useCustomFeatures&quot; value=&quot;true&quot;/>
-        &lt;booleanAttribute key=&quot;useDefaultConfig&quot; value=&quot;true&quot;/>
-        &lt;booleanAttribute key=&quot;useDefaultConfigArea&quot; value=&quot;true&quot;/>
-        &lt;booleanAttribute key=&quot;useProduct&quot; value=&quot;true&quot;/>
-        &lt;/launchConfiguration>
-
-      </content>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:ResourceCreationTask"
-        targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml"
-        encoding="UTF-8">
-      <content>
-        &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?>
-        &lt;launchHistory>
-        &lt;launchGroup id=&quot;org.eclipse.debug.ui.launchGroup.debug&quot;>
-        &lt;mruHistory>
-        &lt;launch memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;launchConfiguration local=&amp;quot;true&amp;quot; path=&amp;quot;Runtime Workspace&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot;/>
-        &lt;/mruHistory>
-        &lt;favorites/>
-        &lt;/launchGroup>
-        &lt;launchGroup id=&quot;org.eclipse.debug.ui.launchGroup.profile&quot;>
-        &lt;mruHistory/>
-        &lt;favorites/>
-        &lt;/launchGroup>
-        &lt;launchGroup id=&quot;org.eclipse.eclemma.ui.launchGroup.coverage&quot;>
-        &lt;mruHistory>
-        &lt;launch memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;launchConfiguration local=&amp;quot;true&amp;quot; path=&amp;quot;Runtime Workspace&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot;/>
-        &lt;/mruHistory>
-        &lt;favorites/>
-        &lt;/launchGroup>
-        &lt;launchGroup id=&quot;org.eclipse.ui.externaltools.launchGroup&quot;>
-        &lt;mruHistory/>
-        &lt;favorites/>
-        &lt;/launchGroup>
-        &lt;launchGroup id=&quot;org.eclipse.debug.ui.launchGroup.run&quot;>
-        &lt;mruHistory>
-        &lt;launch memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;launchConfiguration local=&amp;quot;true&amp;quot; path=&amp;quot;Runtime Workspace&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot;/>
-        &lt;/mruHistory>
-        &lt;favorites/>
-        &lt;/launchGroup>
-        &lt;/launchHistory>
-
-      </content>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="eclipse.git.authentication.style"
-        defaultValue="anonymous"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='equinox']/@projects[name='binaries']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='equinox']/@projects[name='bundles']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='equinox']/@projects[name='framework']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='equinox']/@projects[name='p2']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='jdt']/@projects[name='features']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='jdt']/@projects[name='core']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='jdt']/@projects[name='debug']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='jdt']/@projects[name='ui']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='jdt']/@projects[name='core']/@projects[name='tests']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='jdt']/@projects[name='core']/@projects[name='testbinaries']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='jdt']/@projects[name='debug']/@projects[name='tests']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='jdt']/@projects[name='ui']/@projects[name='tests']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='jdt']/@projects[name='ui']/@projects[name='examples']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='pde']/@projects[name='ui']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='pde']/@projects[name='build']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='platform']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='debug']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='dependencies']/@projects[name='ecf']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='dependencies']/@projects[name='emf']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='documentation']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='images']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='news']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='resources']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='runtime']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='swt']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='team']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='text']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='ua']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='ui']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='ui.tools']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='releng']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='releng.aggregator']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='releng.buildtools']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='website']/@streams[name='master']"/>
-    <description>The Platform SDK workspace provides all the source code of the Eclipse Platform SDK.</description>
-  </workspace>
-  <description>
-    &lt;p>
-    The Platform SDK configuration provisions a dedicated development environment for the complete set of projects that comprise the &lt;a href=&quot;https://www.eclipse.org/eclipse/&quot;>Eclipse Platform's SDK&lt;/a>,
-    i.e., the source projects used to produce the &lt;a href=&quot;https://download.eclipse.org/eclipse/downloads/&quot;>downloads&lt;/a> of the Eclipse Platform Project. 
-    &lt;/p>
-    &lt;p>
-    The installation is based on the latest successful integration build of the Eclipse Platform SDK,
-    the workspace consists of projects from over two dozen Git clones organized into workings sets,
-    the PDE target platform, like the installation, is also based on the latest integration build,
-    and the API baseline is based on the most recent release.
-    &lt;p>
-    &lt;/p>
-    Please &lt;a href=&quot;https://wiki.eclipse.org/Eclipse_Platform_SDK_Provisioning&quot;>read the tutorial instructions&lt;/a> for more details.
-    &lt;/p>
-  </description>
-</setup:Configuration>
diff --git a/setups/org.eclipse.projects.setup b/setups/org.eclipse.projects.setup
index 7a7c5a1..f7b9a7a 100644
--- a/setups/org.eclipse.projects.setup
+++ b/setups/org.eclipse.projects.setup
@@ -1115,8 +1115,8 @@
   <project href="https://raw.githubusercontent.com/eclipse/packagedrone/master/setups/org.eclipse.packagedrone.oomph/PackageDrone.setup#/"/>
   <project href="http://git.eclipse.org/c/papyrus/org.eclipse.papyrus.git/plain/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup#/"/>
   <project href="https://raw.githubusercontent.com/eclipse-passage/passage/master/releng/org.eclipse.passage.releng/passage.setup#/"/>
-  <project href="https://raw.githubusercontent.com/eclipse-pde/eclipse.pde.ui/master/releng/org.eclipse.pde.ui.setup/PDE.setup#/"/>
-  <project href="interim/Platform.setup#/"/>
+  <project href="https://raw.githubusercontent.com/eclipse-pde/eclipse.pde/master/releng/org.eclipse.pde.ui.setup/PDE.setup#/"/>
+  <project href="https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/oomph/Platform.setup#/"/>
   <project href="http://git.eclipse.org/c/mmt/org.eclipse.qvtd.git/plain/releng/org.eclipse.qvtd.oomph/setups/qvtd.setup#/"/>
   <project href="http://git.eclipse.org/c/mmt/org.eclipse.qvto.git/plain/releng/org.eclipse.qvto.oomph/setups/qvto.setup#/"/>
   <project href="http://git.eclipse.org/c/rcptt/org.eclipse.rcptt.git/plain/releng/RCPTT.setup#/"/>