diff --git a/utils_dev/oomph/mvn_verify.launch b/utils_dev/oomph/mvn_verify.launch
index 19ffe9df4b..a34158d4c6 100644
--- a/utils_dev/oomph/mvn_verify.launch
+++ b/utils_dev/oomph/mvn_verify.launch
@@ -15,6 +15,6 @@
     <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-11-openjdk-amd64"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:utils_dev}/.."/>
 </launchConfiguration>
diff --git a/utils_dev/oomph/setups/idempiere.projects.setup b/utils_dev/oomph/setups/idempiere.projects.setup
deleted file mode 100644
index ef8b897d62..0000000000
--- a/utils_dev/oomph/setups/idempiere.projects.setup
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<setup:ProjectCatalog
-    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"
-    name="org.idempiere"
-    label="github.com/idempiere/idempiere">
-  <annotation
-      source="http://www.eclipse.org/oomph/setup/StatsSending">
-    <detail
-        key="uri">
-      <value>http://download.eclipse.org/stats/oomph</value>
-    </detail>
-  </annotation>
-  <annotation
-      source="http://www.eclipse.org/oomph/setup/BrandingInfo">
-    <detail
-        key="imageURI">
-      <value>https://www.idempiere.org/wp-content/uploads/2020/03/cropped-taglinef3-scaled-1-2048x818.jpg</value>
-    </detail>
-    <detail
-        key="siteURI">
-      <value>https://www.idempiere.org/</value>
-    </detail>
-  </annotation>
-  <setupTask
-        xsi:type="setup:VariableTask"
-        name="github.remoteURIs"
-        label="Github repository">
-      <choice
-          value="git@github.com:@{remoteURI}.git"
-          label="Git (read-write)"/>
-      <choice
-          value="https://${github.user.id|username}@github.com/@{remoteURI}.git"
-          label="HTTPS (read-write)">
-        <annotation
-            source="http://www.eclipse.org/oomph/setup/MatchChoice"/>
-      </choice>
-      <choice
-          value="https://github.com/@{remoteURI}.git"
-          label="HTTPS (read-only, anonymous)"/>
-      <description>Choose from the available Github URIs</description>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:WorkspaceTask"
-      id="workspace"/>
-  <setupTask
-      xsi:type="setup:ResourceCreationTask"
-      targetURL="configuration:/.settings/org.eclipse.ui.ide.prefs">
-    <content>
-      MAX_RECENT_WORKSPACES=5
-      RECENT_WORKSPACES=${workspace.location|property}
-      RECENT_WORKSPACES_PROTOCOL=3
-      SHOW_WORKSPACE_SELECTION_DIALOG=true
-      eclipse.preferences.version=1
-    </content>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:TextModifyTask"
-      url="configuration:/config.ini">
-    <modification
-        pattern="osgi\.instance\.area\.default=(@user\.home/workspace)">
-      <substitution>${workspace.location|path}</substitution>
-    </modification>
-  </setupTask>
-  <project href="idempiere.setup#/"/>
-  <description>iDempiere Projects at Github</description>
-</setup:ProjectCatalog>
diff --git a/utils_dev/oomph/setups/idempiere.setup b/utils_dev/oomph/setups/idempiere.setup
deleted file mode 100644
index 1b92659d0e..0000000000
--- a/utils_dev/oomph/setups/idempiere.setup
+++ /dev/null
@@ -1,121 +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:launching="http://www.eclipse.org/oomph/setup/launching/1.0"
-    xmlns:maven="http://www.eclipse.org/oomph/setup/maven/1.0"
-    xmlns:pde="http://www.eclipse.org/oomph/setup/pde/1.0"
-    xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0"
-    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
-    xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/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/setup/launching/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Launching.ecore http://www.eclipse.org/oomph/setup/maven/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore"
-    name="idempiere.2021.03.05"
-    label="iDempiere Master">
-  <setupTask
-      xsi:type="setup:VariableTask"
-      name="github.repository"
-      label="Github repository"
-      value="idempiere/idempiere"/>
-  <setupTask
-      xsi:type="setup:VariableTask"
-      name="git.clone.branch"
-      label="Git clone branch"
-      value="master"/>
-  <setupTask
-      xsi:type="setup:VariableTask"
-      name="idempiere.target.platform"
-      label="Target Platform"
-      value="idempiere-201101"/>
-  <setupTask
-      xsi:type="jdt:JRETask"
-      version="JavaSE-11"
-      location="${jre.location-11}">
-    <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:EclipseIniTask"
-      option="-Xmx"
-      value="2048m"
-      vm="true">
-    <description>Set the heap space needed to work with the projects of ${scope.project.label}</description>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:ResourceCreationTask"
-      excludedTriggers="STARTUP MANUAL"
-      targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"
-      encoding="UTF-8">
-    <description>Initialize JDT's package explorer to show working sets as its root objects</description>
-    <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="setup.p2:P2Task">
-    <requirement
-        name="org.sonatype.tycho.m2e.feature.feature.group"/>
-    <repository
-        url="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.9.0/N/0.9.0.201811261502/"/>
-    <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
-  </setupTask>
-  <setupTask
-      xsi:type="git:GitCloneTask"
-      id="git.clone.idempiere.git"
-      location="${workspace.location/idempiere}"
-      remoteURI="${github.repository}"
-      checkoutBranch="${git.clone.branch}">
-    <annotation
-        source="http://www.eclipse.org/oomph/setup/InducedChoices">
-      <detail
-          key="inherit">
-        <value>github.remoteURIs</value>
-      </detail>
-      <detail
-          key="label">
-        <value>${scope.project.label} Github repository</value>
-      </detail>
-      <detail
-          key="target">
-        <value>remoteURI</value>
-      </detail>
-    </annotation>
-    <description>${scope.project.label}</description>
-  </setupTask>
-  <setupTask
-      xsi:type="projects:ProjectsImportTask">
-    <sourceLocator
-        rootFolder="${git.clone.idempiere.git.location}/utils_dev"
-        locateNestedProjects="true"/>
-  </setupTask>
-  <setupTask
-      xsi:type="launching:LaunchTask"
-      launcher="mvn_verify"/>
-  <setupTask
-      xsi:type="maven:MavenImportTask"
-      id="org.idempiere.main">
-    <sourceLocator
-        rootFolder="${git.clone.idempiere.git.location}"
-        locateNestedProjects="true"/>
-  </setupTask>
-  <setupTask
-      xsi:type="pde:TargetPlatformTask"
-      name="${idempiere.target.platform}"/>
-  <stream name="master"
-      label="Master"/>
-  <logicalProjectContainer
-      xsi:type="setup:ProjectCatalog"
-      href="index:/org.eclipse.setup#//@projectCatalogs[name='org.idempiere']"/>
-  <description>idempiere provides cool stuff.</description>
-</setup:Project>
diff --git a/utils_dev/oomph/setups/models/Git.ecore b/utils_dev/oomph/setups/models/Git.ecore
deleted file mode 100644
index 4104aa43ef..0000000000
--- a/utils_dev/oomph/setups/models/Git.ecore
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="git" nsURI="http://www.eclipse.org/oomph/setup/git/1.0" nsPrefix="git">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="schemaLocation" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-    <details key="variableName" value="setup.git.p2"/>
-    <details key="repository" value="${oomph.update.url}"/>
-    <details key="installableUnits" value="org.eclipse.oomph.setup.git.feature.group"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-    <details key="variableName" value="setup.egit.p2"/>
-    <details key="repository" value="http://download.eclipse.org/egit/updates"/>
-    <details key="installableUnits" value="org.eclipse.egit.feature.group"/>
-    <details key="releaseTrainAlternate" value="true"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-    <details key="imageBaseURI" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/plugins/org.eclipse.oomph.setup.git.edit/icons/full/obj16"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="GitCloneTask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/EcoreXXX">
-      <details key="constraints" value="IDRequired LocationOptional"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-        <eAnnotations source="Choice">
-          <details key="value" value="${installation.location/git/}${@id.locationQualifier|trim}${@id.remoteURI|gitRepository}"/>
-          <details key="label" value="Located in a folder named 'git/&lt;repo>' within the installation folder"/>
-        </eAnnotations>
-        <eAnnotations source="Choice">
-          <details key="value" value="${workspace.location/.git/}${@id.locationQualifier|trim}${@id.remoteURI|gitRepository}"/>
-          <details key="label" value="Located in a folder named '.git/&lt;repo>' within the workspace folder"/>
-        </eAnnotations>
-        <eAnnotations source="Choice">
-          <details key="value" value="${git.container.root/}${@id.locationQualifier|trim}${@id.remoteURI|gitRepository}"/>
-          <details key="label" value="Located in a folder named '&lt;repo>' within the root Git-container folder "/>
-        </eAnnotations>
-        <eAnnotations source="Choice">
-          <details key="value" value="${git.container.root/}${@id.locationQualifier|trim}${@id.remoteURI|gitRepository}-${@id.checkoutBranch}"/>
-          <details key="label" value="Located in a folder named '&lt;repo>-&lt;branch>' within the root Git-container folder "/>
-        </eAnnotations>
-        <eAnnotations source="Choice">
-          <details key="value" value="${git.container.root/}${@id.locationQualifier|trim}${@id.remoteURI|gitRepository/}${@id.checkoutBranch}"/>
-          <details key="label" value="Located in a folder named '&lt;repo>/&lt;branch>' within the root Git-container folder "/>
-        </eAnnotations>
-        <eAnnotations source="Choice">
-          <details key="value" value="${@id.location}"/>
-          <details key="label" value="Located in the specified absolute folder location"/>
-        </eAnnotations>
-        <details key="filter" value="canonical"/>
-        <details key="type" value="STRING"/>
-        <details key="label" value="Git clone location rule"/>
-        <details key="description" value="The rule for the absolute folder location where the Git clone is located"/>
-        <details key="explicitType" value="FOLDER"/>
-        <details key="explicitLabel" value="${@id.description} Git clone location"/>
-        <details key="explicitDescription" value="The absolute folder location where the ${@id.description} Git clone is located"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/RuleVariable">
-        <details key="name" value="git.container.root"/>
-        <details key="type" value="FOLDER"/>
-        <details key="label" value="Root Git-container folder"/>
-        <details key="defaultValue" value="${user.home/git}"/>
-        <details key="description" value="The root Git-container folder where all the Git clones are located"/>
-        <details key="storageURI" value="scope://"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationQualifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral=" "/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remoteName" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" defaultValueLiteral="origin"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remoteURI" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/RemoteResource"/>
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/Redirect"/>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pushURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/Redirect"/>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="checkoutBranch" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" defaultValueLiteral="${scope.project.stream.name}"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="recursive" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="configSections" upperBound="-1"
-        eType="#//ConfigSection" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="restrictToCheckoutBranch"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConfigSection" eSuperTypes="#//ConfigSubsection">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subsections" upperBound="-1"
-        eType="#//ConfigSubsection" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConfigSubsection">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//ConfigProperty" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConfigProperty">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/utils_dev/oomph/setups/models/JDT.ecore b/utils_dev/oomph/setups/models/JDT.ecore
deleted file mode 100644
index 1b322b2bb6..0000000000
--- a/utils_dev/oomph/setups/models/JDT.ecore
+++ /dev/null
@@ -1,726 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="jdt" nsURI="http://www.eclipse.org/oomph/setup/jdt/1.0" nsPrefix="jdt">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="schemaLocation" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-    <details key="variableName" value="setup.jdt.p2"/>
-    <details key="repository" value="${oomph.update.url}"/>
-    <details key="installableUnits" value="org.eclipse.oomph.setup.jdt.feature.group"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-    <details key="imageBaseURI" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/plugins/org.eclipse.oomph.setup.jdt.edit/icons/full/obj16"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="JRETask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.2}"/>
-        <details key="label" value="JRE 1.2 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.3}"/>
-        <details key="label" value="JRE 1.3 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.4}"/>
-        <details key="label" value="JRE 1.4 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.5}"/>
-        <details key="label" value="JRE 1.5 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.6}"/>
-        <details key="label" value="JRE 1.6 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.7}"/>
-        <details key="label" value="JRE 1.7 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.8}"/>
-        <details key="label" value="JRE 1.8 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-9}"/>
-        <details key="label" value="JRE 9 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-10}"/>
-        <details key="label" value="JRE 10 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-11}"/>
-        <details key="label" value="JRE 11 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-12}"/>
-        <details key="label" value="JRE 12 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-13}"/>
-        <details key="label" value="JRE 13 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-14}"/>
-        <details key="label" value="JRE 14 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-15}"/>
-        <details key="label" value="JRE 15 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-16}"/>
-        <details key="label" value="JRE 16 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-1.1"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 1.1 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 1.1."/>
-      <details key="version" value="JRE-1.1"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.3}"/>
-        <details key="label" value="JRE 1.3 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.4}"/>
-        <details key="label" value="JRE 1.4 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.5}"/>
-        <details key="label" value="JRE 1.5 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.6}"/>
-        <details key="label" value="JRE 1.6 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.7}"/>
-        <details key="label" value="JRE 1.7 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.8}"/>
-        <details key="label" value="JRE 1.8 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-9}"/>
-        <details key="label" value="JRE 9 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-10}"/>
-        <details key="label" value="JRE 10 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-11}"/>
-        <details key="label" value="JRE 11 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-12}"/>
-        <details key="label" value="JRE 12 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-13}"/>
-        <details key="label" value="JRE 13 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-14}"/>
-        <details key="label" value="JRE 14 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-15}"/>
-        <details key="label" value="JRE 15 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-16}"/>
-        <details key="label" value="JRE 16 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-1.2"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 1.2 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 1.2."/>
-      <details key="version" value="J2SE-1.2"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.4}"/>
-        <details key="label" value="JRE 1.4 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.5}"/>
-        <details key="label" value="JRE 1.5 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.6}"/>
-        <details key="label" value="JRE 1.6 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.7}"/>
-        <details key="label" value="JRE 1.7 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.8}"/>
-        <details key="label" value="JRE 1.8 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-9}"/>
-        <details key="label" value="JRE 9 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-10}"/>
-        <details key="label" value="JRE 10 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-11}"/>
-        <details key="label" value="JRE 11 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-12}"/>
-        <details key="label" value="JRE 12 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-13}"/>
-        <details key="label" value="JRE 13 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-14}"/>
-        <details key="label" value="JRE 14 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-15}"/>
-        <details key="label" value="JRE 15 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-16}"/>
-        <details key="label" value="JRE 16 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-1.3"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 1.3 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 1.3."/>
-      <details key="version" value="J2SE-1.3"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.5}"/>
-        <details key="label" value="JRE 1.5 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.6}"/>
-        <details key="label" value="JRE 1.6 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.7}"/>
-        <details key="label" value="JRE 1.7 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.8}"/>
-        <details key="label" value="JRE 1.8 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-9}"/>
-        <details key="label" value="JRE 9 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-10}"/>
-        <details key="label" value="JRE 10 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-11}"/>
-        <details key="label" value="JRE 11 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-12}"/>
-        <details key="label" value="JRE 12 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-13}"/>
-        <details key="label" value="JRE 13 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-14}"/>
-        <details key="label" value="JRE 14 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-15}"/>
-        <details key="label" value="JRE 15 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-16}"/>
-        <details key="label" value="JRE 16 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-1.4"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 1.4 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 1.4."/>
-      <details key="version" value="J2SE-1.4"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.6}"/>
-        <details key="label" value="JRE 1.6 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.7}"/>
-        <details key="label" value="JRE 1.7 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.8}"/>
-        <details key="label" value="JRE 1.8 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-9}"/>
-        <details key="label" value="JRE 9 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-10}"/>
-        <details key="label" value="JRE 10 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-11}"/>
-        <details key="label" value="JRE 11 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-12}"/>
-        <details key="label" value="JRE 12 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-13}"/>
-        <details key="label" value="JRE 13 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-14}"/>
-        <details key="label" value="JRE 14 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-15}"/>
-        <details key="label" value="JRE 15 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-16}"/>
-        <details key="label" value="JRE 16 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-1.5"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 1.5 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 1.5."/>
-      <details key="version" value="J2SE-1.5"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.7}"/>
-        <details key="label" value="JRE 1.7 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.8}"/>
-        <details key="label" value="JRE 1.8 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-9}"/>
-        <details key="label" value="JRE 9 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-10}"/>
-        <details key="label" value="JRE 10 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-11}"/>
-        <details key="label" value="JRE 11 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-12}"/>
-        <details key="label" value="JRE 12 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-13}"/>
-        <details key="label" value="JRE 13 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-14}"/>
-        <details key="label" value="JRE 14 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-15}"/>
-        <details key="label" value="JRE 15 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-16}"/>
-        <details key="label" value="JRE 16 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-1.6"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 1.6 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 1.6."/>
-      <details key="version" value="JavaSE-1.6"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-1.8}"/>
-        <details key="label" value="JRE 1.8 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-9}"/>
-        <details key="label" value="JRE 9 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-10}"/>
-        <details key="label" value="JRE 10 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-11}"/>
-        <details key="label" value="JRE 11 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-12}"/>
-        <details key="label" value="JRE 12 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-13}"/>
-        <details key="label" value="JRE 13 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-14}"/>
-        <details key="label" value="JRE 14 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-15}"/>
-        <details key="label" value="JRE 15 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-16}"/>
-        <details key="label" value="JRE 16 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-1.7"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 1.7 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 1.7."/>
-      <details key="version" value="JavaSE-1.7"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-9}"/>
-        <details key="label" value="JRE 9 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-10}"/>
-        <details key="label" value="JRE 10 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-11}"/>
-        <details key="label" value="JRE 11 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-12}"/>
-        <details key="label" value="JRE 12 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-13}"/>
-        <details key="label" value="JRE 13 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-14}"/>
-        <details key="label" value="JRE 14 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-15}"/>
-        <details key="label" value="JRE 15 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-16}"/>
-        <details key="label" value="JRE 16 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-1.8"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 1.8 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 1.8."/>
-      <details key="version" value="JavaSE-1.8"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-10}"/>
-        <details key="label" value="JRE 10 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-11}"/>
-        <details key="label" value="JRE 11 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-12}"/>
-        <details key="label" value="JRE 12 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-13}"/>
-        <details key="label" value="JRE 13 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-14}"/>
-        <details key="label" value="JRE 14 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-15}"/>
-        <details key="label" value="JRE 15 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-16}"/>
-        <details key="label" value="JRE 16 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-9"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 9 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 9."/>
-      <details key="version" value="JavaSE-9"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-11}"/>
-        <details key="label" value="JRE 11 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-12}"/>
-        <details key="label" value="JRE 12 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-13}"/>
-        <details key="label" value="JRE 13 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-14}"/>
-        <details key="label" value="JRE 14 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-15}"/>
-        <details key="label" value="JRE 15 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-16}"/>
-        <details key="label" value="JRE 16 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-10"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 10 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 10."/>
-      <details key="version" value="JavaSE-10"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-12}"/>
-        <details key="label" value="JRE 12 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-13}"/>
-        <details key="label" value="JRE 13 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-14}"/>
-        <details key="label" value="JRE 14 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-15}"/>
-        <details key="label" value="JRE 15 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-16}"/>
-        <details key="label" value="JRE 16 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-11"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 11 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 11."/>
-      <details key="version" value="JavaSE-11"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-13}"/>
-        <details key="label" value="JRE 13 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-14}"/>
-        <details key="label" value="JRE 14 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-15}"/>
-        <details key="label" value="JRE 15 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-16}"/>
-        <details key="label" value="JRE 16 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-12"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 12 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 12."/>
-      <details key="version" value="JavaSE-12"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-14}"/>
-        <details key="label" value="JRE 14 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-15}"/>
-        <details key="label" value="JRE 15 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-16}"/>
-        <details key="label" value="JRE 16 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-13"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 13 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 13."/>
-      <details key="version" value="JavaSE-13"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-15}"/>
-        <details key="label" value="JRE 15 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-16}"/>
-        <details key="label" value="JRE 16 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-14"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 14 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 14."/>
-      <details key="version" value="JavaSE-14"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-16}"/>
-        <details key="label" value="JRE 16 Location"/>
-      </eAnnotations>
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-15"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 15 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 15."/>
-      <details key="version" value="JavaSE-15"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <eAnnotations source="Choice">
-        <details key="value" value="${jre.location-17}"/>
-        <details key="label" value="JRE 17 Location"/>
-      </eAnnotations>
-      <details key="name" value="jre.location-16"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 16 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 15."/>
-      <details key="version" value="JavaSE-16"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-      <details key="name" value="jre.location-17"/>
-      <details key="type" value="JRE"/>
-      <details key="label" value="JRE 17 Location"/>
-      <details key="description" value="The location of a JDK or JRE compatible with Java 17."/>
-      <details key="version" value="JavaSE-17"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="vMInstallType" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" defaultValueLiteral="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="vmInstallType"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="executionEnvironmentDefault"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="vMArguments" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="vmArguments"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="jRELibraries" upperBound="-1"
-        eType="#//JRELibrary" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A list of JRE Library JARs for which external annotations are being supplied."/>
-      </eAnnotations>
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="jreLibrary"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JRELibrary">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="libraryPath" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The path, relative to the JRE location, of the JRE library JAR."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="externalAnnotationsPath"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The absolute workspace path to a folder or ZIP file containing external nullability annotations for classes in the JRE library JAR."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/utils_dev/oomph/setups/models/Launching.ecore b/utils_dev/oomph/setups/models/Launching.ecore
deleted file mode 100644
index 9889036fd3..0000000000
--- a/utils_dev/oomph/setups/models/Launching.ecore
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="launching" nsURI="http://www.eclipse.org/oomph/setup/launching/1.0"
-    nsPrefix="launching">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="schemaLocation" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Launching.ecore"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-    <details key="variableName" value="setup.launching.p2"/>
-    <details key="repository" value="${oomph.update.url}"/>
-    <details key="installableUnits" value="org.eclipse.oomph.setup.launching.feature.group"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-    <details key="imageBaseURI" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/plugins/org.eclipse.oomph.setup.launching.edit/icons/full/obj16"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="LaunchTask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="launcher" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="runEveryStartup" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/utils_dev/oomph/setups/models/Maven.ecore b/utils_dev/oomph/setups/models/Maven.ecore
deleted file mode 100644
index 435811cc0b..0000000000
--- a/utils_dev/oomph/setups/models/Maven.ecore
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="maven" nsURI="http://www.eclipse.org/oomph/setup/maven/1.0"
-    nsPrefix="maven">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="schemaLocation" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-    <details key="variableName" value="setup.maven.p2"/>
-    <details key="repository" value="${oomph.update.url}"/>
-    <details key="installableUnits" value="org.eclipse.oomph.setup.maven.feature.group"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-    <details key="variableName" value="setup.m2e.p2"/>
-    <details key="repository" value="http://download.eclipse.org/technology/m2e/milestones/1.5"/>
-    <details key="installableUnits" value="org.eclipse.m2e.feature.feature.group"/>
-    <details key="releaseTrainAlternate" value="true"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-    <details key="variableName" value="setup.webtools.p2"/>
-    <details key="repository" value="http://download.eclipse.org/webtools/repository/luna"/>
-    <details key="releaseTrainAlternate" value="true"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-    <details key="imageBaseURI" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/plugins/org.eclipse.oomph.setup.maven.edit/icons/full/obj16"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="MavenImportTask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceLocators" lowerBound="1"
-        upperBound="-1" eType="ecore:EClass http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Resources.ecore#//SourceLocator"
-        containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="sourceLocator"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectNameTemplate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="profiles" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="profile"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MavenUpdateTask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectNamePatterns" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="projectNamePattern"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="offline" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="updateSnapshots" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/utils_dev/oomph/setups/models/Mylyn.ecore b/utils_dev/oomph/setups/models/Mylyn.ecore
deleted file mode 100644
index c8754b20d9..0000000000
--- a/utils_dev/oomph/setups/models/Mylyn.ecore
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mylyn" nsURI="http://www.eclipse.org/oomph/setup/mylyn/1.0"
-    nsPrefix="mylyn">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="schemaLocation" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-    <details key="variableName" value="setup.mylyn.p2"/>
-    <details key="repository" value="${oomph.update.url}"/>
-    <details key="installableUnits" value="org.eclipse.oomph.setup.mylyn.feature.group"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-    <details key="variableName" value="setup.mylyn.updates.p2"/>
-    <details key="repository" value="http://download.eclipse.org/mylyn/releases/latest"/>
-    <details key="releaseTrainAlternate" value="true"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-    <details key="imageBaseURI" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/plugins/org.eclipse.oomph.setup.mylyn.edit/icons/full/obj16"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="MylynQueriesTask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-      <details key="installableUnits" value="org.eclipse.mylyn.tasks.core org.eclipse.mylyn.tasks.ui"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="connectorKind" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" defaultValueLiteral="bugzilla"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="repositoryURL" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/Redirect"/>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="userID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="password" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="queries" upperBound="-1"
-        eType="#//Query" containment="true" eOpposite="#//Query/task">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="query"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MylynBuildsTask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-      <details key="installableUnits" value="org.eclipse.mylyn.tasks.core org.eclipse.mylyn.tasks.ui"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="connectorKind" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" defaultValueLiteral="org.eclipse.mylyn.hudson"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="serverURL" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/Redirect"/>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="userID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="password" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="buildPlans" upperBound="-1"
-        eType="#//BuildPlan" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="buildPlan"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BuildPlan" eSuperTypes="http://www.eclipse.org/oomph/base/1.0#//ModelElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Query" eSuperTypes="http://www.eclipse.org/oomph/base/1.0#//ModelElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="task" eType="#//MylynQueriesTask"
-        eOpposite="#//MylynQueriesTask/queries"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="summary" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uRL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="url"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/Redirect"/>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
-        eType="#//QueryAttribute" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="attribute"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="QueryAttribute" instanceClassName="java.util.Map$Entry">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/utils_dev/oomph/setups/models/PDE.ecore b/utils_dev/oomph/setups/models/PDE.ecore
deleted file mode 100644
index a72399f3a9..0000000000
--- a/utils_dev/oomph/setups/models/PDE.ecore
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="pde" nsURI="http://www.eclipse.org/oomph/setup/pde/1.0" nsPrefix="pde">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="schemaLocation" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-    <details key="variableName" value="setup.pde.p2"/>
-    <details key="repository" value="${oomph.update.url}"/>
-    <details key="installableUnits" value="org.eclipse.oomph.setup.pde.feature.group"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-    <details key="imageBaseURI" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/plugins/org.eclipse.oomph.setup.pde.edit/icons/full/obj16"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="TargetPlatformTask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractAPIBaselineTask" abstract="true"
-      eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="APIBaselineTask" eSuperTypes="#//AbstractAPIBaselineTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-        <eAnnotations source="Choice">
-          <details key="value" value="${api.baselines.root/}${@id.name|lower}-${@id.version}"/>
-          <details key="label" value="Located in a folder named '&lt;name>-&lt;version>' within the root API baselines folder"/>
-        </eAnnotations>
-        <eAnnotations source="Choice">
-          <details key="value" value="${installation.location/baselines/}${@id.name|lower}-${@id.version}"/>
-          <details key="label" value="Located in a folder named 'baselines/&lt;name>-&lt;version>' within the installation folder"/>
-        </eAnnotations>
-        <eAnnotations source="Choice">
-          <details key="value" value="${workspace.location/.baselines/}${@id.name|lower}-${@id.version}"/>
-          <details key="label" value="Located in a folder named '.baselines/&lt;name>-&lt;version>' within the workspace folder"/>
-        </eAnnotations>
-        <eAnnotations source="Choice">
-          <details key="value" value="${@id.location}"/>
-          <details key="label" value="Located in the specified absolute folder location"/>
-        </eAnnotations>
-        <details key="type" value="STRING"/>
-        <details key="label" value="API baseline location rule"/>
-        <details key="description" value="The rule for the absolute folder location where the API baseline is located"/>
-        <details key="explicitType" value="FOLDER"/>
-        <details key="explicitLabel" value="${@id.name}-${@id.version} API baseline location"/>
-        <details key="explicitDescription" value="The absolute folder location where the ${@id.name}-${@id.version} API baseline is located"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/RuleVariable">
-        <details key="name" value="api.baselines.root"/>
-        <details key="type" value="FOLDER"/>
-        <details key="label" value="Root API baselines folder"/>
-        <details key="description" value="The root API baselines folder where all the API baselines are located"/>
-        <details key="storageURI" value="scope://"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remoteURI" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/RemoteResource"/>
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/Redirect"/>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="APIBaselineFromTargetTask" eSuperTypes="#//AbstractAPIBaselineTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetName" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" defaultValueLiteral="">
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/Variable">
-        <eAnnotations source="Choice">
-          <details key="value" value="${api.baselines.root/}${@id.name|lower}-${@id.version}"/>
-          <details key="label" value="Located in a folder named '&lt;name>-&lt;version>' within the root API baselines folder"/>
-        </eAnnotations>
-        <eAnnotations source="Choice">
-          <details key="value" value="${installation.location/baselines/}${@id.name|lower}-${@id.version}"/>
-          <details key="label" value="Located in a folder named 'baselines/&lt;name>-&lt;version>' within the installation folder"/>
-        </eAnnotations>
-        <eAnnotations source="Choice">
-          <details key="value" value="${workspace.location/.baselines/}${@id.name|lower}-${@id.version}"/>
-          <details key="label" value="Located in a folder named '.baselines/&lt;name>-&lt;version>' within the workspace folder"/>
-        </eAnnotations>
-        <eAnnotations source="Choice">
-          <details key="value" value="${@id.location}"/>
-          <details key="label" value="Located in the specified absolute folder location"/>
-        </eAnnotations>
-        <details key="type" value="STRING"/>
-        <details key="label" value="API baseline location rule"/>
-        <details key="description" value="The rule for the absolute folder location where the API baseline is located"/>
-        <details key="explicitType" value="FOLDER"/>
-        <details key="explicitLabel" value="${@id.name}-${@id.version} API baseline location"/>
-        <details key="explicitDescription" value="The absolute folder location where the ${@id.name}-${@id.version} API baseline is located"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/RuleVariable">
-        <details key="name" value="api.baselines.root"/>
-        <details key="type" value="FOLDER"/>
-        <details key="label" value="Root API baselines folder"/>
-        <details key="description" value="The root API baselines folder where all the API baselines are located"/>
-        <details key="storageURI" value="scope://"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/utils_dev/oomph/setups/models/Predicates.ecore b/utils_dev/oomph/setups/models/Predicates.ecore
deleted file mode 100644
index f659f84dd1..0000000000
--- a/utils_dev/oomph/setups/models/Predicates.ecore
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="predicates" nsURI="http://www.eclipse.org/oomph/predicates/1.0"
-    nsPrefix="predicates">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="schemaLocation" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-    <details key="imageBaseURI" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/plugins/org.eclipse.oomph.predicates.edit/icons/full/obj16"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="Predicate" abstract="true" eSuperTypes="http://www.eclipse.org/oomph/base/1.0#//ModelElement">
-    <eOperations name="matches" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eParameters name="resource" eType="#//Resource"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NamePredicate" eSuperTypes="#//Predicate">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pattern" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CommentPredicate" eSuperTypes="#//Predicate">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pattern" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LocationPredicate" eSuperTypes="#//Predicate">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pattern" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RepositoryPredicate" eSuperTypes="#//Predicate">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="project" eType="#//Project"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AndPredicate" eSuperTypes="#//Predicate">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="operands" upperBound="-1"
-        eType="#//Predicate" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="operand"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OrPredicate" eSuperTypes="#//Predicate">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="operands" upperBound="-1"
-        eType="#//Predicate" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="operand"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NotPredicate" eSuperTypes="#//Predicate">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="operand" eType="#//Predicate"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NaturePredicate" eSuperTypes="#//Predicate">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nature" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BuilderPredicate" eSuperTypes="#//Predicate">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="builder" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FilePredicate" eSuperTypes="#//Predicate">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="filePattern" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="contentPattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ImportedPredicate" eSuperTypes="#//Predicate">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="accessible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="Project" instanceClassName="org.eclipse.core.resources.IProject"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Resource" instanceClassName="org.eclipse.core.resources.IResource"/>
-</ecore:EPackage>
diff --git a/utils_dev/oomph/setups/models/ProjectSet.ecore b/utils_dev/oomph/setups/models/ProjectSet.ecore
deleted file mode 100644
index 625a22aa8a..0000000000
--- a/utils_dev/oomph/setups/models/ProjectSet.ecore
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="projectset" nsURI="http://www.eclipse.org/oomph/setup/projectset/1.0"
-    nsPrefix="projectset">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="schemaLocation" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/ProjectSet.ecore"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-    <details key="variableName" value="setup.projectset.p2"/>
-    <details key="repository" value="${oomph.update.url}"/>
-    <details key="installableUnits" value="org.eclipse.oomph.setup.projectset.feature.group"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-    <details key="imageBaseURI" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/plugins/org.eclipse.oomph.setup.projectset.edit/icons/full/obj16"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="ProjectSetImportTask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uRL" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/Redirect"/>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/utils_dev/oomph/setups/models/Projects.ecore b/utils_dev/oomph/setups/models/Projects.ecore
deleted file mode 100644
index 2974b16edb..0000000000
--- a/utils_dev/oomph/setups/models/Projects.ecore
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="projects" nsURI="http://www.eclipse.org/oomph/setup/projects/1.0"
-    nsPrefix="projects">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="schemaLocation" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-    <details key="variableName" value="setup.projects.p2"/>
-    <details key="repository" value="${oomph.update.url}"/>
-    <details key="installableUnits" value="org.eclipse.oomph.setup.projects.feature.group"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-    <details key="imageBaseURI" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/plugins/org.eclipse.oomph.setup.projects.edit/icons/full/obj16"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="PathVariableTask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uRI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="uri"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/Redirect"/>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProjectsImportTask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="force" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceLocators" lowerBound="1"
-        upperBound="-1" eType="ecore:EClass http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Resources.ecore#//SourceLocator"
-        containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="sourceLocator"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProjectsBuildTask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="predicates" upperBound="-1"
-        eType="ecore:EClass http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore#//Predicate"
-        containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="predicate"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="onlyNewProjects" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="refresh" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="clean" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="build" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/utils_dev/oomph/setups/models/Resources.ecore b/utils_dev/oomph/setups/models/Resources.ecore
deleted file mode 100644
index 63f65af212..0000000000
--- a/utils_dev/oomph/setups/models/Resources.ecore
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="resources" nsURI="http://www.eclipse.org/oomph/resources/1.0"
-    nsPrefix="resources">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="schemaLocation" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Resources.ecore"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-    <details key="imageBaseURI" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/plugins/org.eclipse.oomph.resources.edit/icons/full/obj16"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="SourceLocator" eSuperTypes="http://www.eclipse.org/oomph/base/1.0#//ModelElement">
-    <eOperations name="matches" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eParameters name="project" eType="ecore:EDataType http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore#//Project"/>
-    </eOperations>
-    <eOperations name="loadProject" eType="ecore:EDataType http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore#//Project">
-      <eParameters name="defaultProjectFactories" upperBound="-1" eType="#//ProjectFactory"/>
-      <eParameters name="backendContainer" eType="#//BackendContainer"/>
-      <eParameters name="monitor" eType="#//ProgressMonitor"/>
-    </eOperations>
-    <eOperations name="handleProjects">
-      <eParameters name="defaultProjectFactories" upperBound="-1" eType="#//ProjectFactory"/>
-      <eParameters name="projectHandler" eType="#//ProjectHandler"/>
-      <eParameters name="status" eType="#//MultiStatus"/>
-      <eParameters name="monitor" eType="#//ProgressMonitor"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rootFolder" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludedPaths" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="excludedPath"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="projectFactories" upperBound="-1"
-        eType="#//ProjectFactory" containment="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="projectFactory"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="predicates" upperBound="-1"
-        eType="ecore:EClass http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore#//Predicate"
-        containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="predicate"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="locateNestedProjects" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProjectFactory" abstract="true" eSuperTypes="http://www.eclipse.org/oomph/base/1.0#//ModelElement">
-    <eOperations name="createProject" eType="ecore:EDataType http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore#//Project">
-      <eParameters name="rootContainer" eType="#//BackendContainer"/>
-      <eParameters name="backendContainer" eType="#//BackendContainer"/>
-      <eParameters name="monitor" eType="#//ProgressMonitor"/>
-    </eOperations>
-    <eOperations name="isExcludedPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eParameters name="rootContainer" eType="#//BackendContainer"/>
-      <eParameters name="backendContainer" eType="#//BackendContainer"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludedPaths" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="excludedPath"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XMLProjectFactory" abstract="true" eSuperTypes="#//ProjectFactory"/>
-  <eClassifiers xsi:type="ecore:EClass" name="EclipseProjectFactory" eSuperTypes="#//XMLProjectFactory"/>
-  <eClassifiers xsi:type="ecore:EClass" name="MavenProjectFactory" eSuperTypes="#//XMLProjectFactory"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="ProjectHandler" instanceClassName="org.eclipse.oomph.resources.ProjectHandler"
-      serializable="false"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="BackendContainer" instanceClassName="org.eclipse.oomph.resources.backend.BackendContainer"
-      serializable="false"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="MultiStatus" instanceClassName="org.eclipse.core.runtime.MultiStatus"
-      serializable="false"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="ProgressMonitor" instanceClassName="org.eclipse.core.runtime.IProgressMonitor"
-      serializable="false"/>
-</ecore:EPackage>
diff --git a/utils_dev/oomph/setups/models/SetupTarglets.ecore b/utils_dev/oomph/setups/models/SetupTarglets.ecore
deleted file mode 100644
index 4e1f2661d2..0000000000
--- a/utils_dev/oomph/setups/models/SetupTarglets.ecore
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="targlets" nsURI="http://www.eclipse.org/oomph/setup/targlets/1.0"
-    nsPrefix="setup.targlets">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="schemaLocation" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-    <details key="variableName" value="setup.targlets.p2"/>
-    <details key="repository" value="${oomph.update.url}"/>
-    <details key="installableUnits" value="org.eclipse.oomph.targlets.feature.group org.eclipse.oomph.setup.targlets.feature.group"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-    <details key="imageBaseURI" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/plugins/org.eclipse.oomph.setup.targlets.edit/icons/full/obj16"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="TargletTask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-      <contents xsi:type="ecore:EReference" name="targlets" upperBound="-1" eType="ecore:EClass http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Targlets.ecore#//Targlet"
-          containment="true"/>
-      <contents xsi:type="ecore:EAttribute" name="targletURIs" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-      <details key="text" value="Targlets"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="targlets" upperBound="-1"
-        eType="ecore:EClass http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Targlets.ecore#//Targlet"
-        containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="targlet"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="targletURIs" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="targletURI"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/Redirect"/>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="operatingSystem" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="windowingSystem" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="architecture" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="locale" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="programArguments" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="vMArguments" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="vmArguments"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="implicitDependencies" upperBound="-1"
-        eType="#//ImplicitDependency" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="implicitDependency"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral="Modular Target"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activateTarget" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplicitDependency">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="id"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/oomph/p2/1.0#//Version"
-        defaultValueLiteral="0.0.0"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/utils_dev/oomph/setups/models/SetupWorkingSets.ecore b/utils_dev/oomph/setups/models/SetupWorkingSets.ecore
deleted file mode 100644
index 02710d2197..0000000000
--- a/utils_dev/oomph/setups/models/SetupWorkingSets.ecore
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="workingsets" nsURI="http://www.eclipse.org/oomph/setup/workingsets/1.0"
-    nsPrefix="setup.workingsets">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="schemaLocation" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-    <details key="variableName" value="setup.workingsets.p2"/>
-    <details key="repository" value="${oomph.update.url}"/>
-    <details key="installableUnits" value="org.eclipse.oomph.setup.workingsets.feature.group"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-    <details key="imageBaseURI" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/plugins/org.eclipse.oomph.setup.workingsets.edit/icons/full/obj16"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkingSetTask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-      <details key="text" value="Working Sets"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="workingSets" upperBound="-1"
-        eType="ecore:EClass http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore#//WorkingSet"
-        containment="true" eKeys="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore#//WorkingSet/name">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="workingSet"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/utils_dev/oomph/setups/models/Targlets.ecore b/utils_dev/oomph/setups/models/Targlets.ecore
deleted file mode 100644
index 7f5cf46198..0000000000
--- a/utils_dev/oomph/setups/models/Targlets.ecore
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="targlets" nsURI="http://www.eclipse.org/oomph/targlets/1.0"
-    nsPrefix="targlets">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="schemaLocation" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Targlets.ecore"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-    <details key="imageBaseURI" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/plugins/org.eclipse.oomph.targlets.edit/icons/full/obj16"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="TargletContainer" eSuperTypes="http://www.eclipse.org/oomph/base/1.0#//ModelElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        iD="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="id"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/oomph/setup/NoExpand"/>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="targlets" upperBound="-1"
-        eType="#//Targlet" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="targlet"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Targlet" eSuperTypes="http://www.eclipse.org/oomph/base/1.0#//ModelElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="requirements" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/oomph/p2/1.0#//Requirement" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="requirement"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceLocators" upperBound="-1"
-        eType="ecore:EClass http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Resources.ecore#//SourceLocator"
-        containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="sourceLocator"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="installableUnitGenerators"
-        upperBound="-1" eType="#//IUGenerator" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="installableUnitGenerator"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="repositoryLists" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/oomph/p2/1.0#//RepositoryList"
-        containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="repositoryList"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="activeRepositoryListName"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="activeRepositoryList"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="activeRepositoryList" eType="ecore:EClass http://www.eclipse.org/oomph/p2/1.0#//RepositoryList"
-        changeable="false" volatile="true" transient="true" derived="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="activeRepository"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="activeRepositories" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/oomph/p2/1.0#//Repository" changeable="false"
-        volatile="true" transient="true" derived="true" resolveProxies="false">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="activeRepository"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="includeSources" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="includeAllPlatforms" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="includeAllRequirements"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="dropinLocations" upperBound="-1"
-        eType="#//DropinLocation" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="dropinLocation"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="includeBinaryEquivalents"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="profileProperties" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ComponentExtension" eSuperTypes="http://www.eclipse.org/oomph/base/1.0#//ModelElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="requirements" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/oomph/p2/1.0#//Requirement" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="requirement"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ComponentDefinition" eSuperTypes="#//ComponentExtension">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="id"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/oomph/p2/1.0#//Version"
-        defaultValueLiteral="1.0.0"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IUGenerator" abstract="true" interface="true"
-      eSuperTypes="http://www.eclipse.org/oomph/base/1.0#//ModelElement">
-    <eOperations name="generateIUs" eExceptions="ecore:EDataType http://www.eclipse.org/oomph/base/1.0#//Exception">
-      <eParameters name="project" eType="ecore:EDataType http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore#//Project"/>
-      <eParameters name="qualifierReplacement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="iuVersions" eType="#//StringToVersionMap"/>
-      <eParameters name="result" upperBound="-1" eType="#//InstallableUnit"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureGenerator" eSuperTypes="#//IUGenerator"/>
-  <eClassifiers xsi:type="ecore:EClass" name="PluginGenerator" eSuperTypes="#//IUGenerator"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ComponentDefGenerator" eSuperTypes="#//IUGenerator"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ComponentExtGenerator" eSuperTypes="#//IUGenerator"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CSpecGenerator" eSuperTypes="#//IUGenerator"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CSpexGenerator" eSuperTypes="#//IUGenerator"/>
-  <eClassifiers xsi:type="ecore:EClass" name="SiteGenerator" eSuperTypes="#//IUGenerator"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CategoryGenerator" eSuperTypes="#//SiteGenerator"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ProductGenerator" eSuperTypes="#//IUGenerator"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ProjectNameGenerator" eSuperTypes="#//IUGenerator"/>
-  <eClassifiers xsi:type="ecore:EClass" name="DropinLocation">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rootFolder" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="recursive" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="InstallableUnit" instanceClassName="org.eclipse.equinox.p2.metadata.IInstallableUnit"
-      serializable="false"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="StringToVersionMap" instanceTypeName="java.util.Map&lt;java.lang.String, org.eclipse.equinox.p2.metadata.Version>"
-      serializable="false"/>
-</ecore:EPackage>
diff --git a/utils_dev/oomph/setups/models/Workbench.ecore b/utils_dev/oomph/setups/models/Workbench.ecore
deleted file mode 100644
index 4d8f4d7a71..0000000000
--- a/utils_dev/oomph/setups/models/Workbench.ecore
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="workbench" nsURI="http://www.eclipse.org/oomph/setup/workbench/1.0"
-    nsPrefix="workbench">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="schemaLocation" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Workbench.ecore"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/setup/Enablement">
-    <details key="variableName" value="setup.workbench.p2"/>
-    <details key="repository" value="${oomph.update.url}"/>
-    <details key="installableUnits" value="org.eclipse.oomph.setup.workbench.feature.group"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-    <details key="imageBaseURI" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/plugins/org.eclipse.oomph.setup.workbench.edit/icons/full/obj16"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="FileAssociationsTask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mappings" lowerBound="1"
-        upperBound="-1" eType="#//FileMapping" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="mapping"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FileMapping" eSuperTypes="http://www.eclipse.org/oomph/base/1.0#//ModelElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="filePattern" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultEditorID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="editors" upperBound="-1"
-        eType="#//FileEditor" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="editor"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FileEditor" eSuperTypes="http://www.eclipse.org/oomph/base/1.0#//ModelElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="id"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="KeyBindingTask" eSuperTypes="http://www.eclipse.org/oomph/setup/1.0#//SetupTask">
-    <eAnnotations source="http://www.eclipse.org/oomph/setup/ValidTriggers">
-      <details key="triggers" value="STARTUP MANUAL"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scheme" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" defaultValueLiteral="org.eclipse.ui.defaultAcceleratorConfiguration"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contexts" lowerBound="1"
-        upperBound="-1" eType="#//KeyBindingContext" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="context"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="platform" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="locale" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="keys" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="command" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="commandParameters" upperBound="-1"
-        eType="#//CommandParameter" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="commandParameter"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="KeyBindingContext" eSuperTypes="http://www.eclipse.org/oomph/base/1.0#//ModelElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral="org.eclipse.ui.contexts.window">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="id"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CommandParameter" eSuperTypes="http://www.eclipse.org/oomph/base/1.0#//ModelElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="id"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/utils_dev/oomph/setups/models/WorkingSets.ecore b/utils_dev/oomph/setups/models/WorkingSets.ecore
deleted file mode 100644
index 051f25737c..0000000000
--- a/utils_dev/oomph/setups/models/WorkingSets.ecore
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="workingsets" nsURI="http://www.eclipse.org/oomph/workingsets/1.0"
-    nsPrefix="workingsets">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="schemaLocation" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/oomph/base/LabelProvider">
-    <details key="imageBaseURI" value="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/plugins/org.eclipse.oomph.workingsets.edit/icons/full/obj16"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkingSet" eSuperTypes="http://www.eclipse.org/oomph/base/1.0#//ModelElement">
-    <eOperations name="matches" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eParameters name="resource" eType="ecore:EDataType http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore#//Resource"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="predicates" upperBound="-1"
-        eType="ecore:EClass http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore#//Predicate"
-        containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="predicate"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="attribute"/>
-        <details key="name" value="id"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkingSetGroup" eSuperTypes="http://www.eclipse.org/oomph/base/1.0#//ModelElement">
-    <eOperations name="getWorkingSet" eType="#//WorkingSet">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="workingSets" upperBound="-1"
-        eType="#//WorkingSet" containment="true" eKeys="#//WorkingSet/name">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="workingSet"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="InclusionPredicate" eSuperTypes="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore#//Predicate">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="includedWorkingSets" upperBound="-1"
-        eType="#//WorkingSet">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="includedWorkingSet"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExclusionPredicate" eSuperTypes="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore#//Predicate">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="excludedWorkingSets" upperBound="-1"
-        eType="#//WorkingSet">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="name" value="excludedWorkingSet"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/utils_dev/oomph/setups/org.eclipse.products.setup b/utils_dev/oomph/setups/org.eclipse.products.setup
deleted file mode 100644
index 1f09b2b050..0000000000
--- a/utils_dev/oomph/setups/org.eclipse.products.setup
+++ /dev/null
@@ -1,474 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<setup:ProductCatalog
-    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"
-    xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
-    name="org.eclipse.products"
-    label="Eclipse.org">
-  <annotation
-      source="http://www.eclipse.org/oomph/setup/BrandingInfo">
-    <detail
-        key="readmePath">
-      <value>readme/readme_eclipse.html</value>
-    </detail>
-    <detail
-        key="notificationURI">
-      <value>https://www.eclipse.org/setups/donate/?scope=${scope}&amp;campaign=2020-12</value>
-    </detail>
-    <detail
-        key="notificationLabel">
-      <value>DONATE</value>
-    </detail>
-    <detail
-        key="notificationTooltip">
-      <value>Donate to the Eclipse Community</value>
-    </detail>
-    <detail
-        key="notificationAnimationStyle">
-      <value>REPEAT</value>
-    </detail>
-  </annotation>
-  <annotation
-      source="http://www.eclipse.org/oomph/setup/StatsSending">
-    <detail
-        key="uri">
-      <value>http://download.eclipse.org/stats/oomph</value>
-    </detail>
-  </annotation>
-  <setupTask
-      xsi:type="setup:InstallationTask"
-      id="installation"/>
-  <setupTask
-      xsi:type="setup.p2:P2Task">
-    <requirement
-        name="org.eclipse.oomph.setup.feature.group"/>
-    <repository
-        url="${oomph.update.url}"/>
-  </setupTask>
-  <product name="epp.package.jee"
-      label="Eclipse IDE for Enterprise Java Developers">
-    <annotation
-        source="http://www.eclipse.org/oomph/setup/BrandingInfo">
-      <detail
-          key="imageURI">
-        <value>http://www.eclipse.org/downloads/images/javaee.png</value>
-      </detail>
-      <detail
-          key="notificationTooltip">
-        <value>Donate to the Eclipse Community for the Eclipse IDE for Enterprise Java Developers</value>
-      </detail>
-    </annotation>
-    <version
-        name="latest.released"
-        label="Latest Release (2020-12)"
-        requiredJavaVersion="11">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
-        <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2020-12/r/eclipse-ide-enterprise-java-developers</value>
-        </detail>
-        <detail
-            key="shortcut">
-          <value>Eclipse IDE for Enterprise Java Developers - Latest Release</value>
-        </detail>
-      </annotation>
-      <setupTask
-          xsi:type="setup.p2:P2Task"
-          label="Eclipse IDE for Enterprise Java Developers (2020-12)">
-        <requirement
-            name="epp.package.jee"
-            versionRange="[4.18.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.18.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.18.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.buildship.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.common.doc.user.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.connectivity.doc.user.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.connectivity.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.connectivity.oda.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.doc.user.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.apache.derby.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.hsqldb.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.ibm.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.ingres.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.jdbc.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.jdt.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.msft.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.mysql.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.oda.designer.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.oda.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.oracle.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.postgresql.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.sap.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.sdk.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.sqlite.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.sybase.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.intro.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.modelbase.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sdk.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.data.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.results.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqltools.doc.user.feature.group"/>
-        <requirement
-            name="org.eclipse.eclemma.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.egit.feature.group"/>
-        <requirement
-            name="org.eclipse.egit.mylyn.feature.group"/>
-        <requirement
-            name="org.eclipse.epp.mpc.feature.group"/>
-        <requirement
-            name="org.eclipse.jdt.feature.group"/>
-        <requirement
-            name="org.eclipse.jpt.common.eclipselink.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jpt.common.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jpt.jaxb.eclipselink.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jpt.jaxb.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jpt.jpa.eclipselink.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jpt.jpa.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jsf.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.enterprise_ui.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.server_adapters.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.server_ui.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.web_ui.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.webpageeditor.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.ws.axis2tools.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.ws.cxf.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.ws.jaxws.dom.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.ws.jaxws.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.m2e.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.m2e.logback.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.m2e.wtp.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.m2e.wtp.jaxrs.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.m2e.wtp.jpa.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.m2e.wtp.jsf.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.mylyn.bugzilla_feature.feature.group"/>
-        <requirement
-            name="org.eclipse.mylyn.context_feature.feature.group"/>
-        <requirement
-            name="org.eclipse.mylyn.ide_feature.feature.group"/>
-        <requirement
-            name="org.eclipse.mylyn.java_feature.feature.group"/>
-        <requirement
-            name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
-        <requirement
-            name="org.eclipse.mylyn_feature.feature.group"/>
-        <requirement
-            name="org.eclipse.pde.feature.group"/>
-        <requirement
-            name="org.eclipse.tips.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.tm.terminal.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.wst.common.fproj.feature.group"/>
-        <requirement
-            name="org.eclipse.wst.server_adapters.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.wst.xsl.feature.feature.group"/>
-        <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12/202012101200"/>
-        <repository
-            url="http://download.eclipse.org/releases/2020-12/202012161000">
-          <annotation
-              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
-        </repository>
-      </setupTask>
-    </version>
-    <version
-        name="2020-12"
-        label="2020-12"
-        requiredJavaVersion="11">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
-        <detail
-            key="status">
-          <value>current</value>
-        </detail>
-        <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2020-12/r/eclipse-ide-enterprise-java-developers</value>
-        </detail>
-        <detail
-            key="shortcut">
-          <value>Eclipse IDE for Enterprise Java Developers - 2020-12</value>
-        </detail>
-      </annotation>
-      <setupTask
-          xsi:type="setup.p2:P2Task"
-          label="Eclipse IDE for Enterprise Java Developers (2020-12)">
-        <requirement
-            name="epp.package.jee"
-            versionRange="[4.18.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.18.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.18.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.buildship.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.common.doc.user.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.connectivity.doc.user.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.connectivity.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.connectivity.oda.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.doc.user.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.apache.derby.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.hsqldb.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.ibm.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.ingres.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.jdbc.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.jdt.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.msft.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.mysql.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.oda.designer.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.oda.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.oracle.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.postgresql.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.sap.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.sdk.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.sqlite.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.enablement.sybase.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.intro.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.modelbase.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sdk.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.data.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.results.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.datatools.sqltools.doc.user.feature.group"/>
-        <requirement
-            name="org.eclipse.eclemma.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.egit.feature.group"/>
-        <requirement
-            name="org.eclipse.egit.mylyn.feature.group"/>
-        <requirement
-            name="org.eclipse.epp.mpc.feature.group"/>
-        <requirement
-            name="org.eclipse.jdt.feature.group"/>
-        <requirement
-            name="org.eclipse.jpt.common.eclipselink.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jpt.common.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jpt.jaxb.eclipselink.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jpt.jaxb.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jpt.jpa.eclipselink.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jpt.jpa.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jsf.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.enterprise_ui.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.server_adapters.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.server_ui.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.web_ui.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.webpageeditor.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.ws.axis2tools.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.ws.cxf.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.ws.jaxws.dom.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.jst.ws.jaxws.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.m2e.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.m2e.logback.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.m2e.wtp.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.m2e.wtp.jaxrs.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.m2e.wtp.jpa.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.m2e.wtp.jsf.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.mylyn.bugzilla_feature.feature.group"/>
-        <requirement
-            name="org.eclipse.mylyn.context_feature.feature.group"/>
-        <requirement
-            name="org.eclipse.mylyn.ide_feature.feature.group"/>
-        <requirement
-            name="org.eclipse.mylyn.java_feature.feature.group"/>
-        <requirement
-            name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
-        <requirement
-            name="org.eclipse.mylyn_feature.feature.group"/>
-        <requirement
-            name="org.eclipse.pde.feature.group"/>
-        <requirement
-            name="org.eclipse.tips.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.tm.terminal.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.wst.common.fproj.feature.group"/>
-        <requirement
-            name="org.eclipse.wst.server_adapters.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.wst.xsl.feature.feature.group"/>
-        <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12/202012101200"/>
-        <repository
-            url="http://download.eclipse.org/releases/2020-12/202012161000">
-          <annotation
-              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
-        </repository>
-      </setupTask>
-    </version>
-    <description>
-      Tools for developers working with Java and Web applications, including a Java IDE, tools for JavaScript, TypeScript, JavaServer Pages and Faces, Yaml, Markdown, Web Services, JPA and Data Tools, Maven and Gradle, Git, and more.&lt;br/>
-      &lt;br/>
-      Click &lt;a href=&quot;https://bugs.eclipse.org/bugs/enter_bug.cgi?classification=WebTools&quot;>here&lt;/a> to file a bug against Eclipse Web Tools Platform.&lt;br/>
-      Click &lt;a href=&quot;https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Platform&quot;>here&lt;/a> to file a bug against Eclipse Platform.&lt;br/>
-      Click &lt;a href=&quot;https://bugs.eclipse.org/bugs/enter_bug.cgi?product=M2E-WTP&quot;>here&lt;/a> to file a bug against Maven integration for web projects.&lt;br/>
-      Click &lt;a href=&quot;https://github.com/eclipse/wildwebdeveloper/issues/new&quot;>here&lt;/a> to report an issue against Eclipse Wild Web Developer (incubating).&lt;br/>
-      &lt;br/>
-    </description>
-  </product>
-  <description>The catalog of products available as &lt;a href='https://www.eclipse.org/downloads/'>packaged downloads&lt;/a> at Eclipse.org.</description>
-</setup:ProductCatalog>
diff --git a/utils_dev/oomph/setups/org.eclipse.setup b/utils_dev/oomph/setups/org.eclipse.setup
deleted file mode 100644
index d3e66d40b9..0000000000
--- a/utils_dev/oomph/setups/org.eclipse.setup
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<setup:Index
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
-    name="Eclipse">
-  <annotation
-      source="http://www.eclipse.org/oomph/setup/BrandingInfo">
-    <detail
-        key="notificationURI">
-      <value>https://www.eclipse.org/setups/donate/?scope=${scope}&amp;version=${scope.version}&amp;campaign=2020-06</value>
-    </detail>
-  </annotation>
-  <annotation
-      source="http://www.eclipse.org/oomph/setup/JRE">
-    <reference
-        href="org.eclipse.jres.setup#/"/>
-  </annotation>
-  <discoverablePackage
-      href="models/Git.ecore#/"/>
-  <discoverablePackage
-      href="models/JDT.ecore#/"/>
-  <discoverablePackage
-      href="models/Launching.ecore#/"/>
-  <discoverablePackage
-      href="models/Maven.ecore#/"/>
-  <discoverablePackage
-      href="models/Mylyn.ecore#/"/>
-  <discoverablePackage
-      href="models/PDE.ecore#/"/>
-  <discoverablePackage
-      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore#/"/>
-  <discoverablePackage
-      href="models/Projects.ecore#/"/>
-  <discoverablePackage
-      href="models/ProjectSet.ecore#/"/>
-  <discoverablePackage
-      href="models/Resources.ecore#/"/>
-  <discoverablePackage
-      href="models/SetupTarglets.ecore#/"/>
-  <discoverablePackage
-      href="models/SetupWorkingSets.ecore#/"/>
-  <discoverablePackage
-      href="models/Targlets.ecore#/"/>
-  <discoverablePackage
-      href="models/Workbench.ecore#/"/>
-  <discoverablePackage
-      href="models/WorkingSets.ecore#/"/>
-  <productCatalog
-      href="org.eclipse.products.setup#/"/>
-  <projectCatalog
-      href="idempiere.projects.setup#/"/>
-</setup:Index>