From a24a2cea4aafdbbf23fd10ed9a7b00673bfa1b09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <stu114708@informatik.uni-kiel.de>
Date: Thu, 7 Apr 2016 13:10:12 +0200
Subject: [PATCH] reorganize package structure

---
 .../analysis/TraceAnalysisConfiguration.java  |  6 +++---
 .../analysis/{graph => dev}/GraphTester.java  |  9 ++++++---
 .../analysis/graph/traversal/EdgeVisitor.java |  9 ---------
 .../graph/traversal/VertexVisitor.java        |  9 ---------
 .../trace/graphoutput/DotGraphWriter.java     |  2 +-
 .../trace/graphoutput/GraphMLWriter.java      |  2 +-
 .../AbstractTraceToGraphTransformer.java      |  8 ++++----
 .../AggrTraceToGraphTransformer.java          |  4 ++--
 .../traversal/AggrTraceTraverserStage.java    |  2 +-
 .../traversal/TraceToGraphTransformer.java    |  4 ++--
 .../trace/traversal/TraceTraverserStage.java  |  2 +-
 .../java/kieker/analysis/util/DotBuilder.java |  2 +-
 .../analysis/{ => util}/graph/Direction.java  |  2 +-
 .../analysis/{ => util}/graph/Edge.java       |  2 +-
 .../analysis/{ => util}/graph/Element.java    |  2 +-
 .../analysis/{ => util}/graph/Graph.java      |  2 +-
 .../{ => util}/graph/GraphElement.java        |  2 +-
 .../analysis/{ => util}/graph/Vertex.java     |  2 +-
 .../graph/export/AbstractTransformer.java     | 18 +++++++++---------
 .../blueprints/BlueprintsTransformer.java     | 12 ++++++------
 .../BlueprintsTransformerStage.java           |  4 ++--
 .../graph/export/dot/DotElementExporter.java  | 19 ++++++++++---------
 .../export/dot/DotExportPropertyTokens.java   |  2 +-
 .../graph/export/dot/DotExporter.java         |  6 +++---
 .../graph/export/dot/DotFileWriterStage.java  |  6 +++---
 .../graph/export/dot/DotWriterStage.java      |  4 ++--
 .../graphml/GraphMLFileWriterComposite.java   |  6 +++---
 .../graphml/GraphMLTransformationStage.java   |  4 ++--
 .../graphml/GraphMLWriterComposite.java       |  4 ++--
 .../export/graphml/GraphTypeTransformer.java  | 12 ++++++------
 .../{ => util}/graph/impl/EdgeImpl.java       |  8 ++++----
 .../{ => util}/graph/impl/ElementImpl.java    |  4 ++--
 .../graph/impl/ExceptionFactory.java          |  2 +-
 .../graph/impl/GraphElementImpl.java          |  4 ++--
 .../{ => util}/graph/impl/GraphImpl.java      | 10 +++++-----
 .../{ => util}/graph/impl/VertexImpl.java     | 10 +++++-----
 .../graph/mapping/SimpleFileNameMapper.java   |  4 ++--
 .../graph/traversal/DeepGraphTraverser.java   |  8 ++++----
 .../util/graph/traversal/EdgeVisitor.java     |  9 +++++++++
 .../graph/traversal/FlatGraphTraverser.java   |  8 ++++----
 .../graph/traversal/GraphTraverser.java       |  4 ++--
 .../util/graph/traversal/VertexVisitor.java   |  9 +++++++++
 .../{ => util}/graph/util/IndentWriter.java   |  2 +-
 .../{ => util}/graph/util/dot/DotGraph.java   |  2 +-
 .../graph/util/dot/DotGraphType.java          |  2 +-
 .../graph/util/dot/DotGraphWriter.java        |  4 ++--
 46 files changed, 131 insertions(+), 127 deletions(-)
 rename src/main/java/kieker/analysis/{graph => dev}/GraphTester.java (93%)
 delete mode 100644 src/main/java/kieker/analysis/graph/traversal/EdgeVisitor.java
 delete mode 100644 src/main/java/kieker/analysis/graph/traversal/VertexVisitor.java
 rename src/main/java/kieker/analysis/{ => util}/graph/Direction.java (90%)
 rename src/main/java/kieker/analysis/{ => util}/graph/Edge.java (78%)
 rename src/main/java/kieker/analysis/{ => util}/graph/Element.java (82%)
 rename src/main/java/kieker/analysis/{ => util}/graph/Graph.java (92%)
 rename src/main/java/kieker/analysis/{ => util}/graph/GraphElement.java (75%)
 rename src/main/java/kieker/analysis/{ => util}/graph/Vertex.java (91%)
 rename src/main/java/kieker/analysis/{ => util}/graph/export/AbstractTransformer.java (65%)
 rename src/main/java/kieker/analysis/{ => util}/graph/export/blueprints/BlueprintsTransformer.java (83%)
 rename src/main/java/kieker/analysis/{ => util}/graph/export/blueprints/BlueprintsTransformerStage.java (76%)
 rename src/main/java/kieker/analysis/{ => util}/graph/export/dot/DotElementExporter.java (86%)
 rename src/main/java/kieker/analysis/{ => util}/graph/export/dot/DotExportPropertyTokens.java (79%)
 rename src/main/java/kieker/analysis/{ => util}/graph/export/dot/DotExporter.java (79%)
 rename src/main/java/kieker/analysis/{ => util}/graph/export/dot/DotFileWriterStage.java (74%)
 rename src/main/java/kieker/analysis/{ => util}/graph/export/dot/DotWriterStage.java (82%)
 rename src/main/java/kieker/analysis/{ => util}/graph/export/graphml/GraphMLFileWriterComposite.java (76%)
 rename src/main/java/kieker/analysis/{ => util}/graph/export/graphml/GraphMLTransformationStage.java (90%)
 rename src/main/java/kieker/analysis/{ => util}/graph/export/graphml/GraphMLWriterComposite.java (87%)
 rename src/main/java/kieker/analysis/{ => util}/graph/export/graphml/GraphTypeTransformer.java (85%)
 rename src/main/java/kieker/analysis/{ => util}/graph/impl/EdgeImpl.java (80%)
 rename src/main/java/kieker/analysis/{ => util}/graph/impl/ElementImpl.java (85%)
 rename src/main/java/kieker/analysis/{ => util}/graph/impl/ExceptionFactory.java (98%)
 rename src/main/java/kieker/analysis/{ => util}/graph/impl/GraphElementImpl.java (80%)
 rename src/main/java/kieker/analysis/{ => util}/graph/impl/GraphImpl.java (95%)
 rename src/main/java/kieker/analysis/{ => util}/graph/impl/VertexImpl.java (91%)
 rename src/main/java/kieker/analysis/{ => util}/graph/mapping/SimpleFileNameMapper.java (84%)
 rename src/main/java/kieker/analysis/{ => util}/graph/traversal/DeepGraphTraverser.java (80%)
 create mode 100644 src/main/java/kieker/analysis/util/graph/traversal/EdgeVisitor.java
 rename src/main/java/kieker/analysis/{ => util}/graph/traversal/FlatGraphTraverser.java (78%)
 rename src/main/java/kieker/analysis/{ => util}/graph/traversal/GraphTraverser.java (90%)
 create mode 100644 src/main/java/kieker/analysis/util/graph/traversal/VertexVisitor.java
 rename src/main/java/kieker/analysis/{ => util}/graph/util/IndentWriter.java (92%)
 rename src/main/java/kieker/analysis/{ => util}/graph/util/dot/DotGraph.java (90%)
 rename src/main/java/kieker/analysis/{ => util}/graph/util/dot/DotGraphType.java (50%)
 rename src/main/java/kieker/analysis/{ => util}/graph/util/dot/DotGraphWriter.java (94%)

