diff --git a/src/main/java/kieker/analysis/TraceAnalysisConfiguration.java b/src/main/java/kieker/analysis/TraceAnalysisConfiguration.java
index ded06fcd21bc4e5023c066d9b6707ab4060a8bde..366a7ba0167188aaeddcef3c806640a6afa2911c 100644
--- a/src/main/java/kieker/analysis/TraceAnalysisConfiguration.java
+++ b/src/main/java/kieker/analysis/TraceAnalysisConfiguration.java
@@ -11,6 +11,10 @@ import com.tinkerpop.blueprints.Graph;
import kieker.analysis.dev.DependencyCreatorStage;
import kieker.analysis.dev.DependencyStatisticsDecoratorStage;
+import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.AggregatedTrace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import kieker.analysis.stage.tracediagnosis.AllowedRecordsFilter;
import kieker.analysis.stage.tracediagnosis.BeginEndOfMonitoringDetector;
import kieker.analysis.stage.tracediagnosis.OperationCallHandlerComposite;
@@ -22,10 +26,6 @@ import kieker.analysis.trace.graphoutput.GraphMLWriter;
import kieker.analysis.trace.traversal.AggrTraceTraverserStage;
import kieker.analysis.trace.traversal.NamedGraph;
import kieker.analysis.trace.traversal.TraceTraverserStage;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
-import kieker.analysis.traceanalysisdomain.AggregatedTrace;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
import kieker.common.record.IMonitoringRecord;
import kieker.common.record.misc.KiekerMetadataRecord;
diff --git a/src/main/java/kieker/analysis/dev/AggregatedTraceCallsDecorator.java b/src/main/java/kieker/analysis/dev/AggregatedTraceCallsDecorator.java
index ebeaa804b7af86c906acd6b2bc4e5ef4beacbc3d..9690149337dbb50ee830a65355d50c09a862ee90 100644
--- a/src/main/java/kieker/analysis/dev/AggregatedTraceCallsDecorator.java
+++ b/src/main/java/kieker/analysis/dev/AggregatedTraceCallsDecorator.java
@@ -2,10 +2,10 @@ package kieker.analysis.dev;
import java.util.Iterator;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
-import kieker.analysis.traceanalysisdomain.AggregatedTrace;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.AggregatedTrace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import teetime.stage.basic.AbstractTransformation;
diff --git a/src/main/java/kieker/analysis/dev/DependencyCreator.java b/src/main/java/kieker/analysis/dev/DependencyCreator.java
index 85e4adca5b2e90cb645231816eaaf9b90109eff6..70400484bea71a3dac9fedfa0ce83b42a748092d 100644
--- a/src/main/java/kieker/analysis/dev/DependencyCreator.java
+++ b/src/main/java/kieker/analysis/dev/DependencyCreator.java
@@ -1,7 +1,7 @@
package kieker.analysis.dev;
+import kieker.analysis.domain.AggregatedOperationCall;
import kieker.analysis.trace.traversal.OperationCallVisitor;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
public class DependencyCreator extends OperationCallVisitor<AggregatedOperationCall> {
diff --git a/src/main/java/kieker/analysis/dev/DependencyCreatorStage.java b/src/main/java/kieker/analysis/dev/DependencyCreatorStage.java
index 8b5ca67155867a0b22ebade9e59e527e92796d72..f41fdfe3582313ae28945615978050277ced7141 100644
--- a/src/main/java/kieker/analysis/dev/DependencyCreatorStage.java
+++ b/src/main/java/kieker/analysis/dev/DependencyCreatorStage.java
@@ -1,7 +1,7 @@
package kieker.analysis.dev;
+import kieker.analysis.domain.AggregatedTrace;
import kieker.analysis.trace.traversal.TraceTraverser;
-import kieker.analysis.traceanalysisdomain.AggregatedTrace;
import teetime.stage.basic.AbstractTransformation;
diff --git a/src/main/java/kieker/analysis/dev/DependencyStatisticsDecorator.java b/src/main/java/kieker/analysis/dev/DependencyStatisticsDecorator.java
index 397bf9454c50b604f8e0b065ddcce2931a97670b..ba60606e092b9c08bf6d289c33041f22a62e677a 100644
--- a/src/main/java/kieker/analysis/dev/DependencyStatisticsDecorator.java
+++ b/src/main/java/kieker/analysis/dev/DependencyStatisticsDecorator.java
@@ -3,7 +3,7 @@ package kieker.analysis.dev;
import java.util.List;
import java.util.stream.Collectors;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
+import kieker.analysis.domain.AggregatedOperationCall;
import kieker.analysis.traceanalysisutil.Statistics;
import kieker.analysis.traceanalysisutil.StatisticsUtility;
diff --git a/src/main/java/kieker/analysis/dev/OperationsDependency.java b/src/main/java/kieker/analysis/dev/OperationsDependency.java
index 78a82a7c7f8142629938c255ae0ad319d6ccb871..2d1743bb627bb4910f618286b54d7ef2a407b5c0 100644
--- a/src/main/java/kieker/analysis/dev/OperationsDependency.java
+++ b/src/main/java/kieker/analysis/dev/OperationsDependency.java
@@ -5,8 +5,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
-import kieker.analysis.traceanalysisdomain.OperationCall;
+import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.OperationCall;
/**
* This class represents an aggregated aggregated-trace. It connects
diff --git a/src/main/java/kieker/analysis/dev/OperationsDependencyRelation.java b/src/main/java/kieker/analysis/dev/OperationsDependencyRelation.java
index d9ad5d24be493874736bd826d656f97e1b5f399c..696685c8e00683ba0924ca0c5932ef093a9554a8 100644
--- a/src/main/java/kieker/analysis/dev/OperationsDependencyRelation.java
+++ b/src/main/java/kieker/analysis/dev/OperationsDependencyRelation.java
@@ -1,6 +1,6 @@
package kieker.analysis.dev;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
+import kieker.analysis.domain.AggregatedOperationCall;
/**
* Relation between two {@link AggregatedOperationCall}. Further it stores
diff --git a/src/main/java/kieker/analysis/traceanalysisdomain/AbstractOperationCall.java b/src/main/java/kieker/analysis/domain/AbstractOperationCall.java
similarity index 95%
rename from src/main/java/kieker/analysis/traceanalysisdomain/AbstractOperationCall.java
rename to src/main/java/kieker/analysis/domain/AbstractOperationCall.java
index d5716dc9882deca1f8376496cf3802c53be9fdab..2ebd2805b3f1a5cc3ce18d61336f273ef05cebfa 100644
--- a/src/main/java/kieker/analysis/traceanalysisdomain/AbstractOperationCall.java
+++ b/src/main/java/kieker/analysis/domain/AbstractOperationCall.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.analysis.traceanalysisdomain;
+package kieker.analysis.domain;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/kieker/analysis/traceanalysisdomain/AbstractTrace.java b/src/main/java/kieker/analysis/domain/AbstractTrace.java
similarity index 95%
rename from src/main/java/kieker/analysis/traceanalysisdomain/AbstractTrace.java
rename to src/main/java/kieker/analysis/domain/AbstractTrace.java
index d387df6eb4c0eb163105d53ddfd924fc4c23ac18..056d6c79c7e9855efcb356aa64a0a677a79005da 100644
--- a/src/main/java/kieker/analysis/traceanalysisdomain/AbstractTrace.java
+++ b/src/main/java/kieker/analysis/domain/AbstractTrace.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.analysis.traceanalysisdomain;
+package kieker.analysis.domain;
/**
* This is an abstract base for classes representing traces (a tree of operation calls) within this application. Technically this class is just a container for a
diff --git a/src/main/java/kieker/analysis/traceanalysisdomain/AggregatedOperationCall.java b/src/main/java/kieker/analysis/domain/AggregatedOperationCall.java
similarity index 95%
rename from src/main/java/kieker/analysis/traceanalysisdomain/AggregatedOperationCall.java
rename to src/main/java/kieker/analysis/domain/AggregatedOperationCall.java
index 272a9b7ac3a9634076c42913adb27045b54dc7df..a483a0e31a7bcb47f959b7c451a5968c827e488c 100644
--- a/src/main/java/kieker/analysis/traceanalysisdomain/AggregatedOperationCall.java
+++ b/src/main/java/kieker/analysis/domain/AggregatedOperationCall.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.analysis.traceanalysisdomain;
+package kieker.analysis.domain;
import java.util.LinkedList;
import java.util.List;
diff --git a/src/main/java/kieker/analysis/traceanalysisdomain/AggregatedTrace.java b/src/main/java/kieker/analysis/domain/AggregatedTrace.java
similarity index 93%
rename from src/main/java/kieker/analysis/traceanalysisdomain/AggregatedTrace.java
rename to src/main/java/kieker/analysis/domain/AggregatedTrace.java
index 68d8045501dd9b9ff7c10c50aeabb05fe473b460..bca7c81bd1b4070dddd9b9a345ff7aaf79a17cd6 100644
--- a/src/main/java/kieker/analysis/traceanalysisdomain/AggregatedTrace.java
+++ b/src/main/java/kieker/analysis/domain/AggregatedTrace.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.analysis.traceanalysisdomain;
+package kieker.analysis.domain;
import java.util.List;
diff --git a/src/main/java/kieker/analysis/traceanalysisdomain/OperationCall.java b/src/main/java/kieker/analysis/domain/OperationCall.java
similarity index 95%
rename from src/main/java/kieker/analysis/traceanalysisdomain/OperationCall.java
rename to src/main/java/kieker/analysis/domain/OperationCall.java
index 05099f2a0800d8b69c10ff2e07886bc6640deeee..dd0c75114df3b54e38f9a76ebab335ee982feb2d 100644
--- a/src/main/java/kieker/analysis/traceanalysisdomain/OperationCall.java
+++ b/src/main/java/kieker/analysis/domain/OperationCall.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.analysis.traceanalysisdomain;
+package kieker.analysis.domain;
/**
* This class represents a concrete operation call within this application. It adds some properties that are only required for concrete operation calls, like the
diff --git a/src/main/java/kieker/analysis/traceanalysisdomain/Trace.java b/src/main/java/kieker/analysis/domain/Trace.java
similarity index 93%
rename from src/main/java/kieker/analysis/traceanalysisdomain/Trace.java
rename to src/main/java/kieker/analysis/domain/Trace.java
index 7a0f4e5e09fb8d8c25c783165c0f151114d80e25..eaafb6ba07865216bcfb538b06eb69222adabfb4 100644
--- a/src/main/java/kieker/analysis/traceanalysisdomain/Trace.java
+++ b/src/main/java/kieker/analysis/domain/Trace.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.analysis.traceanalysisdomain;
+package kieker.analysis.domain;
/**
* This class represents a concrete trace within this application. It adds some properties that are only required for concrete traces, like the trace ID.
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/AggregatedTraceStatisticsDecorator.java b/src/main/java/kieker/analysis/stage/tracediagnosis/AggregatedTraceStatisticsDecorator.java
index b54290c18c6c3c233aeef4d5de0df38dc552a999..ad32e0d5021ac11413e8aafabfffe34e769442ab 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/AggregatedTraceStatisticsDecorator.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/AggregatedTraceStatisticsDecorator.java
@@ -19,10 +19,10 @@ package kieker.analysis.stage.tracediagnosis;
import java.util.ArrayList;
import java.util.List;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
-import kieker.analysis.traceanalysisdomain.AggregatedTrace;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.AggregatedTrace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import kieker.analysis.traceanalysisutil.Statistics;
import kieker.analysis.traceanalysisutil.StatisticsUtility;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/AllowedRecordsFilter.java b/src/main/java/kieker/analysis/stage/tracediagnosis/AllowedRecordsFilter.java
index 113dc194503e8ff842dd091f461ac4929fcdd700..d5971a75e779f7dbb4b190598a2bb5776623c3d2 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/AllowedRecordsFilter.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/AllowedRecordsFilter.java
@@ -22,6 +22,7 @@ import kieker.common.record.flow.trace.TraceMetadata;
import kieker.common.record.flow.trace.operation.AfterOperationEvent;
import kieker.common.record.flow.trace.operation.BeforeOperationEvent;
import kieker.common.record.misc.KiekerMetadataRecord;
+
import teetime.stage.basic.AbstractTransformation;
/**
@@ -33,7 +34,8 @@ public final class AllowedRecordsFilter extends AbstractTransformation<IMonitori
@Override
protected void execute(final IMonitoringRecord element) {
- if (element instanceof TraceMetadata || element instanceof BeforeOperationEvent || element instanceof AfterOperationEvent || element instanceof KiekerMetadataRecord || element instanceof OperationExecutionRecord) {
+ if (element instanceof TraceMetadata || element instanceof BeforeOperationEvent || element instanceof AfterOperationEvent
+ || element instanceof KiekerMetadataRecord || element instanceof OperationExecutionRecord) {
super.getOutputPort().send(element);
} else {
ignoredRecords++;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/LegacyTraceReconstructor.java b/src/main/java/kieker/analysis/stage/tracediagnosis/LegacyTraceReconstructor.java
index 81ce6a921ef11c499564535a5a4bac0fb3a1e8b6..2d97e6dc0ef25c7cf5fa7cc1a8f21bd5305c622f 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/LegacyTraceReconstructor.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/LegacyTraceReconstructor.java
@@ -24,8 +24,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import kieker.common.record.controlflow.OperationExecutionRecord;
import teetime.stage.basic.AbstractTransformation;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallAggregator.java b/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallAggregator.java
index be13a08524a96d743af672bc00546734e9e9c67f..442dfc53ed4e93e6e6cccecb9165efb94b612f7f 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallAggregator.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallAggregator.java
@@ -21,8 +21,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
-import kieker.analysis.traceanalysisdomain.OperationCall;
+import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.OperationCall;
import kieker.analysis.traceanalysisutil.Statistics;
import kieker.analysis.traceanalysisutil.StatisticsUtility;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallExtractor.java b/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallExtractor.java
index edf4d8cb28edcb1099ffc08a75ca485f1496bdf1..159ead0109c788cb3f656eaad210371d539c76bc 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallExtractor.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallExtractor.java
@@ -16,8 +16,8 @@
package kieker.analysis.stage.tracediagnosis;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import teetime.stage.basic.AbstractTransformation;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallHandlerComposite.java b/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallHandlerComposite.java
index 2d24d489dc6150dfdda0bb387f4419addd112e85..1df76fdafdab1f31d29ab7f75e85dee1485f32de 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallHandlerComposite.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallHandlerComposite.java
@@ -18,9 +18,9 @@ package kieker.analysis.stage.tracediagnosis;
import java.util.List;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import teetime.framework.AbstractCompositeStage;
import teetime.framework.InputPort;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregationComposite.java b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregationComposite.java
index a7d35e3452947132385e3e7e6fab093292d02fe4..8f38d859b48d36b890bd8e87767974e3fc0a8c47 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregationComposite.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregationComposite.java
@@ -17,8 +17,8 @@
package kieker.analysis.stage.tracediagnosis;
import kieker.analysis.dev.AggregatedTraceCallsDecorator;
-import kieker.analysis.traceanalysisdomain.AggregatedTrace;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.AggregatedTrace;
+import kieker.analysis.domain.Trace;
import teetime.framework.AbstractCompositeStage;
import teetime.framework.InputPort;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregator.java b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregator.java
index 3954532de0d3dfff9283c74706f48ab2e3b15cb2..9ac3ab7962855d02458b56eca26fde743b8fcdcc 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregator.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregator.java
@@ -16,14 +16,14 @@
package kieker.analysis.stage.tracediagnosis;
-import kieker.analysis.traceanalysisdomain.AggregatedTrace;
-import kieker.analysis.traceanalysisdomain.Trace;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import kieker.analysis.domain.AggregatedTrace;
+import kieker.analysis.domain.Trace;
+
import teetime.stage.basic.AbstractTransformation;
/**
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructionComposite.java b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructionComposite.java
index 8d13a6b25918a16cfc883511713586fa0b552d4c..c731e116798805c1a5bbcc30d1d41d0fe66474fb 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructionComposite.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructionComposite.java
@@ -16,7 +16,7 @@
package kieker.analysis.stage.tracediagnosis;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.Trace;
import kieker.common.record.IMonitoringRecord;
import kieker.common.record.controlflow.OperationExecutionRecord;
import kieker.common.record.flow.IFlowRecord;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructor.java b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructor.java
index 3691c71402d8409ad6b8f5b5d505a9b9788e6ece..9bd6f2ae4cd8a7b2490d23ed46d9c939e18d73ce 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructor.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructor.java
@@ -23,8 +23,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import kieker.common.record.flow.IFlowRecord;
import kieker.common.record.flow.trace.TraceMetadata;
import kieker.common.record.flow.trace.operation.AbstractOperationEvent;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceStatisticsDecorator.java b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceStatisticsDecorator.java
index ba1d6c972e619b7aa0cb5922a7d19b0ca6204ded..547b5af3536589dd29652b073da657206ea21743 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceStatisticsDecorator.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceStatisticsDecorator.java
@@ -16,8 +16,8 @@
package kieker.analysis.stage.tracediagnosis;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import teetime.stage.basic.AbstractTransformation;
diff --git a/src/main/java/kieker/analysis/trace/traversal/AbstractTraceToGraphTransformer.java b/src/main/java/kieker/analysis/trace/traversal/AbstractTraceToGraphTransformer.java
index d7cec93df3339caa1ab9d9a86624745d0425c2c2..b2972fb48d68f2fefb4d743b747488217fd1b320 100644
--- a/src/main/java/kieker/analysis/trace/traversal/AbstractTraceToGraphTransformer.java
+++ b/src/main/java/kieker/analysis/trace/traversal/AbstractTraceToGraphTransformer.java
@@ -5,7 +5,7 @@ import com.tinkerpop.blueprints.Graph;
import com.tinkerpop.blueprints.Vertex;
import com.tinkerpop.blueprints.impls.tg.TinkerGraph;
-import kieker.analysis.traceanalysisdomain.AbstractOperationCall;
+import kieker.analysis.domain.AbstractOperationCall;
public abstract class AbstractTraceToGraphTransformer<C extends AbstractOperationCall<C>> extends OperationCallVisitor<C> {
diff --git a/src/main/java/kieker/analysis/trace/traversal/AggrTraceToGraphTransformer.java b/src/main/java/kieker/analysis/trace/traversal/AggrTraceToGraphTransformer.java
index 2dab2aefd67e53311d9848d71c985599c1414b46..d918fd97ff8ce5ac3ce84974cac97e5143f4bb60 100644
--- a/src/main/java/kieker/analysis/trace/traversal/AggrTraceToGraphTransformer.java
+++ b/src/main/java/kieker/analysis/trace/traversal/AggrTraceToGraphTransformer.java
@@ -3,7 +3,7 @@ package kieker.analysis.trace.traversal;
import com.tinkerpop.blueprints.Edge;
import com.tinkerpop.blueprints.Vertex;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
+import kieker.analysis.domain.AggregatedOperationCall;
import kieker.analysis.util.NameConverter;
public class AggrTraceToGraphTransformer extends AbstractTraceToGraphTransformer<AggregatedOperationCall> {
diff --git a/src/main/java/kieker/analysis/trace/traversal/AggrTraceTraverserStage.java b/src/main/java/kieker/analysis/trace/traversal/AggrTraceTraverserStage.java
index d570e4188689a2416ce8f1fee49f26022eebf6c2..56a8eee688f3366915e9a3177846feb0bfe4a8a8 100644
--- a/src/main/java/kieker/analysis/trace/traversal/AggrTraceTraverserStage.java
+++ b/src/main/java/kieker/analysis/trace/traversal/AggrTraceTraverserStage.java
@@ -2,8 +2,8 @@ package kieker.analysis.trace.traversal;
import com.tinkerpop.blueprints.Graph;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
-import kieker.analysis.traceanalysisdomain.AggregatedTrace;
+import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.AggregatedTrace;
import teetime.stage.basic.AbstractTransformation;
diff --git a/src/main/java/kieker/analysis/trace/traversal/OperationCallVisitor.java b/src/main/java/kieker/analysis/trace/traversal/OperationCallVisitor.java
index 50864506dbef67885bf4a2d20e14a4fff36f1f6c..a035d00f258e7fa66f8c051023e7dfb1bb5ba657 100644
--- a/src/main/java/kieker/analysis/trace/traversal/OperationCallVisitor.java
+++ b/src/main/java/kieker/analysis/trace/traversal/OperationCallVisitor.java
@@ -1,6 +1,6 @@
package kieker.analysis.trace.traversal;
-import kieker.analysis.traceanalysisdomain.AbstractOperationCall;
+import kieker.analysis.domain.AbstractOperationCall;
public abstract class OperationCallVisitor<C extends AbstractOperationCall<C>> {
diff --git a/src/main/java/kieker/analysis/trace/traversal/TraceToGraphTransformer.java b/src/main/java/kieker/analysis/trace/traversal/TraceToGraphTransformer.java
index cde5155ba3ca256d33fcf897cd6488a409a8abe1..594e51c1119ce487d414c42c6d6883ed64278a17 100644
--- a/src/main/java/kieker/analysis/trace/traversal/TraceToGraphTransformer.java
+++ b/src/main/java/kieker/analysis/trace/traversal/TraceToGraphTransformer.java
@@ -3,7 +3,7 @@ package kieker.analysis.trace.traversal;
import com.tinkerpop.blueprints.Edge;
import com.tinkerpop.blueprints.Vertex;
-import kieker.analysis.traceanalysisdomain.OperationCall;
+import kieker.analysis.domain.OperationCall;
import kieker.analysis.util.NameConverter;
public class TraceToGraphTransformer extends AbstractTraceToGraphTransformer<OperationCall> {
diff --git a/src/main/java/kieker/analysis/trace/traversal/TraceTraverser.java b/src/main/java/kieker/analysis/trace/traversal/TraceTraverser.java
index 989f5a744a2255418dbe93740b31c55012a161e0..fb031a6f95240e6fb0f765756289487b6fe27861 100644
--- a/src/main/java/kieker/analysis/trace/traversal/TraceTraverser.java
+++ b/src/main/java/kieker/analysis/trace/traversal/TraceTraverser.java
@@ -3,8 +3,8 @@ package kieker.analysis.trace.traversal;
import java.util.ArrayList;
import java.util.List;
-import kieker.analysis.traceanalysisdomain.AbstractOperationCall;
-import kieker.analysis.traceanalysisdomain.AbstractTrace;
+import kieker.analysis.domain.AbstractOperationCall;
+import kieker.analysis.domain.AbstractTrace;
public class TraceTraverser<T extends AbstractTrace<C>, C extends AbstractOperationCall<C>> {
diff --git a/src/main/java/kieker/analysis/trace/traversal/TraceTraverserStage.java b/src/main/java/kieker/analysis/trace/traversal/TraceTraverserStage.java
index bae43357cfb79579673e2234abe7c5b795057428..fc37ae7e154597bd3885d199e157736ef8ba7ecd 100644
--- a/src/main/java/kieker/analysis/trace/traversal/TraceTraverserStage.java
+++ b/src/main/java/kieker/analysis/trace/traversal/TraceTraverserStage.java
@@ -2,8 +2,8 @@ package kieker.analysis.trace.traversal;
import com.tinkerpop.blueprints.Graph;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import teetime.stage.basic.AbstractTransformation;