diff --git a/dependency/src/main/java/de/dagere/peass/debugtools/CallCountLoader.java b/dependency/src/main/java/de/dagere/peass/debugtools/CallCountLoader.java
index c6b56caad..0105602ed 100644
--- a/dependency/src/main/java/de/dagere/peass/debugtools/CallCountLoader.java
+++ b/dependency/src/main/java/de/dagere/peass/debugtools/CallCountLoader.java
@@ -9,11 +9,11 @@
 import java.util.Map.Entry;
 
 import de.dagere.nodeDiffDetector.data.MethodCallHelper;
-import kieker.analysis.stage.DynamicEventDispatcher;
-import kieker.analysis.stage.IEventMatcher;
-import kieker.analysis.stage.ImplementsEventMatcher;
-import kieker.analysis.trace.AbstractTraceProcessingStage;
-import kieker.analysis.trace.execution.ExecutionRecordTransformationStage;
+import kieker.analysis.architecture.trace.AbstractTraceProcessingStage;
+import kieker.analysis.architecture.trace.execution.ExecutionRecordTransformationStage;
+import kieker.analysis.generic.DynamicEventDispatcher;
+import kieker.analysis.generic.IEventMatcher;
+import kieker.analysis.generic.ImplementsEventMatcher;
 import kieker.common.record.controlflow.OperationExecutionRecord;
 import kieker.model.repository.SystemModelRepository;
 import kieker.model.system.model.Execution;
diff --git a/dependency/src/main/java/de/dagere/peass/dependency/analysis/CalledMethodStage.java b/dependency/src/main/java/de/dagere/peass/dependency/analysis/CalledMethodStage.java
index f8d84daba..bd9084d93 100644
--- a/dependency/src/main/java/de/dagere/peass/dependency/analysis/CalledMethodStage.java
+++ b/dependency/src/main/java/de/dagere/peass/dependency/analysis/CalledMethodStage.java
@@ -18,7 +18,7 @@
 import de.dagere.nodeDiffDetector.data.Type;
 import de.dagere.nodeDiffDetector.typeFinding.TypeFileFinder;
 import de.dagere.peass.dependency.analysis.data.TraceElement;
-import kieker.analysis.trace.AbstractTraceProcessingStage;
+import kieker.analysis.architecture.trace.AbstractTraceProcessingStage;
 import kieker.model.repository.SystemModelRepository;
 import kieker.model.system.model.Execution;
 import kieker.model.system.model.ExecutionTrace;
diff --git a/dependency/src/main/java/de/dagere/peass/dependency/analysis/KiekerReaderConfiguration.java b/dependency/src/main/java/de/dagere/peass/dependency/analysis/KiekerReaderConfiguration.java
index f5354d289..36a5e76b9 100644
--- a/dependency/src/main/java/de/dagere/peass/dependency/analysis/KiekerReaderConfiguration.java
+++ b/dependency/src/main/java/de/dagere/peass/dependency/analysis/KiekerReaderConfiguration.java
@@ -8,11 +8,11 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import kieker.analysis.stage.DynamicEventDispatcher;
-import kieker.analysis.stage.IEventMatcher;
-import kieker.analysis.stage.ImplementsEventMatcher;
-import kieker.analysis.trace.execution.ExecutionRecordTransformationStage;
-import kieker.analysis.trace.reconstruction.TraceReconstructionStage;
+import kieker.analysis.architecture.trace.execution.ExecutionRecordTransformationStage;
+import kieker.analysis.architecture.trace.reconstruction.TraceReconstructionStage;
+import kieker.analysis.generic.DynamicEventDispatcher;
+import kieker.analysis.generic.IEventMatcher;
+import kieker.analysis.generic.ImplementsEventMatcher;
 import kieker.common.record.controlflow.OperationExecutionRecord;
 import kieker.model.repository.SystemModelRepository;
 import kieker.tools.source.LogsReaderCompositeStage;
diff --git a/measurement/src/main/java/de/dagere/peass/measurement/rca/kieker/TreeStage.java b/measurement/src/main/java/de/dagere/peass/measurement/rca/kieker/TreeStage.java
index 80403adf0..b08587e35 100644
--- a/measurement/src/main/java/de/dagere/peass/measurement/rca/kieker/TreeStage.java
+++ b/measurement/src/main/java/de/dagere/peass/measurement/rca/kieker/TreeStage.java
@@ -8,7 +8,7 @@
 import de.dagere.peass.config.MeasurementConfig;
 import de.dagere.peass.dependency.analysis.ModuleClassMapping;
 import de.dagere.peass.measurement.rca.data.CallTreeNode;
