From 00ab53d129c62bc1ebddaa3944baa46e7341be6a Mon Sep 17 00:00:00 2001
From: Felix Schwickerath <felix.schwickerath@student.kit.edu>
Date: Sat, 28 Oct 2023 15:04:14 +0200
Subject: [PATCH] Unify features into one top level feature

---
 .../.project                                  |  17 --
 .../build.properties                          |   1 -
 .../feature.xml                               |  39 ---
 .../.project                                  |  17 --
 .../build.properties                          |   1 -
 .../feature.xml                               |  30 ---
 .../.project                                  |  17 --
 .../build.properties                          |   1 -
 .../feature.xml                               |  46 ----
 .../feature.xml                               | 243 ++++++++++++++++--
 .../.project                                  |  17 --
 .../build.properties                          |   1 -
 .../feature.xml                               |  28 --
 .../.project                                  |  11 -
 .../build.properties                          |   1 -
 .../feature.xml                               |  36 ---
 .../.project                                  |  17 --
 .../build.properties                          |   1 -
 .../feature.xml                               |  17 --
 .../.project                                  |  17 --
 .../build.properties                          |   1 -
 .../feature.xml                               |  28 --
 .../.project                                  |  17 --
 .../build.properties                          |   1 -
 .../feature.xml                               |  44 ----
 .../.project                                  |  17 --
 .../build.properties                          |   1 -
 .../feature.xml                               |  28 --
 .../.project                                  |  17 --
 .../build.properties                          |   1 -
 .../feature.xml                               |  31 ---
 .../.project                                  |  17 --
 .../build.properties                          |   1 -
 .../feature.xml                               |  17 --
 .../.project                                  |  17 --
 .../build.properties                          |   1 -
 .../feature.xml                               |  28 --
 .../.project                                  |  17 --
 .../build.properties                          |   1 -
 .../feature.xml                               |  28 --
 .../.project                                  |  17 --
 .../build.properties                          |   1 -
 .../feature.xml                               |  31 ---
 .../.project                                  |  17 --
 .../build.properties                          |   1 -
 .../feature.xml                               |  17 --
 .../category.xml                              |  80 +-----
 47 files changed, 226 insertions(+), 809 deletions(-)
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature/.project
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature/build.properties
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature/feature.xml
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature/.project
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature/build.properties
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature/feature.xml
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature/.project
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature/build.properties
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature/feature.xml
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.model.feature/.project
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.model.feature/build.properties
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.model.feature/feature.xml
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.nodecharacteristics.feature/.project
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.nodecharacteristics.feature/build.properties
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.nodecharacteristics.feature/feature.xml
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.queryutils.feature/.project
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.queryutils.feature/build.properties
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.queryutils.feature/feature.xml
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature/.project
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature/build.properties
 delete mode 100644 features/org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature/feature.xml
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature/.project
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature/build.properties
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature/feature.xml
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.characterized.editor.feature/.project
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.characterized.editor.feature/build.properties
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.characterized.editor.feature/feature.xml
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.characterized.feature/.project
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.characterized.feature/build.properties
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.characterized.feature/feature.xml
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.characterized.model.feature/.project
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.characterized.model.feature/build.properties
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.characterized.model.feature/feature.xml
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.editor.sirius.feature/.project
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.editor.sirius.feature/build.properties
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.editor.sirius.feature/feature.xml
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.editor.tree.feature/.project
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.editor.tree.feature/build.properties
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.editor.tree.feature/feature.xml
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.feature/.project
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.feature/build.properties
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.feature/feature.xml
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.model.feature/.project
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.model.feature/build.properties
 delete mode 100644 features/org.palladiosimulator.dataflow.dictionary.model.feature/feature.xml

diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature/.project b/features/org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature/.project
deleted file mode 100644
index c35389f..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature/build.properties b/features/org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature/feature.xml b/features/org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature/feature.xml
deleted file mode 100644
index 7b6f8ce..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature/feature.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature"
-      label="PCM Data Flow Confidentiality Dictionary DSL"
-      version="5.1.0.qualifier"
-      plugin="org.palladiosimulator.branding"
-      license-feature="org.palladiosimulator.license.epl2"
-      license-feature-version="1.0.0">
-
-   <includes
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.model.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import feature="org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature" version="1.0.0.qualifier"/>
-   </requires>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.dddsl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.ide"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature/.project b/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature/.project
deleted file mode 100644
index a2404c6..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature/build.properties b/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature/feature.xml b/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature/feature.xml
deleted file mode 100644
index 29cb8d3..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature/feature.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature"
-      label="PCM Data Flow Confidentiality Sirius Editor"
-      version="5.1.0.qualifier"
-      plugin="org.palladiosimulator.branding"
-      license-feature="org.palladiosimulator.license.epl2"
-      license-feature-version="1.0.0">
-
-   <includes
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import feature="org.palladiosimulator.mdsdprofiles.feature"/>
-      <import feature="org.palladiosimulator.indirections.editor.sirius.feature"/>
-   </requires>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature/.project b/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature/.project
deleted file mode 100644
index 67b7fcf..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature/build.properties b/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature/feature.xml b/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature/feature.xml
deleted file mode 100644
index 36dbfb1..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature/feature.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature"
-      label="PCM Data Flow Confidentiality Tree Editor"
-      version="5.1.0.qualifier"
-      plugin="org.palladiosimulator.branding"
-      license-feature="org.palladiosimulator.license.epl2"
-      license-feature-version="1.0.0">
-
-   <includes
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.model.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import feature="org.palladiosimulator.indirections.editor.tree.feature"/>
-      <import feature="org.palladiosimulator.editors.sirius.feature"/>
-   </requires>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.model.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.model.editor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-   <plugin
-         id="org.palladiosimulator.dataflow.nodecharacteristics.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.nodecharacteristics.editor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.feature/feature.xml b/features/org.palladiosimulator.dataflow.confidentiality.pcm.feature/feature.xml
index aedf5af..2394ccf 100644
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.feature/feature.xml
+++ b/features/org.palladiosimulator.dataflow.confidentiality.pcm.feature/feature.xml
@@ -16,28 +16,235 @@
       [Enter License Description here.]
    </license>
 