diff --git a/src/main/java/kieker/analysis/TraceAnalysisConfiguration.java b/src/main/java/kieker/analysis/TraceAnalysisConfiguration.java
index 4ec06db4..23cdbc8d 100644
--- a/src/main/java/kieker/analysis/TraceAnalysisConfiguration.java
+++ b/src/main/java/kieker/analysis/TraceAnalysisConfiguration.java
@@ -11,9 +11,6 @@ import kieker.analysis.domain.AggregatedOperationCall;
 import kieker.analysis.domain.AggregatedTrace;
 import kieker.analysis.domain.OperationCall;
 import kieker.analysis.domain.Trace;
-import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.export.dot.DotFileWriterStage;
-import kieker.analysis.graph.export.graphml.GraphMLFileWriterComposite;
 import kieker.analysis.stage.tracediagnosis.AllowedRecordsFilter;
 import kieker.analysis.stage.tracediagnosis.BeginEndOfMonitoringDetector;
 import kieker.analysis.stage.tracediagnosis.OperationCallHandlerComposite;
@@ -22,6 +19,9 @@ import kieker.analysis.stage.tracediagnosis.TraceAggregationComposite;
 import kieker.analysis.stage.tracediagnosis.TraceReconstructionComposite;
 import kieker.analysis.trace.traversal.AggrTraceTraverserStage;
 import kieker.analysis.trace.traversal.TraceTraverserStage;
+import kieker.analysis.util.graph.Graph;
+import kieker.analysis.util.graph.export.dot.DotFileWriterStage;
+import kieker.analysis.util.graph.export.graphml.GraphMLFileWriterComposite;
 import kieker.common.record.IMonitoringRecord;
 import kieker.common.record.misc.KiekerMetadataRecord;
 
diff --git a/src/main/java/kieker/analysis/graph/GraphTester.java b/src/main/java/kieker/analysis/dev/GraphTester.java
similarity index 93%
rename from src/main/java/kieker/analysis/graph/GraphTester.java
rename to src/main/java/kieker/analysis/dev/GraphTester.java
index 27b2d9e9..7de747dd 100644
--- a/src/main/java/kieker/analysis/graph/GraphTester.java
+++ b/src/main/java/kieker/analysis/dev/GraphTester.java
@@ -1,10 +1,13 @@
-package kieker.analysis.graph;
+package kieker.analysis.dev;
 
 import java.io.OutputStreamWriter;
 import java.util.ArrayList;
 
