diff --git a/src/main/java/kieker/analysis/dev/ComponentDependencyGraphCreatorStage.java b/src/main/java/kieker/analysis/dev/ComponentDependencyGraphCreatorStage.java
index fcb2d9acedd97c800a57c99a3f025a452afe4372..c347c84e42d7bfc7e57cdbf4bf5260861bc67044 100644
--- a/src/main/java/kieker/analysis/dev/ComponentDependencyGraphCreatorStage.java
+++ b/src/main/java/kieker/analysis/dev/ComponentDependencyGraphCreatorStage.java
@@ -2,6 +2,8 @@ package kieker.analysis.dev;
 
 import com.tinkerpop.blueprints.Graph;
 
+import kieker.analysis.domain.OperationsDependency;
+
 import teetime.stage.basic.AbstractTransformation;
 
 public class ComponentDependencyGraphCreatorStage extends AbstractTransformation<OperationsDependency, Graph> {
diff --git a/src/main/java/kieker/analysis/dev/DependencyCreator.java b/src/main/java/kieker/analysis/dev/DependencyCreator.java
index 70400484bea71a3dac9fedfa0ce83b42a748092d..93b6e47b4c122364fd566df32f61870324f2b406 100644
--- a/src/main/java/kieker/analysis/dev/DependencyCreator.java
+++ b/src/main/java/kieker/analysis/dev/DependencyCreator.java
@@ -1,6 +1,7 @@
 package kieker.analysis.dev;
 
 import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.OperationsDependency;
 import kieker.analysis.trace.traversal.OperationCallVisitor;
 
 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 f41fdfe3582313ae28945615978050277ced7141..0c3403633e62aa2dece0b698333f9cd515b74351 100644
--- a/src/main/java/kieker/analysis/dev/DependencyCreatorStage.java
+++ b/src/main/java/kieker/analysis/dev/DependencyCreatorStage.java
@@ -1,6 +1,7 @@
 package kieker.analysis.dev;
 
 import kieker.analysis.domain.AggregatedTrace;
+import kieker.analysis.domain.OperationsDependency;
 import kieker.analysis.trace.traversal.TraceTraverser;
 
 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 ba60606e092b9c08bf6d289c33041f22a62e677a..569e9ed73266d9b77307481c6c45c6d174eeece0 100644
--- a/src/main/java/kieker/analysis/dev/DependencyStatisticsDecorator.java
+++ b/src/main/java/kieker/analysis/dev/DependencyStatisticsDecorator.java
@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.OperationsDependency;
 import kieker.analysis.traceanalysisutil.Statistics;
 import kieker.analysis.traceanalysisutil.StatisticsUtility;
 
diff --git a/src/main/java/kieker/analysis/dev/DependencyStatisticsDecoratorStage.java b/src/main/java/kieker/analysis/dev/DependencyStatisticsDecoratorStage.java
index 244b2e2164e2e7a5eb6c25eaf4e24247bcde5069..6fbe87ff77b21f9eeb9bfee659567d368057ff1b 100644
--- a/src/main/java/kieker/analysis/dev/DependencyStatisticsDecoratorStage.java
+++ b/src/main/java/kieker/analysis/dev/DependencyStatisticsDecoratorStage.java
@@ -1,5 +1,7 @@
 package kieker.analysis.dev;
 
+import kieker.analysis.domain.OperationsDependency;
+
 import teetime.stage.basic.AbstractTransformation;
 
 /**
diff --git a/src/main/java/kieker/analysis/dev/OperationsDependency.java b/src/main/java/kieker/analysis/domain/OperationsDependency.java
similarity index 92%
rename from src/main/java/kieker/analysis/dev/OperationsDependency.java
rename to src/main/java/kieker/analysis/domain/OperationsDependency.java
index 2d1743bb627bb4910f618286b54d7ef2a407b5c0..19ff626152de550beac71e94460cadcabd1ad978 100644
--- a/src/main/java/kieker/analysis/dev/OperationsDependency.java
+++ b/src/main/java/kieker/analysis/domain/OperationsDependency.java
@@ -1,13 +1,10 @@
-package kieker.analysis.dev;
+package kieker.analysis.domain;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import kieker.analysis.domain.AggregatedOperationCall;
-import kieker.analysis.domain.OperationCall;
-
 /**
  * This class represents an aggregated aggregated-trace. It connects
  * operation calls and represents how often one operation call was called
diff --git a/src/main/java/kieker/analysis/dev/OperationsDependencyRelation.java b/src/main/java/kieker/analysis/domain/OperationsDependencyRelation.java
similarity index 88%
rename from src/main/java/kieker/analysis/dev/OperationsDependencyRelation.java
rename to src/main/java/kieker/analysis/domain/OperationsDependencyRelation.java
index 696685c8e00683ba0924ca0c5932ef093a9554a8..06c57c1d5328e30a718e2d185d215e22b802ee5c 100644
--- a/src/main/java/kieker/analysis/dev/OperationsDependencyRelation.java
+++ b/src/main/java/kieker/analysis/domain/OperationsDependencyRelation.java
@@ -1,6 +1,4 @@
-package kieker.analysis.dev;
-
-import kieker.analysis.domain.AggregatedOperationCall;
+package kieker.analysis.domain;
 
 /**
  * Relation between two {@link AggregatedOperationCall}. Further it stores