-   <includes
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature"
-         version="0.0.0"/>
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.pcm.dddsl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <includes
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature"
-         version="0.0.0"/>
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.ide"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <includes
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature"
-         version="0.0.0"/>
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <includes
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.model.feature"
-         version="0.0.0"/>
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <includes
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature"
-         version="0.0.0"/>
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.ui.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <includes
-     id="org.palladiosimulator.dataflow.confidentiality.pcm.nodecharacteristics.feature"
-     version="0.0.0"/>
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.pcm.model"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.pcm.model.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.pcm.model.edit.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.pcm.model.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.pcm.model.profile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.pcm.mwe2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.pcm.queryutils"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.pcm.testmodels"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.pcm.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.confidentiality.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.dictionary"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.dictionary.characterized"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.dictionary.characterized.dsl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.dictionary.characterized.dsl.ide"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.dictionary.characterized.dsl.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.dictionary.characterized.dsl.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.dictionary.characterized.dsl.ui.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.dictionary.characterized.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.dictionary.characterized.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.dictionary.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.dictionary.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.dictionary.editor.sirius"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.nodecharacteristics"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.nodecharacteristics.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.nodecharacteristics.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.nodecharacteristics.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.palladiosimulator.dataflow.ui.table"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.model.feature/.project b/features/org.palladiosimulator.dataflow.confidentiality.pcm.model.feature/.project
deleted file mode 100644
index 16bd503..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.model.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.palladiosimulator.dataflow.confidentiality.pcm.model.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.model.feature/build.properties b/features/org.palladiosimulator.dataflow.confidentiality.pcm.model.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.model.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.model.feature/feature.xml b/features/org.palladiosimulator.dataflow.confidentiality.pcm.model.feature/feature.xml
deleted file mode 100644
index 3acf64c..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.model.feature/feature.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.palladiosimulator.dataflow.confidentiality.pcm.model.feature"
-      label="PCM Data Flow Confidentiality Model"
-      version="5.1.0.qualifier"
-      plugin="org.palladiosimulator.branding"
-      license-feature="org.palladiosimulator.license.epl2"
-      license-feature-version="1.0.0">
-   
-   <includes
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.queryutils.feature"
-         version="0.0.0"/>
-   
-   <plugin
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.model"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.model.profile"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.nodecharacteristics.feature/.project b/features/org.palladiosimulator.dataflow.confidentiality.pcm.nodecharacteristics.feature/.project
deleted file mode 100644
index e6c59c9..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.nodecharacteristics.feature/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.palladiosimulator.dataflow.confidentiality.pcm.nodecharacteristics.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.nodecharacteristics.feature/build.properties b/features/org.palladiosimulator.dataflow.confidentiality.pcm.nodecharacteristics.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.nodecharacteristics.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.nodecharacteristics.feature/feature.xml b/features/org.palladiosimulator.dataflow.confidentiality.pcm.nodecharacteristics.feature/feature.xml
deleted file mode 100644
index c2eee26..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.nodecharacteristics.feature/feature.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.palladiosimulator.dataflow.confidentiality.pcm.nodecharacteristics.feature"
-      label="PCM Data Flow Confidentiality Node Characteristics Model"
-      version="5.1.0.qualifier"
-      plugin="org.palladiosimulator.branding"
-      license-feature="org.palladiosimulator.license.epl2"
-      license-feature-version="1.0.0">
-
-   <includes
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.model.feature"
-         version="0.0.0"/>
-
-
-   <plugin
-         id="org.palladiosimulator.dataflow.nodecharacteristics"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.nodecharacteristics.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.nodecharacteristics.editor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.queryutils.feature/.project b/features/org.palladiosimulator.dataflow.confidentiality.pcm.queryutils.feature/.project
deleted file mode 100644
index 399de11..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.queryutils.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.palladiosimulator.dataflow.confidentiality.pcm.queryutils.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.queryutils.feature/build.properties b/features/org.palladiosimulator.dataflow.confidentiality.pcm.queryutils.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.queryutils.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.queryutils.feature/feature.xml b/features/org.palladiosimulator.dataflow.confidentiality.pcm.queryutils.feature/feature.xml
deleted file mode 100644
index f2a6e1a..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.queryutils.feature/feature.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.palladiosimulator.dataflow.confidentiality.pcm.queryutils.feature"
-      label="PCM Data Flow Confidentiality queryutils"
-      version="5.1.0.qualifier"
-      plugin="org.palladiosimulator.branding"
-      license-feature="org.palladiosimulator.license.epl2"
-      license-feature-version="1.0.0">
-
-   <plugin
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.queryutils"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-		 
-</feature>
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature/.project b/features/org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature/.project
deleted file mode 100644
index bbb563a..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature/build.properties b/features/org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature/feature.xml b/features/org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature/feature.xml
deleted file mode 100644
index f94529a..0000000
--- a/features/org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature/feature.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature"
-      label="PCM Data Flow Confidentiality UI"
-      version="5.1.0.qualifier"
-      plugin="org.palladiosimulator.branding"
-      license-feature="org.palladiosimulator.license.epl2"
-      license-feature-version="1.0.0">
-
-   <includes
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.confidentiality.pcm.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-		 
-   <plugin
-         id="org.palladiosimulator.dataflow.confidentiality.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature/.project b/features/org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature/.project
deleted file mode 100644
index c27f872..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature/build.properties b/features/org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature/feature.xml b/features/org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature/feature.xml
deleted file mode 100644
index 3deead2..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature/feature.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature"
-      label="Characterized Data Dictionary DSL"
-      version="5.1.0.qualifier">
-
-   <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>
-
-   <requires>
-      <import feature="org.palladiosimulator.dataflow.dictionary.characterized.model.feature" version="5.1.0.qualifier"/>
-   </requires>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.dictionary.characterized.dsl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.dictionary.characterized.dsl.ide"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.dictionary.characterized.dsl.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.characterized.editor.feature/.project b/features/org.palladiosimulator.dataflow.dictionary.characterized.editor.feature/.project
deleted file mode 100644
index f9921c2..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.characterized.editor.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.palladiosimulator.dataflow.dictionary.characterized.editor.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.characterized.editor.feature/build.properties b/features/org.palladiosimulator.dataflow.dictionary.characterized.editor.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.characterized.editor.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.palladiosimulator.dataflow.dictionary.characterized.editor.feature/feature.xml b/features/org.palladiosimulator.dataflow.dictionary.characterized.editor.feature/feature.xml
deleted file mode 100644
index 060da21..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.characterized.editor.feature/feature.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.palladiosimulator.dataflow.dictionary.characterized.editor.feature"
-      label="Data Dictionary Characterized Editor"
-      version="5.1.0.qualifier"
-      plugin="org.palladiosimulator.branding"
-      license-feature="org.palladiosimulator.license"
-      license-feature-version="1.0.0">
-
-   <includes
-         id="org.palladiosimulator.dataflow.dictionary.characterized.model.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.dictionary.characterized.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.dictionary.characterized.editor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.characterized.feature/.project b/features/org.palladiosimulator.dataflow.dictionary.characterized.feature/.project
deleted file mode 100644
index 027f4d7..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.characterized.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.palladiosimulator.dataflow.dictionary.characterized.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.characterized.feature/build.properties b/features/org.palladiosimulator.dataflow.dictionary.characterized.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.characterized.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.palladiosimulator.dataflow.dictionary.characterized.feature/feature.xml b/features/org.palladiosimulator.dataflow.dictionary.characterized.feature/feature.xml
deleted file mode 100644
index 88e3cb8..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.characterized.feature/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.palladiosimulator.dataflow.dictionary.characterized.feature"
-      label="Toplevel Dataflow Dictionary Characterized Feature"
-      version="5.1.0.qualifier">
-
-   <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>
-
-   <includes
-         id="org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.palladiosimulator.dataflow.dictionary.characterized.editor.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.palladiosimulator.dataflow.dictionary.characterized.model.feature"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.characterized.model.feature/.project b/features/org.palladiosimulator.dataflow.dictionary.characterized.model.feature/.project
deleted file mode 100644
index f12f12e..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.characterized.model.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.palladiosimulator.dataflow.dictionary.characterized.model.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.characterized.model.feature/build.properties b/features/org.palladiosimulator.dataflow.dictionary.characterized.model.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.characterized.model.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.palladiosimulator.dataflow.dictionary.characterized.model.feature/feature.xml b/features/org.palladiosimulator.dataflow.dictionary.characterized.model.feature/feature.xml
deleted file mode 100644
index 9de816a..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.characterized.model.feature/feature.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.palladiosimulator.dataflow.dictionary.characterized.model.feature"
-      label="Data Dictionary Characterized Meta Model"
-      version="5.1.0.qualifier"
-      plugin="org.palladiosimulator.branding"
-      license-feature="org.palladiosimulator.license"
-      license-feature-version="1.0.0">
-		 
-   <plugin
-         id="org.palladiosimulator.dataflow.dictionary.characterized"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.editor.sirius.feature/.project b/features/org.palladiosimulator.dataflow.dictionary.editor.sirius.feature/.project
deleted file mode 100644
index 7707268..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.editor.sirius.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.palladiosimulator.dataflow.dictionary.editor.sirius.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.editor.sirius.feature/build.properties b/features/org.palladiosimulator.dataflow.dictionary.editor.sirius.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.editor.sirius.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.palladiosimulator.dataflow.dictionary.editor.sirius.feature/feature.xml b/features/org.palladiosimulator.dataflow.dictionary.editor.sirius.feature/feature.xml
deleted file mode 100644
index c52948e..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.editor.sirius.feature/feature.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.palladiosimulator.dataflow.dictionary.editor.sirius.feature"
-      label="Data Dictionary Sirius Editor"
-      version="5.1.0.qualifier"
-      plugin="org.palladiosimulator.branding"
-      license-feature="org.palladiosimulator.license"
-      license-feature-version="1.0.0">
-
-   <includes
-         id="org.palladiosimulator.dataflow.dictionary.editor.tree.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.dictionary.editor.sirius"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.ui.table"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.editor.tree.feature/.project b/features/org.palladiosimulator.dataflow.dictionary.editor.tree.feature/.project
deleted file mode 100644
index 9de2f64..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.editor.tree.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.palladiosimulator.dataflow.dictionary.editor.tree.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.editor.tree.feature/build.properties b/features/org.palladiosimulator.dataflow.dictionary.editor.tree.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.editor.tree.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.palladiosimulator.dataflow.dictionary.editor.tree.feature/feature.xml b/features/org.palladiosimulator.dataflow.dictionary.editor.tree.feature/feature.xml
deleted file mode 100644
index e7d29ce..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.editor.tree.feature/feature.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.palladiosimulator.dataflow.dictionary.editor.tree.feature"
-      label="Data Dictionary Tree Editor"
-      version="5.1.0.qualifier"
-      plugin="org.palladiosimulator.branding"
-      license-feature="org.palladiosimulator.license"
-      license-feature-version="1.0.0">
-
-   <includes
-         id="org.palladiosimulator.dataflow.dictionary.model.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.dictionary.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.palladiosimulator.dataflow.dictionary.editor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.feature/.project b/features/org.palladiosimulator.dataflow.dictionary.feature/.project
deleted file mode 100644
index 5529932..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.palladiosimulator.dataflow.dictionary.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.feature/build.properties b/features/org.palladiosimulator.dataflow.dictionary.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.palladiosimulator.dataflow.dictionary.feature/feature.xml b/features/org.palladiosimulator.dataflow.dictionary.feature/feature.xml
deleted file mode 100644
index 06248d4..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.feature/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.palladiosimulator.dataflow.dictionary.feature"
-      label="Toplevel Dataflow Dictionary Feature"
-      version="5.1.0.qualifier">
-
-   <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>
-
-   <includes
-         id="org.palladiosimulator.dataflow.dictionary.editor.sirius.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.palladiosimulator.dataflow.dictionary.editor.tree.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.palladiosimulator.dataflow.dictionary.model.feature"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.model.feature/.project b/features/org.palladiosimulator.dataflow.dictionary.model.feature/.project
deleted file mode 100644
index ab6b267..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.model.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.palladiosimulator.dataflow.dictionary.model.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.palladiosimulator.dataflow.dictionary.model.feature/build.properties b/features/org.palladiosimulator.dataflow.dictionary.model.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.model.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.palladiosimulator.dataflow.dictionary.model.feature/feature.xml b/features/org.palladiosimulator.dataflow.dictionary.model.feature/feature.xml
deleted file mode 100644
index 4742f03..0000000
--- a/features/org.palladiosimulator.dataflow.dictionary.model.feature/feature.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.palladiosimulator.dataflow.dictionary.model.feature"
-      label="Data Dictionary Meta Model"
-      version="5.1.0.qualifier"
-      plugin="org.palladiosimulator.branding"
-      license-feature="org.palladiosimulator.license"
-      license-feature-version="1.0.0">
-
-   <plugin
-         id="org.palladiosimulator.dataflow.dictionary"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.palladiosimulator.dataflow.metamodel.updatesite/category.xml b/releng/org.palladiosimulator.dataflow.metamodel.updatesite/category.xml
index edbfd36..f9d9ac2 100644
--- a/releng/org.palladiosimulator.dataflow.metamodel.updatesite/category.xml
+++ b/releng/org.palladiosimulator.dataflow.metamodel.updatesite/category.xml
@@ -1,85 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature">
+   <feature id="org.palladiosimulator.dataflow.confidentiality.pcm.feature">
       <category name="org.palladiosimulator.dataflow.confidentiality.pcm.category"/>
    </feature>