-import kieker.analysis.graph.export.dot.DotExporter;
-import kieker.analysis.graph.impl.GraphImpl;
+import kieker.analysis.util.graph.Edge;
+import kieker.analysis.util.graph.Graph;
+import kieker.analysis.util.graph.Vertex;
+import kieker.analysis.util.graph.export.dot.DotExporter;
+import kieker.analysis.util.graph.impl.GraphImpl;
 
 public class GraphTester {
 
diff --git a/src/main/java/kieker/analysis/graph/traversal/EdgeVisitor.java b/src/main/java/kieker/analysis/graph/traversal/EdgeVisitor.java
deleted file mode 100644
index 6a5de1d3..00000000
--- a/src/main/java/kieker/analysis/graph/traversal/EdgeVisitor.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package kieker.analysis.graph.traversal;
-
-import kieker.analysis.graph.Edge;
-
-public interface EdgeVisitor {
-
-	public void visitEdge(Edge edge);
-
-}
diff --git a/src/main/java/kieker/analysis/graph/traversal/VertexVisitor.java b/src/main/java/kieker/analysis/graph/traversal/VertexVisitor.java
deleted file mode 100644
index ed503994..00000000
--- a/src/main/java/kieker/analysis/graph/traversal/VertexVisitor.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package kieker.analysis.graph.traversal;
-
-import kieker.analysis.graph.Vertex;
-
-public interface VertexVisitor {
-
-	public void visitVertex(Vertex vertex);
-
-}
diff --git a/src/main/java/kieker/analysis/trace/graphoutput/DotGraphWriter.java b/src/main/java/kieker/analysis/trace/graphoutput/DotGraphWriter.java
index 914f3b7b..47773756 100644
--- a/src/main/java/kieker/analysis/trace/graphoutput/DotGraphWriter.java
+++ b/src/main/java/kieker/analysis/trace/graphoutput/DotGraphWriter.java
@@ -14,9 +14,9 @@ import com.tinkerpop.blueprints.Edge;
 import com.tinkerpop.blueprints.Graph;
 import com.tinkerpop.blueprints.Vertex;
 
-import kieker.analysis.graph.export.dot.DotFileWriterStage;
 import kieker.analysis.util.DotBuilder;
 import kieker.analysis.util.blueprintsgraph.NamedGraph;
+import kieker.analysis.util.graph.export.dot.DotFileWriterStage;
 
 import teetime.framework.AbstractConsumerStage;
 
diff --git a/src/main/java/kieker/analysis/trace/graphoutput/GraphMLWriter.java b/src/main/java/kieker/analysis/trace/graphoutput/GraphMLWriter.java
index 64a6d3b8..84a47670 100644
--- a/src/main/java/kieker/analysis/trace/graphoutput/GraphMLWriter.java
+++ b/src/main/java/kieker/analysis/trace/graphoutput/GraphMLWriter.java
@@ -4,8 +4,8 @@ import java.io.IOException;
 
 import com.tinkerpop.blueprints.Graph;
 
-import kieker.analysis.graph.export.graphml.GraphMLFileWriterComposite;
 import kieker.analysis.util.blueprintsgraph.NamedGraph;
+import kieker.analysis.util.graph.export.graphml.GraphMLFileWriterComposite;
 
 import teetime.framework.AbstractConsumerStage;
 
diff --git a/src/main/java/kieker/analysis/trace/traversal/AbstractTraceToGraphTransformer.java b/src/main/java/kieker/analysis/trace/traversal/AbstractTraceToGraphTransformer.java
index 4307507d..1606c373 100644
--- a/src/main/java/kieker/analysis/trace/traversal/AbstractTraceToGraphTransformer.java
+++ b/src/main/java/kieker/analysis/trace/traversal/AbstractTraceToGraphTransformer.java
@@ -1,10 +1,10 @@
 package kieker.analysis.trace.traversal;
 
 import kieker.analysis.domain.AbstractOperationCall;
-import kieker.analysis.graph.Edge;
-import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.Vertex;
-import kieker.analysis.graph.impl.GraphImpl;
+import kieker.analysis.util.graph.Edge;
+import kieker.analysis.util.graph.Graph;
+import kieker.analysis.util.graph.Vertex;
+import kieker.analysis.util.graph.impl.GraphImpl;
 
 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 4203ed75..51f761a6 100644
--- a/src/main/java/kieker/analysis/trace/traversal/AggrTraceToGraphTransformer.java
+++ b/src/main/java/kieker/analysis/trace/traversal/AggrTraceToGraphTransformer.java
@@ -1,9 +1,9 @@
 package kieker.analysis.trace.traversal;
 
 import kieker.analysis.domain.AggregatedOperationCall;
-import kieker.analysis.graph.Edge;
-import kieker.analysis.graph.Vertex;
 import kieker.analysis.util.NameConverter;
+import kieker.analysis.util.graph.Edge;
+import kieker.analysis.util.graph.Vertex;
 
 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 52eba1aa..eb29c6fa 100644
--- a/src/main/java/kieker/analysis/trace/traversal/AggrTraceTraverserStage.java
+++ b/src/main/java/kieker/analysis/trace/traversal/AggrTraceTraverserStage.java
@@ -2,7 +2,7 @@ package kieker.analysis.trace.traversal;
 
 import kieker.analysis.domain.AggregatedOperationCall;
 import kieker.analysis.domain.AggregatedTrace;
-import kieker.analysis.graph.Graph;
+import kieker.analysis.util.graph.Graph;
 
 import teetime.stage.basic.AbstractTransformation;
 
diff --git a/src/main/java/kieker/analysis/trace/traversal/TraceToGraphTransformer.java b/src/main/java/kieker/analysis/trace/traversal/TraceToGraphTransformer.java
index b139dcd4..5fa9f590 100644
--- a/src/main/java/kieker/analysis/trace/traversal/TraceToGraphTransformer.java
+++ b/src/main/java/kieker/analysis/trace/traversal/TraceToGraphTransformer.java
@@ -1,9 +1,9 @@
 package kieker.analysis.trace.traversal;
 
 import kieker.analysis.domain.OperationCall;
-import kieker.analysis.graph.Edge;
-import kieker.analysis.graph.Vertex;
 import kieker.analysis.util.NameConverter;
+import kieker.analysis.util.graph.Edge;
+import kieker.analysis.util.graph.Vertex;
 
 public class TraceToGraphTransformer extends AbstractTraceToGraphTransformer<OperationCall> {
 
diff --git a/src/main/java/kieker/analysis/trace/traversal/TraceTraverserStage.java b/src/main/java/kieker/analysis/trace/traversal/TraceTraverserStage.java
index 7c17e798..5a0322b5 100644
--- a/src/main/java/kieker/analysis/trace/traversal/TraceTraverserStage.java
+++ b/src/main/java/kieker/analysis/trace/traversal/TraceTraverserStage.java
@@ -2,7 +2,7 @@ package kieker.analysis.trace.traversal;
 
 import kieker.analysis.domain.OperationCall;
 import kieker.analysis.domain.Trace;
-import kieker.analysis.graph.Graph;
+import kieker.analysis.util.graph.Graph;
 
 import teetime.stage.basic.AbstractTransformation;
 
diff --git a/src/main/java/kieker/analysis/util/DotBuilder.java b/src/main/java/kieker/analysis/util/DotBuilder.java
index 638ae36e..c00f1cae 100644
--- a/src/main/java/kieker/analysis/util/DotBuilder.java
+++ b/src/main/java/kieker/analysis/util/DotBuilder.java
@@ -6,7 +6,7 @@ import java.util.Map.Entry;
 
 import com.google.common.base.Joiner;
 
-import kieker.analysis.graph.util.dot.DotGraphWriter;
+import kieker.analysis.util.graph.util.dot.DotGraphWriter;
 
 /**
  * Simple class for building and representing dot graph files.
diff --git a/src/main/java/kieker/analysis/graph/Direction.java b/src/main/java/kieker/analysis/util/graph/Direction.java
similarity index 90%
rename from src/main/java/kieker/analysis/graph/Direction.java
rename to src/main/java/kieker/analysis/util/graph/Direction.java
index d10ff42b..666442f6 100644
--- a/src/main/java/kieker/analysis/graph/Direction.java
+++ b/src/main/java/kieker/analysis/util/graph/Direction.java
@@ -1,4 +1,4 @@
-package kieker.analysis.graph;
+package kieker.analysis.util.graph;
 
 /**
  * Direction is used to denote the direction of an edge or location of a vertex on an edge.
diff --git a/src/main/java/kieker/analysis/graph/Edge.java b/src/main/java/kieker/analysis/util/graph/Edge.java
similarity index 78%
rename from src/main/java/kieker/analysis/graph/Edge.java
rename to src/main/java/kieker/analysis/util/graph/Edge.java
index 78e516be..a75ae7fc 100644
--- a/src/main/java/kieker/analysis/graph/Edge.java
+++ b/src/main/java/kieker/analysis/util/graph/Edge.java
@@ -1,4 +1,4 @@
-package kieker.analysis.graph;
+package kieker.analysis.util.graph;
 
 public interface Edge extends GraphElement {
 
diff --git a/src/main/java/kieker/analysis/graph/Element.java b/src/main/java/kieker/analysis/util/graph/Element.java
similarity index 82%
rename from src/main/java/kieker/analysis/graph/Element.java
rename to src/main/java/kieker/analysis/util/graph/Element.java
index 1e39d8d6..4318e8a8 100644
--- a/src/main/java/kieker/analysis/graph/Element.java
+++ b/src/main/java/kieker/analysis/util/graph/Element.java
@@ -1,4 +1,4 @@
-package kieker.analysis.graph;
+package kieker.analysis.util.graph;
 
 import java.util.Set;
 
diff --git a/src/main/java/kieker/analysis/graph/Graph.java b/src/main/java/kieker/analysis/util/graph/Graph.java
similarity index 92%
rename from src/main/java/kieker/analysis/graph/Graph.java
rename to src/main/java/kieker/analysis/util/graph/Graph.java
index ca9f3de2..d93e6c8c 100644
--- a/src/main/java/kieker/analysis/graph/Graph.java
+++ b/src/main/java/kieker/analysis/util/graph/Graph.java
@@ -1,4 +1,4 @@
-package kieker.analysis.graph;
+package kieker.analysis.util.graph;
 
 public interface Graph extends Element {
 
diff --git a/src/main/java/kieker/analysis/graph/GraphElement.java b/src/main/java/kieker/analysis/util/graph/GraphElement.java
similarity index 75%
rename from src/main/java/kieker/analysis/graph/GraphElement.java
rename to src/main/java/kieker/analysis/util/graph/GraphElement.java
index 58a91e1c..2fa271d5 100644
--- a/src/main/java/kieker/analysis/graph/GraphElement.java
+++ b/src/main/java/kieker/analysis/util/graph/GraphElement.java
@@ -1,4 +1,4 @@
-package kieker.analysis.graph;
+package kieker.analysis.util.graph;
 
 public abstract interface GraphElement extends Element {
 
diff --git a/src/main/java/kieker/analysis/graph/Vertex.java b/src/main/java/kieker/analysis/util/graph/Vertex.java
similarity index 91%
rename from src/main/java/kieker/analysis/graph/Vertex.java
rename to src/main/java/kieker/analysis/util/graph/Vertex.java
index 5fa0403d..7e12eefd 100644
--- a/src/main/java/kieker/analysis/graph/Vertex.java
+++ b/src/main/java/kieker/analysis/util/graph/Vertex.java
@@ -1,4 +1,4 @@
-package kieker.analysis.graph;
+package kieker.analysis.util.graph;
 
 public interface Vertex extends GraphElement {
 
diff --git a/src/main/java/kieker/analysis/graph/export/AbstractTransformer.java b/src/main/java/kieker/analysis/util/graph/export/AbstractTransformer.java
similarity index 65%
rename from src/main/java/kieker/analysis/graph/export/AbstractTransformer.java
rename to src/main/java/kieker/analysis/util/graph/export/AbstractTransformer.java
index 352a1767..d820e3fd 100644
--- a/src/main/java/kieker/analysis/graph/export/AbstractTransformer.java
+++ b/src/main/java/kieker/analysis/util/graph/export/AbstractTransformer.java
@@ -1,12 +1,12 @@
-package kieker.analysis.graph.export;
-
-import kieker.analysis.graph.Edge;
-import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.Vertex;
-import kieker.analysis.graph.traversal.EdgeVisitor;
-import kieker.analysis.graph.traversal.FlatGraphTraverser;
-import kieker.analysis.graph.traversal.GraphTraverser;
-import kieker.analysis.graph.traversal.VertexVisitor;
+package kieker.analysis.util.graph.export;
+
+import kieker.analysis.util.graph.Edge;
+import kieker.analysis.util.graph.Graph;
+import kieker.analysis.util.graph.Vertex;
+import kieker.analysis.util.graph.traversal.EdgeVisitor;
+import kieker.analysis.util.graph.traversal.FlatGraphTraverser;
+import kieker.analysis.util.graph.traversal.GraphTraverser;
+import kieker.analysis.util.graph.traversal.VertexVisitor;
 
 public abstract class AbstractTransformer<O> implements VertexVisitor, EdgeVisitor {
 
diff --git a/src/main/java/kieker/analysis/graph/export/blueprints/BlueprintsTransformer.java b/src/main/java/kieker/analysis/util/graph/export/blueprints/BlueprintsTransformer.java
similarity index 83%
rename from src/main/java/kieker/analysis/graph/export/blueprints/BlueprintsTransformer.java
rename to src/main/java/kieker/analysis/util/graph/export/blueprints/BlueprintsTransformer.java
index 3f474754..f6f81f7d 100644
--- a/src/main/java/kieker/analysis/graph/export/blueprints/BlueprintsTransformer.java
+++ b/src/main/java/kieker/analysis/util/graph/export/blueprints/BlueprintsTransformer.java
@@ -1,15 +1,15 @@
-package kieker.analysis.graph.export.blueprints;
+package kieker.analysis.util.graph.export.blueprints;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import com.tinkerpop.blueprints.impls.tg.TinkerGraph;
 
-import kieker.analysis.graph.Direction;
-import kieker.analysis.graph.Edge;
-import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.Vertex;
-import kieker.analysis.graph.export.AbstractTransformer;
+import kieker.analysis.util.graph.Direction;
+import kieker.analysis.util.graph.Edge;
+import kieker.analysis.util.graph.Graph;
+import kieker.analysis.util.graph.Vertex;
+import kieker.analysis.util.graph.export.AbstractTransformer;
 
 public class BlueprintsTransformer extends AbstractTransformer<com.tinkerpop.blueprints.Graph> {
 
diff --git a/src/main/java/kieker/analysis/graph/export/blueprints/BlueprintsTransformerStage.java b/src/main/java/kieker/analysis/util/graph/export/blueprints/BlueprintsTransformerStage.java
similarity index 76%
rename from src/main/java/kieker/analysis/graph/export/blueprints/BlueprintsTransformerStage.java
rename to src/main/java/kieker/analysis/util/graph/export/blueprints/BlueprintsTransformerStage.java
index 63d57f06..ebab5b7b 100644
--- a/src/main/java/kieker/analysis/graph/export/blueprints/BlueprintsTransformerStage.java
+++ b/src/main/java/kieker/analysis/util/graph/export/blueprints/BlueprintsTransformerStage.java
@@ -1,6 +1,6 @@
-package kieker.analysis.graph.export.blueprints;
+package kieker.analysis.util.graph.export.blueprints;
 
-import kieker.analysis.graph.Graph;
+import kieker.analysis.util.graph.Graph;
 
 import teetime.stage.basic.AbstractTransformation;
 
diff --git a/src/main/java/kieker/analysis/graph/export/dot/DotElementExporter.java b/src/main/java/kieker/analysis/util/graph/export/dot/DotElementExporter.java
similarity index 86%
rename from src/main/java/kieker/analysis/graph/export/dot/DotElementExporter.java
rename to src/main/java/kieker/analysis/util/graph/export/dot/DotElementExporter.java
index 32c26a26..89a5f94d 100644
--- a/src/main/java/kieker/analysis/graph/export/dot/DotElementExporter.java
+++ b/src/main/java/kieker/analysis/util/graph/export/dot/DotElementExporter.java
@@ -1,18 +1,19 @@
-package kieker.analysis.graph.export.dot;
+package kieker.analysis.util.graph.export.dot;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 
-import kieker.analysis.graph.Direction;
-import kieker.analysis.graph.Edge;
-import kieker.analysis.graph.Element;
-import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.Vertex;
-import kieker.analysis.graph.export.AbstractTransformer;
-import kieker.analysis.graph.util.dot.DotGraphWriter;
+import kieker.analysis.util.graph.Direction;
+import kieker.analysis.util.graph.Edge;
+import kieker.analysis.util.graph.Element;
+import kieker.analysis.util.graph.Graph;
+import kieker.analysis.util.graph.Vertex;
+import kieker.analysis.util.graph.export.AbstractTransformer;
+import kieker.analysis.util.graph.util.dot.DotGraphWriter;
+
+import java.util.Set;
 
 class DotElementExporter extends AbstractTransformer<Void> {
 
diff --git a/src/main/java/kieker/analysis/graph/export/dot/DotExportPropertyTokens.java b/src/main/java/kieker/analysis/util/graph/export/dot/DotExportPropertyTokens.java
similarity index 79%
rename from src/main/java/kieker/analysis/graph/export/dot/DotExportPropertyTokens.java
rename to src/main/java/kieker/analysis/util/graph/export/dot/DotExportPropertyTokens.java
index 240eb9a2..67f86c0e 100644
--- a/src/main/java/kieker/analysis/graph/export/dot/DotExportPropertyTokens.java
+++ b/src/main/java/kieker/analysis/util/graph/export/dot/DotExportPropertyTokens.java
@@ -1,4 +1,4 @@
-package kieker.analysis.graph.export.dot;
+package kieker.analysis.util.graph.export.dot;
 
 public final class DotExportPropertyTokens {
 
diff --git a/src/main/java/kieker/analysis/graph/export/dot/DotExporter.java b/src/main/java/kieker/analysis/util/graph/export/dot/DotExporter.java
similarity index 79%
rename from src/main/java/kieker/analysis/graph/export/dot/DotExporter.java
rename to src/main/java/kieker/analysis/util/graph/export/dot/DotExporter.java
index 0260e6f3..27d4ec99 100644
--- a/src/main/java/kieker/analysis/graph/export/dot/DotExporter.java
+++ b/src/main/java/kieker/analysis/util/graph/export/dot/DotExporter.java
@@ -1,10 +1,10 @@
-package kieker.analysis.graph.export.dot;
+package kieker.analysis.util.graph.export.dot;
 
 import java.io.IOException;
 import java.io.Writer;
 
-import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.util.dot.DotGraphWriter;
+import kieker.analysis.util.graph.Graph;
+import kieker.analysis.util.graph.util.dot.DotGraphWriter;
 
 public class DotExporter extends DotElementExporter {
 
diff --git a/src/main/java/kieker/analysis/graph/export/dot/DotFileWriterStage.java b/src/main/java/kieker/analysis/util/graph/export/dot/DotFileWriterStage.java
similarity index 74%
rename from src/main/java/kieker/analysis/graph/export/dot/DotFileWriterStage.java
rename to src/main/java/kieker/analysis/util/graph/export/dot/DotFileWriterStage.java
index 6d0ad70a..9ea6190a 100644
--- a/src/main/java/kieker/analysis/graph/export/dot/DotFileWriterStage.java
+++ b/src/main/java/kieker/analysis/util/graph/export/dot/DotFileWriterStage.java
@@ -1,11 +1,11 @@
-package kieker.analysis.graph.export.dot;
+package kieker.analysis.util.graph.export.dot;
 
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.function.Function;
 
-import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.mapping.SimpleFileNameMapper;
+import kieker.analysis.util.graph.Graph;
+import kieker.analysis.util.graph.mapping.SimpleFileNameMapper;
 
 public class DotFileWriterStage extends DotWriterStage {
 
diff --git a/src/main/java/kieker/analysis/graph/export/dot/DotWriterStage.java b/src/main/java/kieker/analysis/util/graph/export/dot/DotWriterStage.java
similarity index 82%
rename from src/main/java/kieker/analysis/graph/export/dot/DotWriterStage.java
rename to src/main/java/kieker/analysis/util/graph/export/dot/DotWriterStage.java
index 8879fe56..ae81d574 100644
--- a/src/main/java/kieker/analysis/graph/export/dot/DotWriterStage.java
+++ b/src/main/java/kieker/analysis/util/graph/export/dot/DotWriterStage.java
@@ -1,9 +1,9 @@
-package kieker.analysis.graph.export.dot;
+package kieker.analysis.util.graph.export.dot;
 
 import java.io.Writer;
 import java.util.function.Function;
 
-import kieker.analysis.graph.Graph;
+import kieker.analysis.util.graph.Graph;
 
 import teetime.framework.AbstractConsumerStage;
 
diff --git a/src/main/java/kieker/analysis/graph/export/graphml/GraphMLFileWriterComposite.java b/src/main/java/kieker/analysis/util/graph/export/graphml/GraphMLFileWriterComposite.java
similarity index 76%
rename from src/main/java/kieker/analysis/graph/export/graphml/GraphMLFileWriterComposite.java
rename to src/main/java/kieker/analysis/util/graph/export/graphml/GraphMLFileWriterComposite.java
index 34150188..f5713e72 100644
--- a/src/main/java/kieker/analysis/graph/export/graphml/GraphMLFileWriterComposite.java
+++ b/src/main/java/kieker/analysis/util/graph/export/graphml/GraphMLFileWriterComposite.java
@@ -1,11 +1,11 @@
-package kieker.analysis.graph.export.graphml;
+package kieker.analysis.util.graph.export.graphml;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.util.function.Function;
 
-import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.mapping.SimpleFileNameMapper;
+import kieker.analysis.util.graph.Graph;
+import kieker.analysis.util.graph.mapping.SimpleFileNameMapper;
 
 public class GraphMLFileWriterComposite extends GraphMLWriterComposite {
 
diff --git a/src/main/java/kieker/analysis/graph/export/graphml/GraphMLTransformationStage.java b/src/main/java/kieker/analysis/util/graph/export/graphml/GraphMLTransformationStage.java
similarity index 90%
rename from src/main/java/kieker/analysis/graph/export/graphml/GraphMLTransformationStage.java
rename to src/main/java/kieker/analysis/util/graph/export/graphml/GraphMLTransformationStage.java
index 311b5bee..5ab46db3 100644
--- a/src/main/java/kieker/analysis/graph/export/graphml/GraphMLTransformationStage.java
+++ b/src/main/java/kieker/analysis/util/graph/export/graphml/GraphMLTransformationStage.java
@@ -1,4 +1,4 @@
-package kieker.analysis.graph.export.graphml;
+package kieker.analysis.util.graph.export.graphml;
 
 import java.io.OutputStream;
 import java.util.function.Function;
@@ -8,8 +8,8 @@ import javax.xml.bind.JAXBElement;
 import org.graphdrawing.graphml.GraphmlType;
 import org.graphdrawing.graphml.ObjectFactory;
 
-import kieker.analysis.graph.Graph;
 import kieker.analysis.util.JAXBMarshalElement;
+import kieker.analysis.util.graph.Graph;
 
 import teetime.stage.basic.AbstractTransformation;
 
diff --git a/src/main/java/kieker/analysis/graph/export/graphml/GraphMLWriterComposite.java b/src/main/java/kieker/analysis/util/graph/export/graphml/GraphMLWriterComposite.java
similarity index 87%
rename from src/main/java/kieker/analysis/graph/export/graphml/GraphMLWriterComposite.java
rename to src/main/java/kieker/analysis/util/graph/export/graphml/GraphMLWriterComposite.java
index 2c7a708b..7ed9e673 100644
--- a/src/main/java/kieker/analysis/graph/export/graphml/GraphMLWriterComposite.java
+++ b/src/main/java/kieker/analysis/util/graph/export/graphml/GraphMLWriterComposite.java
@@ -1,12 +1,12 @@
-package kieker.analysis.graph.export.graphml;
+package kieker.analysis.util.graph.export.graphml;
 
 import java.io.OutputStream;
 import java.util.function.Function;
 
 import org.graphdrawing.graphml.GraphmlType;
 
-import kieker.analysis.graph.Graph;
 import kieker.analysis.util.JAXBMarshalStage;
+import kieker.analysis.util.graph.Graph;
 
 import teetime.framework.CompositeStage;
 import teetime.framework.InputPort;
diff --git a/src/main/java/kieker/analysis/graph/export/graphml/GraphTypeTransformer.java b/src/main/java/kieker/analysis/util/graph/export/graphml/GraphTypeTransformer.java
similarity index 85%
rename from src/main/java/kieker/analysis/graph/export/graphml/GraphTypeTransformer.java
rename to src/main/java/kieker/analysis/util/graph/export/graphml/GraphTypeTransformer.java
index 1ee3cfe9..56be5f9a 100644
--- a/src/main/java/kieker/analysis/graph/export/graphml/GraphTypeTransformer.java
+++ b/src/main/java/kieker/analysis/util/graph/export/graphml/GraphTypeTransformer.java
@@ -1,4 +1,4 @@
-package kieker.analysis.graph.export.graphml;
+package kieker.analysis.util.graph.export.graphml;
 
 import java.util.List;
 
@@ -8,11 +8,11 @@ import org.graphdrawing.graphml.GraphEdgedefaultType;
 import org.graphdrawing.graphml.GraphType;
 import org.graphdrawing.graphml.NodeType;
 
-import kieker.analysis.graph.Direction;
-import kieker.analysis.graph.Edge;
-import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.Vertex;
-import kieker.analysis.graph.export.AbstractTransformer;
+import kieker.analysis.util.graph.Direction;
+import kieker.analysis.util.graph.Edge;
+import kieker.analysis.util.graph.Graph;
+import kieker.analysis.util.graph.Vertex;
+import kieker.analysis.util.graph.export.AbstractTransformer;
 
 public class GraphTypeTransformer extends AbstractTransformer<GraphType> {
 
diff --git a/src/main/java/kieker/analysis/graph/impl/EdgeImpl.java b/src/main/java/kieker/analysis/util/graph/impl/EdgeImpl.java
similarity index 80%
rename from src/main/java/kieker/analysis/graph/impl/EdgeImpl.java
rename to src/main/java/kieker/analysis/util/graph/impl/EdgeImpl.java
index 16e53e25..c4428497 100644
--- a/src/main/java/kieker/analysis/graph/impl/EdgeImpl.java
+++ b/src/main/java/kieker/analysis/util/graph/impl/EdgeImpl.java
@@ -1,8 +1,8 @@
-package kieker.analysis.graph.impl;
+package kieker.analysis.util.graph.impl;
 
-import kieker.analysis.graph.Direction;
-import kieker.analysis.graph.Edge;
-import kieker.analysis.graph.Vertex;
+import kieker.analysis.util.graph.Direction;
+import kieker.analysis.util.graph.Edge;
+import kieker.analysis.util.graph.Vertex;
 
 class EdgeImpl extends GraphElementImpl implements Edge {
 
diff --git a/src/main/java/kieker/analysis/graph/impl/ElementImpl.java b/src/main/java/kieker/analysis/util/graph/impl/ElementImpl.java
similarity index 85%
rename from src/main/java/kieker/analysis/graph/impl/ElementImpl.java
rename to src/main/java/kieker/analysis/util/graph/impl/ElementImpl.java
index 02861de2..528add4e 100644
--- a/src/main/java/kieker/analysis/graph/impl/ElementImpl.java
+++ b/src/main/java/kieker/analysis/util/graph/impl/ElementImpl.java
@@ -1,11 +1,11 @@
-package kieker.analysis.graph.impl;
+package kieker.analysis.util.graph.impl;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import kieker.analysis.graph.Element;
+import kieker.analysis.util.graph.Element;
 
 abstract class ElementImpl implements Element {
 
diff --git a/src/main/java/kieker/analysis/graph/impl/ExceptionFactory.java b/src/main/java/kieker/analysis/util/graph/impl/ExceptionFactory.java
similarity index 98%
rename from src/main/java/kieker/analysis/graph/impl/ExceptionFactory.java
rename to src/main/java/kieker/analysis/util/graph/impl/ExceptionFactory.java
index 862e44aa..10c786fb 100644
--- a/src/main/java/kieker/analysis/graph/impl/ExceptionFactory.java
+++ b/src/main/java/kieker/analysis/util/graph/impl/ExceptionFactory.java
@@ -1,4 +1,4 @@
-package kieker.analysis.graph.impl;
+package kieker.analysis.util.graph.impl;
 
 /**
  * The ExceptionFactory provides standard exceptions for graphs.
diff --git a/src/main/java/kieker/analysis/graph/impl/GraphElementImpl.java b/src/main/java/kieker/analysis/util/graph/impl/GraphElementImpl.java
similarity index 80%
rename from src/main/java/kieker/analysis/graph/impl/GraphElementImpl.java
rename to src/main/java/kieker/analysis/util/graph/impl/GraphElementImpl.java
index efbf231d..69d508f0 100644
--- a/src/main/java/kieker/analysis/graph/impl/GraphElementImpl.java
+++ b/src/main/java/kieker/analysis/util/graph/impl/GraphElementImpl.java
@@ -1,6 +1,6 @@
-package kieker.analysis.graph.impl;
+package kieker.analysis.util.graph.impl;
 
-import kieker.analysis.graph.GraphElement;
+import kieker.analysis.util.graph.GraphElement;
 
 abstract class GraphElementImpl extends ElementImpl implements GraphElement {
 
diff --git a/src/main/java/kieker/analysis/graph/impl/GraphImpl.java b/src/main/java/kieker/analysis/util/graph/impl/GraphImpl.java
similarity index 95%
rename from src/main/java/kieker/analysis/graph/impl/GraphImpl.java
rename to src/main/java/kieker/analysis/util/graph/impl/GraphImpl.java
index 58cccb73..d6df8acd 100644
--- a/src/main/java/kieker/analysis/graph/impl/GraphImpl.java
+++ b/src/main/java/kieker/analysis/util/graph/impl/GraphImpl.java
@@ -1,14 +1,14 @@
-package kieker.analysis.graph.impl;
+package kieker.analysis.util.graph.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Stack;
 
-import kieker.analysis.graph.Direction;
-import kieker.analysis.graph.Edge;
-import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.Vertex;
+import kieker.analysis.util.graph.Direction;
+import kieker.analysis.util.graph.Edge;
+import kieker.analysis.util.graph.Graph;
+import kieker.analysis.util.graph.Vertex;
 
 public class GraphImpl extends ElementImpl implements Graph {
 
diff --git a/src/main/java/kieker/analysis/graph/impl/VertexImpl.java b/src/main/java/kieker/analysis/util/graph/impl/VertexImpl.java
similarity index 91%
rename from src/main/java/kieker/analysis/graph/impl/VertexImpl.java
rename to src/main/java/kieker/analysis/util/graph/impl/VertexImpl.java
index 74f9dac6..7dd55e0b 100644
--- a/src/main/java/kieker/analysis/graph/impl/VertexImpl.java
+++ b/src/main/java/kieker/analysis/util/graph/impl/VertexImpl.java
@@ -1,13 +1,13 @@
-package kieker.analysis.graph.impl;
+package kieker.analysis.util.graph.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import kieker.analysis.graph.Direction;
-import kieker.analysis.graph.Edge;
-import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.Vertex;
+import kieker.analysis.util.graph.Direction;
+import kieker.analysis.util.graph.Edge;
+import kieker.analysis.util.graph.Graph;
+import kieker.analysis.util.graph.Vertex;
 
 class VertexImpl extends GraphElementImpl implements Vertex {
 
diff --git a/src/main/java/kieker/analysis/graph/mapping/SimpleFileNameMapper.java b/src/main/java/kieker/analysis/util/graph/mapping/SimpleFileNameMapper.java
similarity index 84%
rename from src/main/java/kieker/analysis/graph/mapping/SimpleFileNameMapper.java
rename to src/main/java/kieker/analysis/util/graph/mapping/SimpleFileNameMapper.java
index 2b9431cb..87f00a85 100644
--- a/src/main/java/kieker/analysis/graph/mapping/SimpleFileNameMapper.java
+++ b/src/main/java/kieker/analysis/util/graph/mapping/SimpleFileNameMapper.java
@@ -1,8 +1,8 @@
-package kieker.analysis.graph.mapping;
+package kieker.analysis.util.graph.mapping;
 
 import java.util.function.Function;
 
-import kieker.analysis.graph.Graph;
+import kieker.analysis.util.graph.Graph;
 
 /**
  * This mapper maps a graph to a file name with the pattern:
diff --git a/src/main/java/kieker/analysis/graph/traversal/DeepGraphTraverser.java b/src/main/java/kieker/analysis/util/graph/traversal/DeepGraphTraverser.java
similarity index 80%
rename from src/main/java/kieker/analysis/graph/traversal/DeepGraphTraverser.java
rename to src/main/java/kieker/analysis/util/graph/traversal/DeepGraphTraverser.java
index 4c6aba38..d86a4172 100644
--- a/src/main/java/kieker/analysis/graph/traversal/DeepGraphTraverser.java
+++ b/src/main/java/kieker/analysis/util/graph/traversal/DeepGraphTraverser.java
@@ -1,10 +1,10 @@
-package kieker.analysis.graph.traversal;
+package kieker.analysis.util.graph.traversal;
 
 import java.util.List;
 
-import kieker.analysis.graph.Edge;
-import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.Vertex;
+import kieker.analysis.util.graph.Edge;
+import kieker.analysis.util.graph.Graph;
+import kieker.analysis.util.graph.Vertex;
 
 public class DeepGraphTraverser extends GraphTraverser {
 
diff --git a/src/main/java/kieker/analysis/util/graph/traversal/EdgeVisitor.java b/src/main/java/kieker/analysis/util/graph/traversal/EdgeVisitor.java
new file mode 100644
index 00000000..0b53e12f
--- /dev/null
+++ b/src/main/java/kieker/analysis/util/graph/traversal/EdgeVisitor.java
@@ -0,0 +1,9 @@
+package kieker.analysis.util.graph.traversal;
+
+import kieker.analysis.util.graph.Edge;
+
+public interface EdgeVisitor {
+
+	public void visitEdge(Edge edge);
+
+}
diff --git a/src/main/java/kieker/analysis/graph/traversal/FlatGraphTraverser.java b/src/main/java/kieker/analysis/util/graph/traversal/FlatGraphTraverser.java
similarity index 78%
rename from src/main/java/kieker/analysis/graph/traversal/FlatGraphTraverser.java
rename to src/main/java/kieker/analysis/util/graph/traversal/FlatGraphTraverser.java
index 020af242..d26005b5 100644
--- a/src/main/java/kieker/analysis/graph/traversal/FlatGraphTraverser.java
+++ b/src/main/java/kieker/analysis/util/graph/traversal/FlatGraphTraverser.java
@@ -1,10 +1,10 @@
-package kieker.analysis.graph.traversal;
+package kieker.analysis.util.graph.traversal;
 
 import java.util.List;
 
-import kieker.analysis.graph.Edge;
-import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.Vertex;
+import kieker.analysis.util.graph.Edge;
+import kieker.analysis.util.graph.Graph;
+import kieker.analysis.util.graph.Vertex;
 
 public class FlatGraphTraverser extends GraphTraverser {
 
diff --git a/src/main/java/kieker/analysis/graph/traversal/GraphTraverser.java b/src/main/java/kieker/analysis/util/graph/traversal/GraphTraverser.java
similarity index 90%
rename from src/main/java/kieker/analysis/graph/traversal/GraphTraverser.java
rename to src/main/java/kieker/analysis/util/graph/traversal/GraphTraverser.java
index b1bce427..ddd0176c 100644
--- a/src/main/java/kieker/analysis/graph/traversal/GraphTraverser.java
+++ b/src/main/java/kieker/analysis/util/graph/traversal/GraphTraverser.java
@@ -1,9 +1,9 @@
-package kieker.analysis.graph.traversal;
+package kieker.analysis.util.graph.traversal;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import kieker.analysis.graph.Graph;
+import kieker.analysis.util.graph.Graph;
 
 public abstract class GraphTraverser {
 
diff --git a/src/main/java/kieker/analysis/util/graph/traversal/VertexVisitor.java b/src/main/java/kieker/analysis/util/graph/traversal/VertexVisitor.java
new file mode 100644
index 00000000..a6752105
--- /dev/null
+++ b/src/main/java/kieker/analysis/util/graph/traversal/VertexVisitor.java
@@ -0,0 +1,9 @@
+package kieker.analysis.util.graph.traversal;
+
+import kieker.analysis.util.graph.Vertex;
+
+public interface VertexVisitor {
+
+	public void visitVertex(Vertex vertex);
+
+}
diff --git a/src/main/java/kieker/analysis/graph/util/IndentWriter.java b/src/main/java/kieker/analysis/util/graph/util/IndentWriter.java
similarity index 92%
rename from src/main/java/kieker/analysis/graph/util/IndentWriter.java
rename to src/main/java/kieker/analysis/util/graph/util/IndentWriter.java
index ae43c5c0..b880f982 100644
--- a/src/main/java/kieker/analysis/graph/util/IndentWriter.java
+++ b/src/main/java/kieker/analysis/util/graph/util/IndentWriter.java
@@ -1,4 +1,4 @@
-package kieker.analysis.graph.util;
+package kieker.analysis.util.graph.util;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/main/java/kieker/analysis/graph/util/dot/DotGraph.java b/src/main/java/kieker/analysis/util/graph/util/dot/DotGraph.java
similarity index 90%
rename from src/main/java/kieker/analysis/graph/util/dot/DotGraph.java
rename to src/main/java/kieker/analysis/util/graph/util/dot/DotGraph.java
index f64c2b73..fbe966b9 100644
--- a/src/main/java/kieker/analysis/graph/util/dot/DotGraph.java
+++ b/src/main/java/kieker/analysis/util/graph/util/dot/DotGraph.java
@@ -1,4 +1,4 @@
-package kieker.analysis.graph.util.dot;
+package kieker.analysis.util.graph.util.dot;
 
 public final class DotGraph {
 
diff --git a/src/main/java/kieker/analysis/graph/util/dot/DotGraphType.java b/src/main/java/kieker/analysis/util/graph/util/dot/DotGraphType.java
similarity index 50%
rename from src/main/java/kieker/analysis/graph/util/dot/DotGraphType.java
rename to src/main/java/kieker/analysis/util/graph/util/dot/DotGraphType.java
index 4f39a8d0..f46cf154 100644
--- a/src/main/java/kieker/analysis/graph/util/dot/DotGraphType.java
+++ b/src/main/java/kieker/analysis/util/graph/util/dot/DotGraphType.java
@@ -1,4 +1,4 @@
-package kieker.analysis.graph.util.dot;
+package kieker.analysis.util.graph.util.dot;
 
 public enum DotGraphType {
 
diff --git a/src/main/java/kieker/analysis/graph/util/dot/DotGraphWriter.java b/src/main/java/kieker/analysis/util/graph/util/dot/DotGraphWriter.java
similarity index 94%
rename from src/main/java/kieker/analysis/graph/util/dot/DotGraphWriter.java
rename to src/main/java/kieker/analysis/util/graph/util/dot/DotGraphWriter.java
index 91a2522b..374768c7 100644
--- a/src/main/java/kieker/analysis/graph/util/dot/DotGraphWriter.java
+++ b/src/main/java/kieker/analysis/util/graph/util/dot/DotGraphWriter.java
@@ -1,11 +1,11 @@
-package kieker.analysis.graph.util.dot;
+package kieker.analysis.util.graph.util.dot;
 
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import kieker.analysis.graph.util.IndentWriter;
+import kieker.analysis.util.graph.util.IndentWriter;
 
 /**
  * Class to build and write a DOT Graph to a writer.
-- 
GitLab