diff --git a/tools.descartes.pmx.builder/META-INF/MANIFEST.MF b/tools.descartes.pmx.builder/META-INF/MANIFEST.MF
index 04ba26043302fe58782f149e357098394b093d5a..0e82642bf04e498fbb7f0c9372ff264d4b3d7a2d 100644
--- a/tools.descartes.pmx.builder/META-INF/MANIFEST.MF
+++ b/tools.descartes.pmx.builder/META-INF/MANIFEST.MF
@@ -9,4 +9,4 @@ Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.emf.common
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: tools.descartes.pmx.builder,
- tools.descartes.pmx.filter.controlflow
+ tools.descartes.pmx.util
diff --git a/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/IModelBuilder.java b/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/IModelBuilder.java
index 6ef2e83bbd617565c8b2bc90d60c3d5588bf0b15..60745fe01899662839bff6f3f17d8416d72d2abe 100644
--- a/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/IModelBuilder.java
+++ b/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/IModelBuilder.java
@@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.EObject;
 
 import kieker.common.util.signature.Signature;
 import kieker.tools.traceAnalysis.systemModel.ComponentType;
-import tools.descartes.pmx.filter.controlflow.ExternalCall;
+import tools.descartes.pmx.util.ExternalCall;
 
 public interface IModelBuilder {
 	
diff --git a/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/ModelBuilder.java b/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/ModelBuilder.java
index 07014208a3ba10e30c7d9d3187218bb2fc65cb7f..b9cbc2ba753e5a92155fe77dbaf1489087e2ecac 100644
--- a/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/ModelBuilder.java
+++ b/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/ModelBuilder.java
@@ -37,8 +37,8 @@ import org.eclipse.emf.ecore.EObject;
 
 import kieker.common.util.signature.Signature;
 import kieker.tools.traceAnalysis.systemModel.ComponentType;
-import tools.descartes.pmx.filter.controlflow.ExternalCall;
-import tools.descartes.pmx.filter.util.Util;
+import tools.descartes.pmx.util.ExternalCall;
+import tools.descartes.pmx.util.Util;
 
 public abstract class ModelBuilder implements IModelBuilder{
 	private static final Logger log = Logger
diff --git a/tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/controlflow/ExternalCall.java b/tools.descartes.pmx.builder/src/tools/descartes/pmx/util/ExternalCall.java
similarity index 97%
rename from tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/controlflow/ExternalCall.java
rename to tools.descartes.pmx.builder/src/tools/descartes/pmx/util/ExternalCall.java
index a9a17106a87ea1a6bb9d8b70f5fe871931b2ac93..9530f6dced9a871f7cd3f9aa42a7f9ddce4d25d6 100644
--- a/tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/controlflow/ExternalCall.java
+++ b/tools.descartes.pmx.builder/src/tools/descartes/pmx/util/ExternalCall.java
@@ -1,4 +1,4 @@
-package tools.descartes.pmx.filter.controlflow;
+package tools.descartes.pmx.util;
 
 /**
  * ==============================================
diff --git a/tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/util/FilterPortTuple.java b/tools.descartes.pmx.builder/src/tools/descartes/pmx/util/FilterPortTuple.java
similarity index 97%
rename from tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/util/FilterPortTuple.java
rename to tools.descartes.pmx.builder/src/tools/descartes/pmx/util/FilterPortTuple.java
index 98bf0acd89b3b58a80ab0f52c572127b030d67cd..3dfe150ff858b2d02f34756e4f942b937c86a5b0 100644
--- a/tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/util/FilterPortTuple.java
+++ b/tools.descartes.pmx.builder/src/tools/descartes/pmx/util/FilterPortTuple.java
@@ -24,7 +24,7 @@
  * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
  * in the United States and other countries.]
  */
-package tools.descartes.pmx.filter.util;
+package tools.descartes.pmx.util;
 
 import kieker.analysis.plugin.AbstractPlugin;
 
diff --git a/tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/util/Util.java b/tools.descartes.pmx.builder/src/tools/descartes/pmx/util/Util.java
similarity index 98%
rename from tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/util/Util.java
rename to tools.descartes.pmx.builder/src/tools/descartes/pmx/util/Util.java
index 802f180bd20ce8e5006f0220a8e83f8d91616e8a..6d607c12f3b53ef2b3deb96b87bb34cdad0131fe 100644
--- a/tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/util/Util.java
+++ b/tools.descartes.pmx.builder/src/tools/descartes/pmx/util/Util.java
@@ -24,7 +24,7 @@
  * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
  * in the United States and other countries.]
  */
-package tools.descartes.pmx.filter.util;
+package tools.descartes.pmx.util;
 
 import org.apache.log4j.Logger;
 
@@ -42,8 +42,8 @@ import kieker.tools.traceAnalysis.filter.sessionReconstruction.SessionReconstruc
 import kieker.tools.traceAnalysis.filter.traceReconstruction.TraceReconstructionFilter;
 import kieker.tools.traceAnalysis.systemModel.ExecutionTraceBasedSession;
 import kieker.tools.traceAnalysis.systemModel.repository.SystemModelRepository;
-import tools.descartes.pmx.filter.util.FilterPortTuple;
-import tools.descartes.pmx.filter.util.Util;
+import tools.descartes.pmx.util.FilterPortTuple;
+import tools.descartes.pmx.util.Util;
 
 public class Util {
 	private static final Logger log = Logger.getLogger(Util.class);
diff --git a/tools.descartes.pmx/META-INF/MANIFEST.MF b/tools.descartes.pmx/META-INF/MANIFEST.MF
index c9248e7d23662a3afd41797863c63c91b5bbf470..3721ef9f3ccdfae9be335828e3e650d0d81b2546 100644
--- a/tools.descartes.pmx/META-INF/MANIFEST.MF
+++ b/tools.descartes.pmx/META-INF/MANIFEST.MF
@@ -10,6 +10,6 @@ Require-Bundle: tools.descartes.librede.estimation;visibility:=reexport,
  org.apache.log4j,
  tools.descartes.pmx.builder
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: tools.descartes.pmx, tools.descartes.pmx.filter.controlflow
+Export-Package: tools.descartes.pmx
 Import-Package: tools.descartes.pmx.builder,
- tools.descartes.pmx.filter.controlflow
+ tools.descartes.pmx.util
diff --git a/tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilter.java b/tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilter.java
index a01a7066229c61d7f126ee18f015d0a45713bff0..0f4c2876d2acc2cd6dcfcaa8bf05c61ecfbdbfad 100644
--- a/tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilter.java
+++ b/tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilter.java
@@ -54,8 +54,8 @@ import tools.descartes.pmx.builder.CSVBuilder;
 import tools.descartes.pmx.builder.IModelBuilder;
 import tools.descartes.pmx.builder.ModelBuilder;
 import tools.descartes.pmx.filter.controlflow.CallDecoration;
-import tools.descartes.pmx.filter.controlflow.ExternalCall;
 import tools.descartes.pmx.filter.util.PerformanceModelCreator;
+import tools.descartes.pmx.util.ExternalCall;
 
 @Plugin(description = "Transforms the contents of a Kieker SystemModelRepository + graph + resource demands to the model of the builder ", repositoryPorts = { @RepositoryPort(name = AbstractTraceAnalysisFilter.REPOSITORY_PORT_NAME_SYSTEM_MODEL, repositoryType = SystemModelRepository.class) })
 public class PerformanceModelFilter extends AbstractFilterPlugin{ 	//extends AbstractTraceAnalysisFilter {
diff --git a/tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilterAppender.java b/tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilterAppender.java
index 7d566589c2d531c712cf7cd9f1694f014607256d..e278ab4763a50eaabe84f1bc63d37b2b2ee0193e 100644
--- a/tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilterAppender.java
+++ b/tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilterAppender.java
@@ -58,7 +58,7 @@ import kieker.tools.traceAnalysis.systemModel.repository.SystemModelRepository;
 import tools.descartes.pmx.filter.controlflow.CallNodeDecorator;
 import tools.descartes.pmx.filter.resourcedemands.CPUFilter;
 import tools.descartes.pmx.filter.resourcedemands.ResourceDemandFilter;
-import tools.descartes.pmx.filter.util.FilterPortTuple;
+import tools.descartes.pmx.util.FilterPortTuple;
 
 public class PerformanceModelFilterAppender {
 	private static final Logger log = Logger.getLogger(PerformanceModelFilterAppender.class);
diff --git a/tools.descartes.pmx/src/tools/descartes/pmx/filter/controlflow/ControlFlowFilterAppender.java b/tools.descartes.pmx/src/tools/descartes/pmx/filter/controlflow/ControlFlowFilterAppender.java
index 044925bf31b7b6bddd73c7c504e39eda65bdf023..48456639a3340a56572e49627a8e97f59b6ad723 100644
--- a/tools.descartes.pmx/src/tools/descartes/pmx/filter/controlflow/ControlFlowFilterAppender.java
+++ b/tools.descartes.pmx/src/tools/descartes/pmx/filter/controlflow/ControlFlowFilterAppender.java
@@ -40,7 +40,7 @@ import kieker.tools.traceAnalysis.filter.visualization.dependencyGraph.Component
 import kieker.tools.traceAnalysis.filter.visualization.dependencyGraph.OperationDependencyGraphAllocationFilter;
 import kieker.tools.traceAnalysis.systemModel.repository.SystemModelRepository;
 import tools.descartes.pmx.builder.IModelBuilder;
-import tools.descartes.pmx.filter.util.FilterPortTuple;
+import tools.descartes.pmx.util.FilterPortTuple;
 
 public class ControlFlowFilterAppender {
 
diff --git a/tools.descartes.pmx/src/tools/descartes/pmx/filter/usage/UsageFilterAppender.java b/tools.descartes.pmx/src/tools/descartes/pmx/filter/usage/UsageFilterAppender.java
index 20b493c6ced07f53a5695be0110cf3e74833e255..160a9e2e29e261ddc82bd4659b3e4cb4ff491e09 100644
--- a/tools.descartes.pmx/src/tools/descartes/pmx/filter/usage/UsageFilterAppender.java
+++ b/tools.descartes.pmx/src/tools/descartes/pmx/filter/usage/UsageFilterAppender.java
@@ -32,7 +32,7 @@ import kieker.analysis.IAnalysisController;
 import kieker.analysis.exception.AnalysisConfigurationException;
 import kieker.common.configuration.Configuration;
 import kieker.tools.traceAnalysis.filter.sessionReconstruction.SessionReconstructionFilter;
-import tools.descartes.pmx.filter.util.FilterPortTuple;
+import tools.descartes.pmx.util.FilterPortTuple;
 
 public class UsageFilterAppender {
 	
diff --git a/tools.descartes.pmx/src/tools/descartes/pmx/filter/util/KiekerFilterAppender.java b/tools.descartes.pmx/src/tools/descartes/pmx/filter/util/KiekerFilterAppender.java
index 1c5608192db795ce19c9129de91876160fa2c933..1100bc027773d624ccc1892370b869aad3d393cb 100644
--- a/tools.descartes.pmx/src/tools/descartes/pmx/filter/util/KiekerFilterAppender.java
+++ b/tools.descartes.pmx/src/tools/descartes/pmx/filter/util/KiekerFilterAppender.java
@@ -41,7 +41,7 @@ import kieker.tools.traceAnalysis.filter.flow.TraceEventRecords2ExecutionAndMess
 import kieker.tools.traceAnalysis.filter.sessionReconstruction.SessionReconstructionFilter;
 import kieker.tools.traceAnalysis.filter.traceReconstruction.TraceReconstructionFilter;
 import kieker.tools.traceAnalysis.systemModel.repository.SystemModelRepository;
-import tools.descartes.pmx.filter.util.FilterPortTuple;
+import tools.descartes.pmx.util.FilterPortTuple;
 
 public class KiekerFilterAppender {