-   <feature id="org.palladiosimulator.dataflow.confidentiality.pcm.dddsl.feature.source">
-      <category name="org.palladiosimulator.dataflow.confidentiality.pcm.source.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.confidentiality.pcm.model.feature">
-      <category name="org.palladiosimulator.dataflow.confidentiality.pcm.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.confidentiality.pcm.model.feature.source">
-      <category name="org.palladiosimulator.dataflow.confidentiality.pcm.source.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature">
-      <category name="org.palladiosimulator.dataflow.confidentiality.pcm.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.confidentiality.pcm.editor.tree.feature.source">
-      <category name="org.palladiosimulator.dataflow.confidentiality.pcm.source.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature">
-      <category name="org.palladiosimulator.dataflow.confidentiality.pcm.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.confidentiality.pcm.editor.sirius.feature.source">
-      <category name="org.palladiosimulator.dataflow.confidentiality.pcm.source.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.model.feature">
-      <category name="org.palladiosimulator.dataflow.dictionary.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.model.feature.source">
-      <category name="org.palladiosimulator.dataflow.dictionary.source.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.editor.tree.feature">
-      <category name="org.palladiosimulator.dataflow.dictionary.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.editor.tree.feature.source">
-      <category name="org.palladiosimulator.dataflow.dictionary.source.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.editor.sirius.feature">
-      <category name="org.palladiosimulator.dataflow.dictionary.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.editor.sirius.feature.source">
-      <category name="org.palladiosimulator.dataflow.dictionary.source.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature">
-      <category name="org.palladiosimulator.dataflow.dictionary.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.characterized.dsl.feature.source">
-      <category name="org.palladiosimulator.dataflow.dictionary.source.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.characterized.model.feature">
-      <category name="org.palladiosimulator.dataflow.dictionary.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.characterized.model.feature.source">
-      <category name="org.palladiosimulator.dataflow.dictionary.source.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.characterized.editor.feature">
-      <category name="org.palladiosimulator.dataflow.dictionary.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.characterized.editor.feature.source">
-      <category name="org.palladiosimulator.dataflow.dictionary.source.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.feature">
-      <category name="org.palladiosimulator.dataflow.dictionary.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.feature.source">
-      <category name="org.palladiosimulator.dataflow.dictionary.source.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.characterized.feature">
-      <category name="org.palladiosimulator.dataflow.dictionary.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.dictionary.characterized.feature.source">
-      <category name="org.palladiosimulator.dataflow.dictionary.source.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature">
-      <category name="org.palladiosimulator.dataflow.confidentiality.pcm.category"/>
-   </feature>
-   <feature id="org.palladiosimulator.dataflow.confidentiality.pcm.ui.feature.source">
-      <category name="org.palladiosimulator.dataflow.confidentiality.pcm.source.category"/>
-   </feature>
    <category-def name="org.palladiosimulator.dataflow.confidentiality.pcm.category" label="PCM Data Flow Confidentiality"/>
-      <category-def name="org.palladiosimulator.dataflow.confidentiality.pcm.source.category" label="PCM Data Flow Confidentiality Developer Resources"/>
-   <category-def name="org.palladiosimulator.dataflow.dictionary.category" label="Data Flow Dictionary"/>
-   <category-def name="org.palladiosimulator.dataflow.dictionary.source.category" label="Data Flow Dictionary Developer Resources"/>
 </site>