diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ForwardBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ForwardBean.java
deleted file mode 100644
index 34d6e63aa510d9374fa94da101abf9a421c9df42..0000000000000000000000000000000000000000
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ForwardBean.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************
- * Copyright 2012 by
- *  + Christian-Albrechts-University of Kiel
- *    + Department of Computer Science
- *      + Software Engineering Group 
- *  and others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ***************************************************************************/
-
-package kieker.webgui.beans.application;
-
-import javax.faces.bean.ApplicationScoped;
-import javax.faces.bean.ManagedBean;
-
-import kieker.webgui.beans.IProjectBean;
-
-/**
- * The {@link ForwardBean} is a helper class for navigation purposes only. It allows to navigate between specific pages in a generic matter and is furthermore the
- * reason for the existence of the interface {@link IProjectBean}. The bean has also no properties or fields which could be modified.<br>
- * The bean is an application scoped bean, as there is in its functionality as a utility bean no reason to have more than one instance.
- * 
- * @author Nils Christian Ehmke
- * @version 1.0
- */
-@ManagedBean
-@ApplicationScoped
-public final class ForwardBean {
-
-	/**
-	 * Default constructor. <b>Do not use this constructor. This bean is JSF managed.</b>
-	 */
-	public ForwardBean() {
-		// No code necessary.
-	}
-
-	/**
-	 * This method allows the navigation from one page to another, by saving the project name of the source bean, cleaning the source bean and then setting the
-	 * project name of the destination bean. This method then returns the return value of the setter-method of the destination bean. This is usually the next page of
-	 * the corresponding bean and can be used to redirect the user.
-	 * 
-	 * @param sourceBean
-	 *            The bean which will be used to get the project name and will be cleared in this method afterwards.
-	 * @param destinationBean
-	 *            The destination bean whose project name will be set to the saved value and whose return value will be returned.
-	 * @return The return value of the destination bean.
-	 */
-	public String forward(final IProjectBean sourceBean, final IProjectBean destinationBean) {
-		// Remember the project name and clean the source bean
-		final String projectName = sourceBean.getProjectName();
-		sourceBean.clearProject();
-
-		// Set the project of the destination bean and return its return value
-		return destinationBean.setProject(projectName);
-	}
-}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisEditorBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorBean.java
similarity index 99%
rename from Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisEditorBean.java
rename to Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorBean.java
index 9e2977bcc01e48258e1ccbc44edcea46cf7fe1e7..88da8b885a37546ad52a51aa31345c83ef5501e7 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisEditorBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorBean.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-package kieker.webgui.beans.session;
+package kieker.webgui.beans.view;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentCockpitBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
similarity index 99%
rename from Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentCockpitBean.java
rename to Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
index 6ca7d965965259e2e7c132e0eba182ee72ecc833..9f6a5a670890e98c312dc6d8df593331b9b49940 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentCockpitBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-package kieker.webgui.beans.session;
+package kieker.webgui.beans.view;
 
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.ViewScoped;
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentCockpitEditorBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitEditorBean.java
similarity index 99%
rename from Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentCockpitEditorBean.java
rename to Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitEditorBean.java
index 376f61e882abb9f5c65f77a790b239bfb52fb061..cd496fadcee08b54ad4f3911d9d6d125b630e6a1 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentCockpitEditorBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitEditorBean.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-package kieker.webgui.beans.session;
+package kieker.webgui.beans.view;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentControllerBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java
similarity index 99%
rename from Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentControllerBean.java
rename to Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java
index f0102426bdf1906aacd85ae616b31c77ccee4566..508549fa903ceb006ce7262105f06437285677aa 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentControllerBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-package kieker.webgui.beans.session;
+package kieker.webgui.beans.view;
 
 import java.io.IOException;
 
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPluginStringConverter.java b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPluginStringConverter.java
index c6d46790bf16335cbbced4e3d8b98de2662c1b18..615c4c275b70e5e8e0115166cbb5b205b79d17ec 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPluginStringConverter.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPluginStringConverter.java
@@ -27,7 +27,7 @@ import javax.faces.convert.Converter;
 import javax.faces.convert.FacesConverter;
 
 import kieker.analysis.model.analysisMetaModel.MIPlugin;
-import kieker.webgui.beans.session.CurrentAnalysisEditorBean;
+import kieker.webgui.beans.view.CurrentAnalysisEditorBean;
 
 /**
  * This converter can be used to convert a given plugin model instance to a string and vice versa (It uses the object's toString-method).
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPortStringConverter.java b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPortStringConverter.java
index 18bc2536c6102710d1530426db7f2e405224dfa7..e8370eb75262a6cd6de182d469e9232aa63b7d2f 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPortStringConverter.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPortStringConverter.java
@@ -27,7 +27,7 @@ import javax.faces.convert.Converter;
 import javax.faces.convert.FacesConverter;
 
 import kieker.analysis.model.analysisMetaModel.MIPort;
-import kieker.webgui.beans.session.CurrentAnalysisEditorBean;
+import kieker.webgui.beans.view.CurrentAnalysisEditorBean;
 
 /**
  * This converter can be used to convert a given port model instance to a string and vice versa (It uses the object's toString-method).
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIRepositoryStringConverter.java b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIRepositoryStringConverter.java
index 895b4a3cfffc94f443c361897f17242da0fc8df9..865b57fff5b181b4fb8e159227b78cc96d830de8 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIRepositoryStringConverter.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIRepositoryStringConverter.java
@@ -27,7 +27,7 @@ import javax.faces.convert.Converter;
 import javax.faces.convert.FacesConverter;
 
 import kieker.analysis.model.analysisMetaModel.MIRepository;
-import kieker.webgui.beans.session.CurrentAnalysisEditorBean;
+import kieker.webgui.beans.view.CurrentAnalysisEditorBean;
 
 /**
  * This converter can be used to convert a given repository model instance to a string and vice versa (It uses the object's toString-method).