diff --git a/.gitmodules b/.gitmodules
index d67967901fbdda8b21b43672c3788a5e4ba7fb91..02fdf01cc196c34e9890ea9d7648519c2f8f3dfd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,3 +14,15 @@
 [submodule "tests/af3"]
 	path = tests/af3
 	url = https://git.fortiss.org/af3/product-tests.git
+[submodule "features/af3"]
+	path = features/af3
+	url = https://git.fortiss.org/af3/af3-features.git
+	branch = master
+[submodule "features/tooling"]
+	path = features/tooling
+	url = https://git.fortiss.org/af3/tooling-features.git
+	branch = master
+[submodule "products/af3"]
+	path = products/af3
+	url = https://git.fortiss.org/af3/af3-products.git
+	branch = master
diff --git a/features/af3 b/features/af3
new file mode 160000
index 0000000000000000000000000000000000000000..b59fad99b1136713e3c06f1a3fd1885523e3bff6
--- /dev/null
+++ b/features/af3
@@ -0,0 +1 @@
+Subproject commit b59fad99b1136713e3c06f1a3fd1885523e3bff6
diff --git a/features/org.fortiss.af3.phoenix.feature/build.properties b/features/org.fortiss.af3.phoenix.feature/build.properties
deleted file mode 100644
index 64f93a9f0b7328eb563aa5ad6cec7f828020e124..0000000000000000000000000000000000000000
--- a/features/org.fortiss.af3.phoenix.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.fortiss.af3.phoenix.feature/feature.xml b/features/org.fortiss.af3.phoenix.feature/feature.xml
deleted file mode 100644
index 69009a99f7f6aa26ff7d313a819ded35d13e420d..0000000000000000000000000000000000000000
--- a/features/org.fortiss.af3.phoenix.feature/feature.xml
+++ /dev/null
@@ -1,973 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.fortiss.af3.phoenix.feature"
-      label="AF3 Phoenix Feature"
-      version="2.14.0.qualifier"
-      provider-name="fortiss GmbH">
-
-   <description url="http://af3.fortiss.org/">
-      This feature is composed of the plugins for the Phoenix release.
-   </description>
-
-   <copyright>
-      Copyright 2011-2019 ForTISS GmbH
-   </copyright>
-
-   <license url="http://www.apache.org/licenses/LICENSE-2.0">
-      Copyright 2019 ForTISS GmbH
-
-Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-  http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-   </license>
-
-   <plugin
-         id="com.microsoft.z3"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="eu.fbk.af3.tools.diagram"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="eu.fbk.af3.tools.diagram.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.pragmatictransformation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.allocation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.allocation.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.component"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.component.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.cosimulation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.cosimulation.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.deployment"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.deployment.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.exploration"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.exploration.smt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.exploration.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.expression"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.expression.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.generator.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.mira"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.mira.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.mode"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.mode.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.msc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.msc.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.ocra"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.operatorpanel"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.operatorpanel.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.partition"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.partition.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.platform"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.platform.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.platform.beagle"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.platform.beagle.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.platform.hierarchic"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.platform.hierarchic.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.project"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.project.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.rcp.application"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.refinement"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.refinement.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.safety"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.safety.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.safetycases"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.safetycases.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.schedule"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.schedule.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.specification"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.specification.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.state"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.state.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.task"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.task.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.testing"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.testing.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.timing"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.timing.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.af3.tools"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.junit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.core.resources"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.ide"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.contenttype"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.app"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.preferences"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.registry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.services"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.servlet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.jobs"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jface"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.commands"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.swt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.workbench"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jface.databinding"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.databinding"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.databinding.observable"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.databinding.property"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.expressions"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.ibm.icu"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jface.text"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.text"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.engine"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.metadata"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.metadata.repository"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.repository"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.filetransfer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.identity"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.provider.filetransfer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.net"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.concurrent"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.forms"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gef"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.draw2d"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.editors"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.workbench.texteditor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views.properties.tabbed"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.compare"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.compare.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filebuffers"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.ecore"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.ecore.xmi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.transaction"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.validation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.ecore.change"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.launcher"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.databinding"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.databinding.beans"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.director"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.ide.application"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.nebula.widgets.grid"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.intro"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.intro.universal"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.swtbot.eclipse.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.swtbot.eclipse.finder"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.swtbot.forms.finder"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.swtbot.junit4_x"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.swtbot.swt.finder"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.log4j"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.junit.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.junit4.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <!--plugin
-         id="org.hamcrest"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.hamcrest.integration"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.hamcrest.library"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.hamcrest.text"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/-->
-
-</feature>
diff --git a/features/org.fortiss.af3.phoenix.feature/pom.xml b/features/org.fortiss.af3.phoenix.feature/pom.xml
deleted file mode 100644
index 2033238c8b9965df743ba6aec84bcb9c8fd22aee..0000000000000000000000000000000000000000
--- a/features/org.fortiss.af3.phoenix.feature/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <name>AF3 Phoenix Continuous Feature</name>
-  <artifactId>org.fortiss.af3.phoenix.feature</artifactId>
-  <version>2.14.0-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-
-  <parent>
-    <groupId>org.fortiss.af3</groupId>
-    <artifactId>org.fortiss.af3.features</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-</project>
diff --git a/features/org.fortiss.tooling.feature/build.properties b/features/org.fortiss.tooling.feature/build.properties
deleted file mode 100644
index 64f93a9f0b7328eb563aa5ad6cec7f828020e124..0000000000000000000000000000000000000000
--- a/features/org.fortiss.tooling.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.fortiss.tooling.feature/feature.xml b/features/org.fortiss.tooling.feature/feature.xml
deleted file mode 100644
index c7e1ad53bcbc054eb0bf2b112211813e73c1478c..0000000000000000000000000000000000000000
--- a/features/org.fortiss.tooling.feature/feature.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.fortiss.tooling.feature"
-      label="Fortiss Tooling Kernel 2.14-LATEST Feature"
-      version="2.14.0.qualifier"
-      provider-name="fortiss GmbH">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <plugin
-         id="org.fortiss.tooling.base"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.tooling.base.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.tooling.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.tooling.common.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.tooling.graphicsGL"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.tooling.graphicsGL.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.tooling.kernel"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.tooling.kernel.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.fortiss.tooling.spiderchart.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.fortiss.tooling.feature/pom.xml b/features/org.fortiss.tooling.feature/pom.xml
deleted file mode 100644
index d4ece28c5b0a12d7dc4ba3c69b8bcab44560bd74..0000000000000000000000000000000000000000
--- a/features/org.fortiss.tooling.feature/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <name>Tooling Kernel 2.14-LATEST Feature</name>
-  <version>2.14.0-SNAPSHOT</version>
-  <artifactId>org.fortiss.tooling.feature</artifactId>
-  <groupId>org.fortiss.tooling</groupId>
-
-  <packaging>eclipse-feature</packaging>
-
-  <parent>
-    <groupId>org.fortiss.af3</groupId>
-    <artifactId>org.fortiss.af3.features</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-</project>
diff --git a/features/pom.xml b/features/pom.xml
index 5f3f3d0abc5a8212ac1b0d66269950f206d3ccf9..4c723480761b24c19891eba9f9e03b507131e552 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -24,7 +24,7 @@
         </property>
       </activation>
       <modules>
