diff --git a/src/main/java/kieker/gui/mainview/Controller.java b/src/main/java/kieker/gui/mainview/Controller.java
index 86a9dae051cac9c408668cd5fe9701555587a7d5..0b0a927983a1985a96e6c1917cfa392b3d4a0a06 100644
--- a/src/main/java/kieker/gui/mainview/Controller.java
+++ b/src/main/java/kieker/gui/mainview/Controller.java
@@ -16,11 +16,11 @@
 
 package kieker.gui.mainview;
 
-import kieker.gui.common.ISubController;
-import kieker.gui.common.ISubView;
 import kieker.gui.common.model.DataModel;
 import kieker.gui.common.model.PropertiesModel;
 import kieker.gui.mainview.Model.SubView;
+import kieker.gui.subview.ISubController;
+import kieker.gui.subview.ISubView;
 
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
diff --git a/src/main/java/kieker/gui/mainview/View.java b/src/main/java/kieker/gui/mainview/View.java
index 177c8d4e3db0faafe5ee5a9dbbb678dc3ee32f08..b8aa552a0d8f35a6ddcab10ed683de601c8387dd 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.ISubView;
 import kieker.gui.common.model.DataModel;
+import kieker.gui.subview.ISubView;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
diff --git a/src/main/java/kieker/gui/common/ISubController.java b/src/main/java/kieker/gui/subview/ISubController.java
similarity index 97%
rename from src/main/java/kieker/gui/common/ISubController.java
rename to src/main/java/kieker/gui/subview/ISubController.java
index 89bb1d899212e4e94cf7b79878ada48bc2023ebf..f5d511940fc346221d09b7b614c34f040a1d1e5f 100644
--- a/src/main/java/kieker/gui/common/ISubController.java
+++ b/src/main/java/kieker/gui/subview/ISubController.java
@@ -14,7 +14,8 @@
  * limitations under the License.
  ***************************************************************************/
 
