diff --git a/src/main/java/kieker/gui/common/ISubController.java b/src/main/java/kieker/gui/common/ISubController.java
index a3a66da525b1850a0dbe8f8b70ee990eed2c036a..89bb1d899212e4e94cf7b79878ada48bc2023ebf 100644
--- a/src/main/java/kieker/gui/common/ISubController.java
+++ b/src/main/java/kieker/gui/common/ISubController.java
@@ -16,7 +16,6 @@
package kieker.gui.common;
-
/**
* A commons interface for all sub-controllers to reduce dependencies.
*
diff --git a/src/main/java/kieker/gui/common/DataModel.java b/src/main/java/kieker/gui/common/model/DataModel.java
similarity index 99%
rename from src/main/java/kieker/gui/common/DataModel.java
rename to src/main/java/kieker/gui/common/model/DataModel.java
index 08e5c348b4a3ef8627d9367c24f7ba4b19ed047b..152c4cabfa15def3ce12a9266c6d154a4a65dc86 100644
--- a/src/main/java/kieker/gui/common/DataModel.java
+++ b/src/main/java/kieker/gui/common/model/DataModel.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.common;
+package kieker.gui.common.model;
import java.io.File;
import java.util.ArrayList;
diff --git a/src/main/java/kieker/gui/common/PropertiesModel.java b/src/main/java/kieker/gui/common/model/PropertiesModel.java
similarity index 97%
rename from src/main/java/kieker/gui/common/PropertiesModel.java
rename to src/main/java/kieker/gui/common/model/PropertiesModel.java
index 56400c6f3b9e9e1b42b8e92951ccb616a3d8d24e..9e5972f7b295350f4d4035c7d27520590a8e1415 100644
--- a/src/main/java/kieker/gui/common/PropertiesModel.java
+++ b/src/main/java/kieker/gui/common/model/PropertiesModel.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.common;
+package kieker.gui.common.model;
import java.util.Observable;
diff --git a/src/main/java/kieker/gui/mainview/Controller.java b/src/main/java/kieker/gui/mainview/Controller.java
index d7e9273b7db29b5a39a8ea3a1a67bd920d2f99fb..86a9dae051cac9c408668cd5fe9701555587a7d5 100644
--- a/src/main/java/kieker/gui/mainview/Controller.java
+++ b/src/main/java/kieker/gui/mainview/Controller.java
@@ -16,10 +16,10 @@
package kieker.gui.mainview;
-import kieker.gui.common.DataModel;
import kieker.gui.common.ISubController;
import kieker.gui.common.ISubView;
-import kieker.gui.common.PropertiesModel;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
import kieker.gui.mainview.Model.SubView;
import org.eclipse.swt.events.SelectionEvent;
diff --git a/src/main/java/kieker/gui/mainview/View.java b/src/main/java/kieker/gui/mainview/View.java
index 1b8f03e168900248b79ac46ea085bd6ca93e06a6..177c8d4e3db0faafe5ee5a9dbbb678dc3ee32f08 100644
--- a/src/main/java/kieker/gui/mainview/View.java
+++ b/src/main/java/kieker/gui/mainview/View.java
@@ -19,8 +19,8 @@ package kieker.gui.mainview;
import java.util.Observable;
import java.util.Observer;
-import kieker.gui.common.DataModel;
import kieker.gui.common.ISubView;
+import kieker.gui.common.model.DataModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java b/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java
index f34ee28b28f214e9983b8930a9da2a232de439a9..824452ed2b3640e8332305248f80e3dde1e0e5f3 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java
@@ -1,11 +1,11 @@
package kieker.gui.subview.aggregatedtraces;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
import kieker.gui.common.ISubController;
import kieker.gui.common.ISubView;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.AggregatedExecution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/Controller.java b/src/main/java/kieker/gui/subview/aggregatedtraces/Controller.java
index 31875aed934c192cc9a01c661b3c47b0f5c0a53e..6f459d3aa22df144e3db9f53d9382618fd93adf0 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/Controller.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/Controller.java
@@ -18,11 +18,11 @@ package kieker.gui.subview.aggregatedtraces;
import java.util.List;
-import kieker.gui.common.AbstractDataModelProxy;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.AggregatedExecution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.util.AbstractDataModelProxy;
import org.eclipse.swt.events.SelectionEvent;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/FailedController.java b/src/main/java/kieker/gui/subview/aggregatedtraces/FailedController.java
index 851e51f471acf7c436ab91de801ec9d85630cad5..00968d5eb80cbc3921ed600029d40ae3d79102dc 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/FailedController.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/FailedController.java
@@ -18,11 +18,11 @@ package kieker.gui.subview.aggregatedtraces;
import java.util.List;
-import kieker.gui.common.AbstractDataModelProxy;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.AggregatedExecution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.util.AbstractDataModelProxy;
/**
* The sub-controller responsible for the sub-view presenting the available aggregated traces.
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/FailureController.java b/src/main/java/kieker/gui/subview/aggregatedtraces/FailureController.java
index 3cb98455601bcd447c2f0eecd9c0cd30ac17b320..a863991d4855e1fff86d61e666ceb684dbfa8f7b 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/FailureController.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/FailureController.java
@@ -18,11 +18,11 @@ package kieker.gui.subview.aggregatedtraces;
import java.util.List;
-import kieker.gui.common.AbstractDataModelProxy;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.AggregatedExecution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.util.AbstractDataModelProxy;
/**
* The sub-controller responsible for the sub-view presenting the available aggregated traces.
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/View.java b/src/main/java/kieker/gui/subview/aggregatedtraces/View.java
index 76f6081dff534f82ade2d913cdf0e38e1563d08a..38e9811a59303df1c8249c672c4f30b8f1cc112e 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/View.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/View.java
@@ -22,17 +22,17 @@ import java.util.Observer;
import kieker.gui.common.IModel;
import kieker.gui.common.ISubView;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.AggregatedExecution;
-import kieker.gui.common.util.TreeColumnSortListener;
+import kieker.gui.common.model.PropertiesModel;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionAvgDurationComparator;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionCallComparator;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionMaxDurationComparator;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionMinDurationComparator;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionTotalDurationComparator;
-import kieker.gui.subview.traces.util.ExecutionComponentComparator;
-import kieker.gui.subview.traces.util.ExecutionContainerComparator;
-import kieker.gui.subview.traces.util.ExecutionOperationComparator;
+import kieker.gui.subview.util.ExecutionComponentComparator;
+import kieker.gui.subview.util.ExecutionContainerComparator;
+import kieker.gui.subview.util.ExecutionOperationComparator;
+import kieker.gui.subview.util.TreeColumnSortListener;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionAvgDurationComparator.java b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionAvgDurationComparator.java
index a1aaf9922118819db2679dd2ace9ef3e03aa0ff1..6646cadf404f8e56b27db43eb30ce3a4cb359580 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionAvgDurationComparator.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionAvgDurationComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.aggregatedtraces.util;
import kieker.gui.common.domain.AggregatedExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionCallComparator.java b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionCallComparator.java
index a396ead27ca8de31b1c2215567edc8b845dab4da..a399d3ba04e80a1734b96671e926fd39997b07cb 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionCallComparator.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionCallComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.aggregatedtraces.util;
import kieker.gui.common.domain.AggregatedExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMaxDurationComparator.java b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMaxDurationComparator.java
index 77173fa4692de10af4469efac61547f71ea3f352..f6be97f52e3ba1d2a3f3fc05970c852ee1553400 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMaxDurationComparator.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMaxDurationComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.aggregatedtraces.util;
import kieker.gui.common.domain.AggregatedExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMinDurationComparator.java b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMinDurationComparator.java
index e2e3418ca8f2f42fbbc02f3f450f855cb6382bdd..bd94cb8af2e8941e991bbbe6a263b1b3d0fb7c14 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMinDurationComparator.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMinDurationComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.aggregatedtraces.util;
import kieker.gui.common.domain.AggregatedExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionTotalDurationComparator.java b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionTotalDurationComparator.java
index 5e659300a412a2b5cd10980fff4acc96c2ce87a6..b9c46911f81a573e2c79e6b0781163d627caf988 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionTotalDurationComparator.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionTotalDurationComparator.java
@@ -1,7 +1,7 @@
package kieker.gui.subview.aggregatedtraces.util;
import kieker.gui.common.domain.AggregatedExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/records/Controller.java b/src/main/java/kieker/gui/subview/records/Controller.java
index e1083a78a1b4230e697f04a34dec616fbc2e6528..f435c36d3a835f7176e3a4de9930eb88ea804afd 100644
--- a/src/main/java/kieker/gui/subview/records/Controller.java
+++ b/src/main/java/kieker/gui/subview/records/Controller.java
@@ -18,12 +18,12 @@ package kieker.gui.subview.records;
import java.util.List;
-import kieker.gui.common.AbstractDataModelProxy;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
import kieker.gui.common.ISubController;
import kieker.gui.common.ISubView;
import kieker.gui.common.domain.Record;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.subview.util.AbstractDataModelProxy;
/**
* The sub-controller responsible for the sub-view presenting the available records.
diff --git a/src/main/java/kieker/gui/subview/records/View.java b/src/main/java/kieker/gui/subview/records/View.java
index 6ad7cb2e8ff3a0a80b0a329833c02dd88ccbf44d..a27b51a4f11cfedf2aeab3ea77d91d0aa1adb0b6 100644
--- a/src/main/java/kieker/gui/subview/records/View.java
+++ b/src/main/java/kieker/gui/subview/records/View.java
@@ -23,9 +23,9 @@ import java.util.Observer;
import kieker.gui.common.IModel;
import kieker.gui.common.ISubView;
import kieker.gui.common.domain.Record;
-import kieker.gui.common.util.TableColumnSortListener;
import kieker.gui.subview.records.util.RecordTimestampComparator;
import kieker.gui.subview.records.util.RecordTypeComparator;
+import kieker.gui.subview.util.TableColumnSortListener;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/records/util/RecordTimestampComparator.java b/src/main/java/kieker/gui/subview/records/util/RecordTimestampComparator.java
index 8ace9bdefa2d3e29d7b389a684cf84f6c9e30995..9427b38cde08ea0b8026e9b956b8f8b458ab80e9 100644
--- a/src/main/java/kieker/gui/subview/records/util/RecordTimestampComparator.java
+++ b/src/main/java/kieker/gui/subview/records/util/RecordTimestampComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.records.util;
import kieker.gui.common.domain.Record;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/records/util/RecordTypeComparator.java b/src/main/java/kieker/gui/subview/records/util/RecordTypeComparator.java
index 62767844b8b38ff2a244749e002f4fa9b4ce40d3..8c9b5c15c54e347dfc8187f5f6aef1270000a6fd 100644
--- a/src/main/java/kieker/gui/subview/records/util/RecordTypeComparator.java
+++ b/src/main/java/kieker/gui/subview/records/util/RecordTypeComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.records.util;
import kieker.gui.common.domain.Record;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/traces/AbstractController.java b/src/main/java/kieker/gui/subview/traces/AbstractController.java
index 81a8776f988f355af63a36a6898d88b6c74cafe3..1f260a22662f40ac7c4a7ba7d67facd4e4e1bf57 100644
--- a/src/main/java/kieker/gui/subview/traces/AbstractController.java
+++ b/src/main/java/kieker/gui/subview/traces/AbstractController.java
@@ -1,11 +1,11 @@
package kieker.gui.subview.traces;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
import kieker.gui.common.ISubController;
import kieker.gui.common.ISubView;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.Execution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
diff --git a/src/main/java/kieker/gui/subview/traces/Controller.java b/src/main/java/kieker/gui/subview/traces/Controller.java
index 365437e558e72a2915ded46e8c3cc862c17a1119..325ef2e40ad08a0c6f7b75a5615b67b658ab0d7d 100644
--- a/src/main/java/kieker/gui/subview/traces/Controller.java
+++ b/src/main/java/kieker/gui/subview/traces/Controller.java
@@ -18,11 +18,11 @@ package kieker.gui.subview.traces;
import java.util.List;
-import kieker.gui.common.AbstractDataModelProxy;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.Execution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.util.AbstractDataModelProxy;
/**
* The sub-controller responsible for the sub-view presenting the available traces.
diff --git a/src/main/java/kieker/gui/subview/traces/FailedController.java b/src/main/java/kieker/gui/subview/traces/FailedController.java
index c9006a30056d91b2da6f798620cfac79edd2f47e..c440e78ceb2136d9d277b859bc3f0ccc257d795e 100644
--- a/src/main/java/kieker/gui/subview/traces/FailedController.java
+++ b/src/main/java/kieker/gui/subview/traces/FailedController.java
@@ -18,11 +18,11 @@ package kieker.gui.subview.traces;
import java.util.List;
-import kieker.gui.common.AbstractDataModelProxy;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.Execution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.util.AbstractDataModelProxy;
/**
* The sub-controller responsible for the sub-view presenting the available failed traces.
diff --git a/src/main/java/kieker/gui/subview/traces/FailureController.java b/src/main/java/kieker/gui/subview/traces/FailureController.java
index daa855d18ae0d736dfb6abf50a93e0cadb24616c..1ccf1f9dd8fd74c58863662873ead101bd0a111b 100644
--- a/src/main/java/kieker/gui/subview/traces/FailureController.java
+++ b/src/main/java/kieker/gui/subview/traces/FailureController.java
@@ -18,11 +18,11 @@ package kieker.gui.subview.traces;
import java.util.List;
-import kieker.gui.common.AbstractDataModelProxy;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.Execution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.util.AbstractDataModelProxy;
/**
* The sub-controller responsible for the sub-view presenting the available failure-containing traces.
diff --git a/src/main/java/kieker/gui/subview/traces/View.java b/src/main/java/kieker/gui/subview/traces/View.java
index 6f73f2ee4d19afc21ac31e33f9d3d9a8b147e2f7..c17e9c3ac92db7aeaff932ac6c4f656dfa7ce77d 100644
--- a/src/main/java/kieker/gui/subview/traces/View.java
+++ b/src/main/java/kieker/gui/subview/traces/View.java
@@ -22,14 +22,14 @@ import java.util.Observer;
import kieker.gui.common.IModel;
import kieker.gui.common.ISubView;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.Execution;
-import kieker.gui.common.util.TreeColumnSortListener;
-import kieker.gui.subview.traces.util.ExecutionComponentComparator;
-import kieker.gui.subview.traces.util.ExecutionContainerComparator;
+import kieker.gui.common.model.PropertiesModel;
import kieker.gui.subview.traces.util.ExecutionDurationComparator;
-import kieker.gui.subview.traces.util.ExecutionOperationComparator;
import kieker.gui.subview.traces.util.ExecutionTraceIDComparator;
+import kieker.gui.subview.util.ExecutionComponentComparator;
+import kieker.gui.subview.util.ExecutionContainerComparator;
+import kieker.gui.subview.util.ExecutionOperationComparator;
+import kieker.gui.subview.util.TreeColumnSortListener;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
diff --git a/src/main/java/kieker/gui/subview/traces/util/ExecutionDurationComparator.java b/src/main/java/kieker/gui/subview/traces/util/ExecutionDurationComparator.java
index 2a4f44845621ae1bdf391669b152fad10d2f6142..475ced2aa3b196fa77b9cf76295131882eb576a8 100644
--- a/src/main/java/kieker/gui/subview/traces/util/ExecutionDurationComparator.java
+++ b/src/main/java/kieker/gui/subview/traces/util/ExecutionDurationComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.traces.util;
import kieker.gui.common.domain.Execution;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/traces/util/ExecutionTraceIDComparator.java b/src/main/java/kieker/gui/subview/traces/util/ExecutionTraceIDComparator.java
index 7f46022dc45f28c374faba3794de786ba428ee3e..cc2c156413c91c19c7a74eee8634aa22546744c4 100644
--- a/src/main/java/kieker/gui/subview/traces/util/ExecutionTraceIDComparator.java
+++ b/src/main/java/kieker/gui/subview/traces/util/ExecutionTraceIDComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.traces.util;
import kieker.gui.common.domain.Execution;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/common/AbstractDataModelProxy.java b/src/main/java/kieker/gui/subview/util/AbstractDataModelProxy.java
similarity index 83%
rename from src/main/java/kieker/gui/common/AbstractDataModelProxy.java
rename to src/main/java/kieker/gui/subview/util/AbstractDataModelProxy.java
index cbbcc5b32e43fbfc0d9ad1c5b4009a240e70907e..18f6181a11f14d392a3438376fef9f3874b95c36 100644
--- a/src/main/java/kieker/gui/common/AbstractDataModelProxy.java
+++ b/src/main/java/kieker/gui/subview/util/AbstractDataModelProxy.java
@@ -1,8 +1,11 @@
-package kieker.gui.common;
+package kieker.gui.subview.util;
import java.util.Observable;
import java.util.Observer;
+import kieker.gui.common.IModel;
+import kieker.gui.common.model.DataModel;
+
public abstract class AbstractDataModelProxy<T> extends Observable implements IModel<T>, Observer {
protected final DataModel dataModel;
diff --git a/src/main/java/kieker/gui/common/util/AbstractDirectedComparator.java b/src/main/java/kieker/gui/subview/util/AbstractDirectedComparator.java
similarity index 96%
rename from src/main/java/kieker/gui/common/util/AbstractDirectedComparator.java
rename to src/main/java/kieker/gui/subview/util/AbstractDirectedComparator.java
index a7d31f93171fde56cb4cbfc411868c46ac1689ed..02749c579681594348f77256362c84d0d491f5a9 100644
--- a/src/main/java/kieker/gui/common/util/AbstractDirectedComparator.java
+++ b/src/main/java/kieker/gui/subview/util/AbstractDirectedComparator.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.common.util;
+package kieker.gui.subview.util;
import java.util.Comparator;
diff --git a/src/main/java/kieker/gui/subview/traces/util/ExecutionComponentComparator.java b/src/main/java/kieker/gui/subview/util/ExecutionComponentComparator.java
similarity index 92%
rename from src/main/java/kieker/gui/subview/traces/util/ExecutionComponentComparator.java
rename to src/main/java/kieker/gui/subview/util/ExecutionComponentComparator.java
index a5e6cab9b3639105b708033bc9060b6f33a0fc2c..0b77c6ee8a8813ebffb8cea205de6cf210d2f617 100644
--- a/src/main/java/kieker/gui/subview/traces/util/ExecutionComponentComparator.java
+++ b/src/main/java/kieker/gui/subview/util/ExecutionComponentComparator.java
@@ -14,10 +14,9 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.subview.traces.util;
+package kieker.gui.subview.util;
import kieker.gui.common.domain.AbstractExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/traces/util/ExecutionContainerComparator.java b/src/main/java/kieker/gui/subview/util/ExecutionContainerComparator.java
similarity index 92%
rename from src/main/java/kieker/gui/subview/traces/util/ExecutionContainerComparator.java
rename to src/main/java/kieker/gui/subview/util/ExecutionContainerComparator.java
index ba1c5fbe0a39f74486bc343f6f6546902dfcb066..10e1a0492fdf0ac8096327a84edb1c4b0a4c3cee 100644
--- a/src/main/java/kieker/gui/subview/traces/util/ExecutionContainerComparator.java
+++ b/src/main/java/kieker/gui/subview/util/ExecutionContainerComparator.java
@@ -14,10 +14,9 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.subview.traces.util;
+package kieker.gui.subview.util;
import kieker.gui.common.domain.AbstractExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/traces/util/ExecutionOperationComparator.java b/src/main/java/kieker/gui/subview/util/ExecutionOperationComparator.java
similarity index 92%
rename from src/main/java/kieker/gui/subview/traces/util/ExecutionOperationComparator.java
rename to src/main/java/kieker/gui/subview/util/ExecutionOperationComparator.java
index 90b199cda670eed9048447131afc05a276a0a6cf..72b27604200dad033ee377a2277154db5861a978 100644
--- a/src/main/java/kieker/gui/subview/traces/util/ExecutionOperationComparator.java
+++ b/src/main/java/kieker/gui/subview/util/ExecutionOperationComparator.java
@@ -14,10 +14,9 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.subview.traces.util;
+package kieker.gui.subview.util;
import kieker.gui.common.domain.AbstractExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/common/util/TableColumnSortListener.java b/src/main/java/kieker/gui/subview/util/TableColumnSortListener.java
similarity index 98%
rename from src/main/java/kieker/gui/common/util/TableColumnSortListener.java
rename to src/main/java/kieker/gui/subview/util/TableColumnSortListener.java
index 60dd5ed65182fdaa3da52ffd0771f0fe95be8ceb..006f5f9c6f2faea73b4be80b1ed5dfe3cfdb732b 100644
--- a/src/main/java/kieker/gui/common/util/TableColumnSortListener.java
+++ b/src/main/java/kieker/gui/subview/util/TableColumnSortListener.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.common.util;
+package kieker.gui.subview.util;
import java.util.Collections;
import java.util.List;
diff --git a/src/main/java/kieker/gui/common/util/TreeColumnSortListener.java b/src/main/java/kieker/gui/subview/util/TreeColumnSortListener.java
similarity index 98%
rename from src/main/java/kieker/gui/common/util/TreeColumnSortListener.java
rename to src/main/java/kieker/gui/subview/util/TreeColumnSortListener.java
index bff0ec61f11090e23533e95b7ebe8db132c2efa9..4107418cf3b0c4689d50c800a40eeff385d06d43 100644
--- a/src/main/java/kieker/gui/common/util/TreeColumnSortListener.java
+++ b/src/main/java/kieker/gui/subview/util/TreeColumnSortListener.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.common.util;
+package kieker.gui.subview.util;
import java.util.Collections;
import java.util.List;