-        <module>org.fortiss.af3.phoenix.feature</module>
+        <module>af3</module>
       </modules>
     </profile>
     <profile>
@@ -36,7 +36,7 @@
         </property>
       </activation>
       <modules>
-        <module>org.fortiss.tooling.feature</module>
+        <module>tooling</module>
       </modules>
     </profile>
   </profiles>
diff --git a/features/tooling b/features/tooling
new file mode 160000
index 0000000000000000000000000000000000000000..cb7b11cddd6273f29dad02b6e05215e00bab0029
--- /dev/null
+++ b/features/tooling
@@ -0,0 +1 @@
+Subproject commit cb7b11cddd6273f29dad02b6e05215e00bab0029
diff --git a/products/af3 b/products/af3
new file mode 160000
index 0000000000000000000000000000000000000000..6211230fe83edf5d4a3fb3fe8368b3b138ee307f
--- /dev/null
+++ b/products/af3
@@ -0,0 +1 @@
+Subproject commit 6211230fe83edf5d4a3fb3fe8368b3b138ee307f
diff --git a/products/org.fortiss.af3.phoenix.product/icons/about.png b/products/org.fortiss.af3.phoenix.product/icons/about.png
deleted file mode 100644
index ae91b79de4cbf6b6199b5a1bc3f1415b0f5d465d..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/about.png and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/af3_logo.bmp b/products/org.fortiss.af3.phoenix.product/icons/af3_logo.bmp
deleted file mode 100644
index 45345db16c3b7d9a021af72d21dbae9590162d35..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/af3_logo.bmp and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/af3_logo.png b/products/org.fortiss.af3.phoenix.product/icons/af3_logo.png
deleted file mode 100644
index 1c08d006b36f6bad28696e7d0378dde8d8687273..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/af3_logo.png and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/af3_logo_square.bmp b/products/org.fortiss.af3.phoenix.product/icons/af3_logo_square.bmp
deleted file mode 100644
index bd25e60a00cfbebe5f796c75637d9b4f6e9ba332..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/af3_logo_square.bmp and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/af3_logo_square.png b/products/org.fortiss.af3.phoenix.product/icons/af3_logo_square.png
deleted file mode 100644
index 40852c78044208854fa19912ce4e5e0157dab913..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/af3_logo_square.png and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/af3logoAdd.png b/products/org.fortiss.af3.phoenix.product/icons/af3logoAdd.png
deleted file mode 100644
index d7e9d8590cb1a3cb29cd7f46b72f441d0e3715a1..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/af3logoAdd.png and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/af3logoAddExample.png b/products/org.fortiss.af3.phoenix.product/icons/af3logoAddExample.png
deleted file mode 100644
index 0f57e6e6b51f437cfaf4d6dc407be4dd4614ff1c..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/af3logoAddExample.png and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/current_objective.png b/products/org.fortiss.af3.phoenix.product/icons/current_objective.png
deleted file mode 100644
index 105ff9522d652782afbd27dc770e6e92a5f7f2ae..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/current_objective.png and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/README.md b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/README.md
deleted file mode 100644
index 5e88d423521d6eee6c6130f33c3f46078e6b6d11..0000000000000000000000000000000000000000
--- a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-**Instructions to create/modify the windows icon**
-
-* Use GIMP to edit the file icon.xcf: It contains 7 layers of images,
-  one for each required icon.
-* The list of required images can be found at
-  https://git.eclipse.org/c/equinox/rt.equinox.p2.git/tree/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/swt/tools/IconExe.java
-  Enumeration from 2019-02-12:
-  1. 256x256, 32 bit (RGB / Alpha Channel)
-  2. 48x48, 32 bit (RGB / Alpha Channel)
-  3. 32x32, 32 bit (RGB / Alpha Channel)
-  4. 16x16, 32 bit (RGB / Alpha Channel)
-  5. 48x48, 8 bit (256 colors)
-  6. 32x32, 8 bit (256 colors)
-  7. 16x16, 8 bit (256 colors)
-* Each of these images is stored as a separate bmp file.
-* In order to create a new image, open the af3_icon_squared.bmp file in Gimp and
-  scale it to the required size (upper folder). Store the result as a bmp file.
-* Next, copy the layer and insert in the open "icon.xcf" file in GIMP.
-* Select the newly created layer and "Add as new layer" (or similar).
-* Name the layer appropriately (F2 key) and save the result.
-* Export the result to a file named "icon.ico". In the export dialog, there are
-  two major things to look for:
-  * The bit sizes of the layers must correspond to the above enumeration (unordered).
-  * Each layer must be uncompressed.
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon.ico b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon.ico
deleted file mode 100644
index 26190ebaf7db39f69faa75b06891fa9f07dd985a..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon.ico and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon.xcf b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon.xcf
deleted file mode 100644
index 641fe81d9e879bb85fc2ed9a726366ae158b186b..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon.xcf and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon128.bmp b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon128.bmp
deleted file mode 100644
index 8e431edfe468889f580ed08e5a50bd9daacc3aae..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon128.bmp and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon128.icns b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon128.icns
deleted file mode 100644
index cec473ade77a13a922cc223bb45db6958e48165b..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon128.icns and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon128.png b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon128.png
deleted file mode 100644
index f8f6994919c20eba412e9db7d128faba26b9a5b5..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon128.png and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon128.xpm b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon128.xpm
deleted file mode 100644
index 9ac7b568f742a2767da74b81589eb25420e48c55..0000000000000000000000000000000000000000
--- a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon128.xpm
+++ /dev/null
@@ -1,144 +0,0 @@
-/* XPM */
-static char * icon128_xpm[] = {
-"128 128 13 1",
-" 	c None",
-".	c #799DE8",
-"+	c #799EE8",
-"@	c #7A9DE9",
-"#	c #7A9EE8",
-"$	c #7A9FE9",
-"%	c #34507A",
-"&	c #34507B",
-"*	c #35507A",
-"=	c #35517B",
-"-	c #C33030",
-";	c #C23030",
-">	c #C13030",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                           .+++++@                          @+++++.                           @+++++@                           ",
-"                        +###########+                    @###########+                     +###########+                        ",
-"                      .###############@                $################                 @###############@                      ",
-"                     ###################              ###################               ###################                     ",
-"                    ####################@            @####################             @###################@                    ",
-"                   .#####################            #####################.            #####################$                   ",
-"                   #######################          #######################           #######################                   ",
-"                  ########################+        +########################         +#######################+                  ",
-"                  #########################        #########################         #########################                  ",
-"                 ##########################.      .##########################       .##########################                 ",
-"                 ##########################+      +##########################       +##########################                 ",
-"                 ###########################      ###########################       ###########################                 ",
-"                $###########################      ###########################$      ###########################$                ",
-"                $###########################      ###########################$      ###########################$                ",
-"                $###########################      ###########################$      ###########################$                ",
-"                $###########################      ###########################$      ###########################$                ",
-"                 ###########################      ###########################       ###########################                 ",
-"                 ##########################+      +##########################       +##########################                 ",
-"                 +#########################@      @#########################+       @##########################                 ",
-"                  #########################        #########################         #########################                  ",
-"                  ########################+        +########################         +#######################+                  ",
-"                   #######################          #######################           #######################                   ",
-"                   .#####################            #####################.            #####################.                   ",
-"                    ####################@            @####################             @###################@                    ",
-"                     @#################                #################@                #################                      ",
-"                       ##############+                  +##############.                  +#############+                       ",
-"                        .###########.                     ###########.                     .###########.                        ",
-"                           .+++++.                          @++++++                           .+++++.                           ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                  %&&*====================&           -;;;>;;;;                 ",
-"                                                               %=========================*         ;;;;;;;;;;;;;;;              ",
-"                                                             *==========================*       ->;;;;;;;;;;;;;;;;;>            ",
-"                                                           %===========================*       >;;;;;;;;;;;;;;;;;;;;;;          ",
-"                                                          &===========================&       >;;;;;;;;;;;;;;;;;;;;;;;>         ",
-"                                                         =============================       ;;;;;;;;;;;;;;;;;;;;;;;;;;>        ",
-"                                                        &============================&      >;;;;;;;;;;;;;;;;;;;;;;;;;;;>       ",
-"                                                       &============================&      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;      ",
-"                                                      &=============================      -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-     ",
-"                                                     %=============================&      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;     ",
-"                      *&&&&&&&%                      &============&                                           >;;;;;;;;;;;;;    ",
-"                   *=============*                  %===========*                                               >;;;;;;;;;;;    ",
-"                 &=================*                &==========%                                                 >;;;;;;;;;;;   ",
-"               *=====================%              ==========*                                                   >;;;;;;;;;;   ",
-"              &=======================*            *==========                                                     ;;;;;;;;;;   ",
-"             ==========================&           *=========*                                                     ;;;;;;;;;;;  ",
-"            &===========================*          ==========                                                       ;;;;;;;;;;  ",
-"           &=============================*         ==========                                                       ;;;;;;;;;;  ",
-"          *===============================&        =========&                                                       ;;;;;;;;;;  ",
-"          =================================        =========&                                                       ;;;;;;;;;;  ",
-"         &===========*        &============*       =========&                                                       ;;;;;;;;;;  ",
-"        &==========&            %===========       =========&                                                       ;;;;;;;;;;  ",
-"        &==========              &==========&      =========&                                                        ->;;;;;;>  ",
-"        ==========                *==========      =========&                                                          ;;;;;;;  ",
-"       %=========*                 ==========      =========&                                                            >;;;-  ",
-"       *=========                  &=========*     =========&    %========&                     -;;;;;;;;;;;;;;;          >;;   ",
-"       =========&                   =========&     =========&    %========&                     -;;;;;;;;;;;;;;;;>-        ;>   ",
-"       =========%                   ==========     =========&    %========&                     -;;;;;;;;;;;;;;;;;;;-           ",
-"       =========%                   ==========     =========&    %========&                     -;;;;;;;;;;;;;;;;;;;;>          ",
-"       =========%                   ==========     =========&    %========&                     -;;;;;;;;;;;;;;;;;;;;;;         ",
-"       =========%                   ==========     =========&    %========*                      ;;;;;;;;;;;;;;;;;;;;;;;        ",
-"       =========*                   ==========     =========&    %========                       ;;;;;;;;;;;;;;;;;;;;;;;>       ",
-"       =========*                   ==========     =========&    %=======*                       -;;;;;;;;;;;;;;;;;;;;;;;>      ",
-"       &=========                   ==========     =========&    %======*                         ;;;;;;;;;;;;;;;;;;;;;;;;;     ",
-"       %=========*                  ==========     =========&     %%%%%                             ------;;;>;;;;;;;;;;;;;     ",
-"        ==========                  ==========     =========&                                                  >;;;;;;;;;;;>    ",
-"        ==========&                 ==========     =========&                                                    ;;;;;;;;;;;    ",
-"        &===========                ==========     =========&                                                    ;;;;;;;;;;;>   ",
-"         ============*              ==========     =========&                                                     ;;;;;;;;;;;   ",
-"         &=============&%%%%%%%     ==========     =========&                                                      >;;;;;;;;;-  ",
-"          &====================     ==========     =========&                                                      ;;;;;;;;;;;  ",
-"           ====================     ==========     =========&                                                       ;;;;;;;;;;  ",
-"           *===================     ==========     =========&                                                       >;;;;;;;;;  ",
-"            &==================     ==========     =========&                                                       ;;;;;;;;;;  ",
-"              =================     ==========     =========&                                                       ;;;;;;;;;;  ",
-"               ================     ==========     =========&                                                       ;;;;;;;;;;  ",
-"                &==============     ==========     =========&                                                       ;;;;;;;;;>  ",
-"                  &============     ==========     =========&                                                       ;;;;;;;;;;  ",
-"                    **=========     ==========     =========&                                                      ;;;;;;;;;;;  ",
-"                                                   =========&                                                      ;;;;;;;;;;   ",
-"                                                   =========&                                                     >;;;;;;;;;;   ",
-"                                                   =========&                                                    >;;;;;;;;;;>   ",
-"                                                   =========&                                                   >;;;;;;;;;;;    ",
-"                                                   =========&                                                 ;;;;;;;;;;;;;>    ",
-"         ;;>;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;     =========&    -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;     ",
-"       >;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;     =========&    -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;     ",
-"     ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;     &========&    -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;>      ",
-"    -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;     *========&    -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;>       ",
-"    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;     ========&    -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;>        ",
-"   >;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;>      =======&    -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;>         ",
-"   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;      %======&    -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;          ",
-"  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;>      *=====&    -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;>            ",
-"  >;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;        &===&    -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;>              ",
-"  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;        &*=&    -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;>;                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                "};
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon16.bmp b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon16.bmp
deleted file mode 100644
index f06724d3b23f4aa15be99d82da1d2bf258713a31..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon16.bmp and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon16.png b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon16.png
deleted file mode 100644
index a2779d1af5d61355e965259e2649afbbdd296325..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon16.png and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon16_8bit.bmp b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon16_8bit.bmp
deleted file mode 100644
index 19086078d94591df1b832e82b0b987fe389969ca..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon16_8bit.bmp and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon256.bmp b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon256.bmp
deleted file mode 100644
index ff1e68b566fc003017189aa28c2afeb119514732..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon256.bmp and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon32.bmp b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon32.bmp
deleted file mode 100644
index 8f24e8089df9f774bd18b27729492bc5d94e3592..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon32.bmp and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon32.png b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon32.png
deleted file mode 100644
index dee4ace1cdc666dd3af92de24c49a1d5905fafa0..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon32.png and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon32_8bit.bmp b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon32_8bit.bmp
deleted file mode 100644
index 498effe249e647667bd8cf452a901613be8c9d48..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon32_8bit.bmp and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon48.bmp b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon48.bmp
deleted file mode 100644
index 8e431edfe468889f580ed08e5a50bd9daacc3aae..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon48.bmp and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon48.png b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon48.png
deleted file mode 100644
index 552f60ab8c1ff4ff1de8261a070177761f7b677c..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon48.png and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon48_8bit.bmp b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon48_8bit.bmp
deleted file mode 100644
index 7335c34dcc21ea333a72f06b5604939a78f8c483..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon48_8bit.bmp and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon64.bmp b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon64.bmp
deleted file mode 100644
index fa04367e545c9b0379022a2b7b16e2baa8337f9e..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon64.bmp and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon64.png b/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon64.png
deleted file mode 100644
index 28744fdefd36c21e7c7d835fac44506fcde83008..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/dock_icons/icon64.png and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/error_log.gif b/products/org.fortiss.af3.phoenix.product/icons/error_log.gif
deleted file mode 100644
index 58873a11668491c5fef590a56a35b668ab589cd1..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/error_log.gif and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/new_library.png b/products/org.fortiss.af3.phoenix.product/icons/new_library.png
deleted file mode 100644
index 22ae13466d6922452caf6eb9d5ca3db58aa8e2ae..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/new_library.png and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/new_project.png b/products/org.fortiss.af3.phoenix.product/icons/new_project.png
deleted file mode 100644
index ce3a33a84da86adf36df77c70b9cdb0b60f3e4ba..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/new_project.png and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/refresh.gif b/products/org.fortiss.af3.phoenix.product/icons/refresh.gif
deleted file mode 100644
index e3831471a6592da14f53b1e7c5a2f7d6a92d9937..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/refresh.gif and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/storage_error_log.gif b/products/org.fortiss.af3.phoenix.product/icons/storage_error_log.gif
deleted file mode 100644
index f89c1e09fb9dc8776ca874b73a8144361224df85..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/storage_error_log.gif and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/tutorial.gif b/products/org.fortiss.af3.phoenix.product/icons/tutorial.gif
deleted file mode 100644
index 9e665d5c7803198bde2cb901abdf36959234b7bf..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/tutorial.gif and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/upcoming_objective.png b/products/org.fortiss.af3.phoenix.product/icons/upcoming_objective.png
deleted file mode 100644
index de5368958f91af0e981aa51641d56dd5f7ce7328..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/upcoming_objective.png and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/icons/welcomeAF3.png b/products/org.fortiss.af3.phoenix.product/icons/welcomeAF3.png
deleted file mode 100644
index 033ceac2de972a235715c2663ad5236a45be4e8f..0000000000000000000000000000000000000000
Binary files a/products/org.fortiss.af3.phoenix.product/icons/welcomeAF3.png and /dev/null differ
diff --git a/products/org.fortiss.af3.phoenix.product/org.fortiss.af3.phoenix.product.product b/products/org.fortiss.af3.phoenix.product/org.fortiss.af3.phoenix.product.product
deleted file mode 100644
index 6359a33d733adfdd20836f137c4e2b1a40adc0c0..0000000000000000000000000000000000000000
--- a/products/org.fortiss.af3.phoenix.product/org.fortiss.af3.phoenix.product.product
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="AutoFOCUS 3 - &quot;Phoenix&quot; 2.14" uid="org.fortiss.af3.phoenix.product" id="org.fortiss.af3.rcp.application.product" application="org.fortiss.af3.rcp.application.af3app" version="2.14.0.qualifier" useFeatures="true" includeLaunchers="true">
-
-   <aboutInfo>
-      <image path="icons/about.png"/>
-      <text>
-         AutoFOCUS 3 - &quot;Phoenix&quot;
-
-Version: 2.14.0
-
-Copyright 2011-2018 fortiss GmbH
-
-Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-express or implied. See the License for the specific language
-governing permissions and limitations under the License.
-      </text>
-   </aboutInfo>
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-Dosgi.framework.extensions=reference:file:org.eclipse.fx.osgi
-      </programArgs>
-      <vmArgsLin>-Xmx1024m -Xss32m
-      </vmArgsLin>
-      <vmArgsMac>-Xmx1024m -Xss32m -XstartOnFirstThread
--startup
-../Eclipse/plugins/org.eclipse.equinox.launcher_1.3.0.v20130327-1440.jar
---launcher.library
-../Eclipse/plugins/org.eclipse.equinox.launcher.cocoa.macosx.x86_64_1.1.200.v20140116-2212
--showsplash
-      </vmArgsMac>
-      <vmArgsWin>-Xmx512m -Xss16m
--Dorg.osgi.framework.os.name=win32
-      </vmArgsWin>
-   </launcherArgs>
-
-   <windowImages i16="icons/dock_icons/icon16.png" i32="icons/dock_icons/icon32.png" i48="icons/dock_icons/icon48.png" i64="icons/dock_icons/icon64.png" i128="icons/dock_icons/icon128.png"/>
-
-   <splash
-      location="org.fortiss.af3.rcp.application"
-      startupProgressRect="0,290,450,10"
-      startupMessageRect="0,275,450,15"
-      startupForegroundColor="35517B" />
-   <launcher name="autofocus3-phoenix">
-      <linux icon="icons/dock_icons/icon128.xpm"/>
-      <macosx icon="icons/dock_icons/icon128.icns"/>
-      <win useIco="true">
-         <ico path="icons/dock_icons/icon.ico"/>
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-      <windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
-   </vm>
-
-   <license>
-        <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        <text>
-   Copyright 2011-2018 fortiss GmbH
-
-Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-  http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-         </text>
-   </license>
-
-   <plugins>
-   </plugins>
-
-   <features>
-      <feature id="org.fortiss.af3.phoenix.feature" version="2.14.0.qualifier"/>
-      <feature id="org.eclipse.rcp"/>
-      <feature id="openjfx.standard.feature" version="11.0.0.201901231300"/>
-      <feature id="openjfx.swt.feature" version="11.0.0.201901231300"/>
-      <feature id="org.eclipse.fx.runtime.feature" version="3.5.0.201902110700"/>
-   </features>
-
-   <configurations>
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-   </configurations>
-
-   <preferencesInfo>
-      <targetfile overwrite="false"/>
-   </preferencesInfo>
-
-   <cssInfo>
-   </cssInfo>
-
-</product>
diff --git a/products/org.fortiss.af3.phoenix.product/pom.xml b/products/org.fortiss.af3.phoenix.product/pom.xml
deleted file mode 100644
index 6ff3aaa3946421b8935761bbffa1bc27ef932e29..0000000000000000000000000000000000000000
--- a/products/org.fortiss.af3.phoenix.product/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <name>AF3 Phoenix 2.14 Product</name>
-  <version>2.14.0-SNAPSHOT</version>
-  <artifactId>org.fortiss.af3.phoenix.product</artifactId>
-
-  <packaging>eclipse-repository</packaging>
-
-  <parent>
-    <artifactId>org.fortiss.af3.products</artifactId>
-    <groupId>org.fortiss.af3.product</groupId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-p2-director-plugin</artifactId>
-        <version>${tycho-version}</version>
-        <executions>
-          <execution>
-            <!-- install the product using the p2 director -->
-            <id>default-materialize-products</id>
-            <goals>
-              <goal>materialize-products</goal>
-            </goals>
-          </execution>
-          <execution>
-            <!-- create zip file with the installed product -->
-            <id>archive-products</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>archive-products</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <products>
-            <product>
-              <id>org.fortiss.af3.phoenix.product</id>
-              <rootFolder>AutoFOCUS3</rootFolder>
-              <rootFolders>
-                <linux>AutoFOCUS3</linux>
-                <macosx>AutoFOCUS3</macosx>
-                <windows>AutoFOCUS3</windows>
-              </rootFolders>
-            </product>
-          </products>
-        </configuration>
-      </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.8</version>
-            <executions>
-              <execution>
-                <id>patch-product</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <target name="Final product patching">
-                    <!-- Linux build -->
-                    <echo message="Creating linux launcher script..."/>
-                    <move file="${project.build.directory}/products/org.fortiss.af3.phoenix.product/linux/gtk/x86_64/AutoFOCUS3/autofocus3-phoenix" tofile="${project.build.directory}/products/org.fortiss.af3.phoenix.product/linux/gtk/x86_64/autofocus3/autofocus3-phoenix.bin"/>
-                    <move file="${project.build.directory}/products/org.fortiss.af3.phoenix.product/linux/gtk/x86_64/AutoFOCUS3/autofocus3-phoenix.ini" tofile="${project.build.directory}/products/org.fortiss.af3.phoenix.product/linux/gtk/x86_64/autofocus3/autofocus3-phoenix.bin.ini"/>
-                    <echo file="${project.build.directory}/products/org.fortiss.af3.phoenix.product/linux/gtk/x86_64/AutoFOCUS3/autofocus3-phoenix" append="false">
-                      #!/bin/sh
-                      LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:plugins/com.microsoft.z3_2.14.0.${buildQualifier}/lib/x64 ./autofocus3-phoenix.bin $$*
-                    </echo>
-                    <chmod perm="a+x" file="${project.build.directory}/products/org.fortiss.af3.phoenix.product/linux/gtk/x86_64/autofocus3/autofocus3-phoenix"/>
-                    <!-- MacOS build -->
-                    <echo message="Fixing MacOS build..."/>
-                    <copy todir="${project.build.directory}/products/org.fortiss.af3.phoenix.product/macosx/cocoa/x86_64/AutoFOCUS3.app/Contents/MacOS/">
-                      <fileset dir="${project.build.directory}/products/org.fortiss.af3.phoenix.product/macosx/cocoa/x86_64/AutoFOCUS3.app/Contents/Eclipse/plugins/com.microsoft.z3_2.14.0.${buildQualifier}/lib/x64/">
-                        <include name="*.dylib"/>
-                      </fileset>
-                    </copy>
-                    <copy file="${project.build.directory}/products/org.fortiss.af3.phoenix.product/macosx/cocoa/x86_64/AutoFOCUS3.app/Contents/Eclipse/autofocus3-phoenix.ini"
-                        todir="${project.build.directory}/products/org.fortiss.af3.phoenix.product/macosx/cocoa/x86_64/AutoFOCUS3.app/Contents/MacOS/"/>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/products/pom.xml b/products/pom.xml
index abe29257a2339e9c0207f7caf5345c994d8ef094..618ef20f3792af7eb888ac81c0e9bc1167175cd6 100644
--- a/products/pom.xml
+++ b/products/pom.xml
@@ -18,10 +18,8 @@
   <!-- For fetching platform-specific artifacts -->
   <repositories>
     <repository>
-      <!-- Place more centrally and combine with af3 profile -->
       <id>2018-12</id>
       <layout>p2</layout>
-      <!-- In jenkins, the tooling update site must be copied to this location. -->
       <url>https://download.eclipse.org/releases/2018-12</url>
     </repository>
   </repositories>