-package kieker.gui.common;
+package kieker.gui.subview;
+
 
 /**
  * A commons interface for all sub-controllers to reduce dependencies.
diff --git a/src/main/java/kieker/gui/common/ISubView.java b/src/main/java/kieker/gui/subview/ISubView.java
similarity index 97%
rename from src/main/java/kieker/gui/common/ISubView.java
rename to src/main/java/kieker/gui/subview/ISubView.java
index 7d7c76e54bb9e8225d7a59b38c79bb9e9848da3d..f396224881340f4d06bc7b905c7b034648932e75 100644
--- a/src/main/java/kieker/gui/common/ISubView.java
+++ b/src/main/java/kieker/gui/subview/ISubView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-package kieker.gui.common;
+package kieker.gui.subview;
 
 import org.eclipse.swt.widgets.Composite;
 
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java b/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java
index 824452ed2b3640e8332305248f80e3dde1e0e5f3..cd0eab526e4848ed1244fde2976c414fc5e0fa33 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.IModel;
-import kieker.gui.common.ISubController;
-import kieker.gui.common.ISubView;
 import kieker.gui.common.domain.AggregatedExecution;
 import kieker.gui.common.model.DataModel;
 import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.ISubController;
+import kieker.gui.subview.ISubView;
+import kieker.gui.subview.util.IModel;
 
 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 6f459d3aa22df144e3db9f53d9382618fd93adf0..8a0f312f92cba519a5fec2a3b788d7ac8acd2d17 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.IModel;
 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 kieker.gui.subview.util.IModel;
 
 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 00968d5eb80cbc3921ed600029d40ae3d79102dc..2f55b7e6aba0632811d1b6430f7fe623ced92060 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.IModel;
 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 kieker.gui.subview.util.IModel;
 
 /**
  * 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 a863991d4855e1fff86d61e666ceb684dbfa8f7b..d4effffa9e8e09cb62bcc64ae10b0bee10b5c06c 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.IModel;
 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 kieker.gui.subview.util.IModel;
 
 /**
  * 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 38e9811a59303df1c8249c672c4f30b8f1cc112e..489d2face86108259ad6793c0bdce5bb5a6b6c64 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/View.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/View.java
@@ -20,10 +20,9 @@ import java.util.List;
 import java.util.Observable;
 import java.util.Observer;
 
-import kieker.gui.common.IModel;
-import kieker.gui.common.ISubView;
 import kieker.gui.common.domain.AggregatedExecution;
 import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.ISubView;
 import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionAvgDurationComparator;
 import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionCallComparator;
 import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionMaxDurationComparator;
@@ -32,6 +31,7 @@ import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionTotalDuration
 import kieker.gui.subview.util.ExecutionComponentComparator;
 import kieker.gui.subview.util.ExecutionContainerComparator;
 import kieker.gui.subview.util.ExecutionOperationComparator;
+import kieker.gui.subview.util.IModel;
 import kieker.gui.subview.util.TreeColumnSortListener;
 
 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 f435c36d3a835f7176e3a4de9930eb88ea804afd..811230bdc5fd568895cbb133c9c81780f617d55c 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.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.ISubController;
+import kieker.gui.subview.ISubView;
 import kieker.gui.subview.util.AbstractDataModelProxy;
+import kieker.gui.subview.util.IModel;
 
 /**
  * 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 a27b51a4f11cfedf2aeab3ea77d91d0aa1adb0b6..f33e06b27924022bd6e452540d8c5bbb835e32ed 100644
--- a/src/main/java/kieker/gui/subview/records/View.java
+++ b/src/main/java/kieker/gui/subview/records/View.java
@@ -20,11 +20,11 @@ import java.util.List;
 import java.util.Observable;
 import java.util.Observer;
 
-import kieker.gui.common.IModel;
-import kieker.gui.common.ISubView;
 import kieker.gui.common.domain.Record;
+import kieker.gui.subview.ISubView;
 import kieker.gui.subview.records.util.RecordTimestampComparator;
 import kieker.gui.subview.records.util.RecordTypeComparator;
+import kieker.gui.subview.util.IModel;
 import kieker.gui.subview.util.TableColumnSortListener;
 
 import org.eclipse.jface.viewers.TableViewer;
diff --git a/src/main/java/kieker/gui/subview/traces/AbstractController.java b/src/main/java/kieker/gui/subview/traces/AbstractController.java
index 1f260a22662f40ac7c4a7ba7d67facd4e4e1bf57..be95a30a39d11edd7237867cd1fbf3e18050d199 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.IModel;
-import kieker.gui.common.ISubController;
-import kieker.gui.common.ISubView;
 import kieker.gui.common.domain.Execution;
 import kieker.gui.common.model.DataModel;
 import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.ISubController;
+import kieker.gui.subview.ISubView;
+import kieker.gui.subview.util.IModel;
 
 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 325ef2e40ad08a0c6f7b75a5615b67b658ab0d7d..6c6b76ba359b5e5ffd0f441e193e6ab3f396d251 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.IModel;
 import kieker.gui.common.domain.Execution;
 import kieker.gui.common.model.DataModel;
 import kieker.gui.common.model.PropertiesModel;
 import kieker.gui.subview.util.AbstractDataModelProxy;
+import kieker.gui.subview.util.IModel;
 
 /**
  * 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 c440e78ceb2136d9d277b859bc3f0ccc257d795e..4bd6798c050dc2173171ddc7e1226fa8478f25be 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.IModel;
 import kieker.gui.common.domain.Execution;
 import kieker.gui.common.model.DataModel;
 import kieker.gui.common.model.PropertiesModel;
 import kieker.gui.subview.util.AbstractDataModelProxy;
+import kieker.gui.subview.util.IModel;
 
 /**
  * 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 1ccf1f9dd8fd74c58863662873ead101bd0a111b..2864ac4b1b96381815169c8c1c436a64c26a802e 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.IModel;
 import kieker.gui.common.domain.Execution;
 import kieker.gui.common.model.DataModel;
 import kieker.gui.common.model.PropertiesModel;
 import kieker.gui.subview.util.AbstractDataModelProxy;
+import kieker.gui.subview.util.IModel;
 
 /**
  * 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 c17e9c3ac92db7aeaff932ac6c4f656dfa7ce77d..f793e7c861ff53dd4999683f99e3a40f2eee1964 100644
--- a/src/main/java/kieker/gui/subview/traces/View.java
+++ b/src/main/java/kieker/gui/subview/traces/View.java
@@ -20,15 +20,15 @@ import java.util.List;
 import java.util.Observable;
 import java.util.Observer;
 
-import kieker.gui.common.IModel;
-import kieker.gui.common.ISubView;
 import kieker.gui.common.domain.Execution;
 import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.ISubView;
 import kieker.gui.subview.traces.util.ExecutionDurationComparator;
 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.IModel;
 import kieker.gui.subview.util.TreeColumnSortListener;
 
 import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/util/AbstractDataModelProxy.java b/src/main/java/kieker/gui/subview/util/AbstractDataModelProxy.java
index 18f6181a11f14d392a3438376fef9f3874b95c36..3b1d6b262f409574b33a7562fc97418432ec0bac 100644
--- a/src/main/java/kieker/gui/subview/util/AbstractDataModelProxy.java
+++ b/src/main/java/kieker/gui/subview/util/AbstractDataModelProxy.java
@@ -3,7 +3,6 @@ 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 {
diff --git a/src/main/java/kieker/gui/common/IModel.java b/src/main/java/kieker/gui/subview/util/IModel.java
similarity index 85%
rename from src/main/java/kieker/gui/common/IModel.java
rename to src/main/java/kieker/gui/subview/util/IModel.java
index 2510980d25829ecbc4e1de583c0ddb0a4758c992..cb4defdee4c6e53bf8fddbf4b71383aced869ca8 100644
--- a/src/main/java/kieker/gui/common/IModel.java
+++ b/src/main/java/kieker/gui/subview/util/IModel.java
@@ -1,4 +1,4 @@
-package kieker.gui.common;
+package kieker.gui.subview.util;
 
 import java.util.List;
 import java.util.Observer;