-import kieker.analysis.trace.AbstractTraceProcessingStage;
+import kieker.analysis.architecture.trace.AbstractTraceProcessingStage;
 import kieker.model.repository.SystemModelRepository;
 import kieker.model.system.model.Execution;
 import kieker.model.system.model.ExecutionTrace;
diff --git a/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/DurationMeasurementStage.java b/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/DurationMeasurementStage.java
index 11b03ec53..04f737fb8 100644
--- a/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/DurationMeasurementStage.java
+++ b/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/DurationMeasurementStage.java
@@ -5,7 +5,7 @@
 
 import de.dagere.kopeme.kieker.record.DurationRecord;
 import de.dagere.kopeme.kopemedata.MeasuredValue;
-import kieker.analysis.trace.AbstractTraceAnalysisStage;
+import kieker.analysis.architecture.trace.AbstractTraceAnalysisStage;
 import kieker.model.repository.SystemModelRepository;
 
 public class DurationMeasurementStage extends AbstractTraceAnalysisStage<DurationRecord> {
diff --git a/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/DurationRCAStage.java b/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/DurationRCAStage.java
index 3caae85b3..eeb69eea7 100644
--- a/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/DurationRCAStage.java
+++ b/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/DurationRCAStage.java
@@ -10,7 +10,7 @@
 import de.dagere.kopeme.kieker.record.DurationRecord;
 import de.dagere.peass.measurement.rca.data.CallTreeNode;
 import de.dagere.peass.measurement.rca.kieker.KiekerPatternConverter;
-import kieker.analysis.trace.AbstractTraceAnalysisStage;
+import kieker.analysis.architecture.trace.AbstractTraceAnalysisStage;
 import kieker.model.repository.SystemModelRepository;
 
 public class DurationRCAStage extends AbstractTraceAnalysisStage<DurationRecord> {
diff --git a/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/KiekerReaderConfigurationDuration.java b/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/KiekerReaderConfigurationDuration.java
index 699dfaa45..8a9af5804 100644
--- a/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/KiekerReaderConfigurationDuration.java
+++ b/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/KiekerReaderConfigurationDuration.java
@@ -12,11 +12,11 @@
 import de.dagere.peass.dependency.analysis.ModuleClassMapping;
 import de.dagere.peass.measurement.rca.data.CallTreeNode;
 import de.dagere.peass.measurement.rca.kieker.TreeStage;
-import kieker.analysis.stage.DynamicEventDispatcher;
-import kieker.analysis.stage.IEventMatcher;
-import kieker.analysis.stage.ImplementsEventMatcher;
-import kieker.analysis.trace.execution.ExecutionRecordTransformationStage;
-import kieker.analysis.trace.reconstruction.TraceReconstructionStage;
+import kieker.analysis.architecture.trace.execution.ExecutionRecordTransformationStage;
+import kieker.analysis.architecture.trace.reconstruction.TraceReconstructionStage;
+import kieker.analysis.generic.DynamicEventDispatcher;
+import kieker.analysis.generic.IEventMatcher;
+import kieker.analysis.generic.ImplementsEventMatcher;
 import kieker.tools.source.LogsReaderCompositeStage;
 
 public class KiekerReaderConfigurationDuration extends KiekerReaderConfiguration {
diff --git a/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/OperationExecutionRCAStage.java b/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/OperationExecutionRCAStage.java
index e3aef85aa..872df2f8c 100644
--- a/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/OperationExecutionRCAStage.java
+++ b/measurement/src/main/java/de/dagere/peass/measurement/rca/kiekerReading/OperationExecutionRCAStage.java
@@ -9,7 +9,7 @@
 
 import de.dagere.peass.measurement.rca.data.CallTreeNode;
 import de.dagere.peass.measurement.rca.kieker.KiekerPatternConverter;
-import kieker.analysis.trace.AbstractTraceProcessingStage;
+import kieker.analysis.architecture.trace.AbstractTraceProcessingStage;
 import kieker.model.repository.SystemModelRepository;
 import kieker.model.system.model.Execution;