diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java
index 6a99dfc9dee..7c309a3568d 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java
@@ -7,7 +7,6 @@ import com.google.gwt.user.client.rpc.ServiceDefTarget;
 import com.google.web.bindery.event.shared.EventBus;
 import com.google.web.bindery.event.shared.SimpleEventBus;
 import com.sap.sailing.gwt.home.desktop.app.ApplicationTopLevelView;
-import com.sap.sailing.gwt.home.mobile.places.MainView;
 import com.sap.sailing.gwt.home.shared.dispatch.DispatchSystem;
 import com.sap.sailing.gwt.home.shared.dispatch.DispatchSystemImpl;
 import com.sap.sailing.gwt.home.shared.places.start.StartPlace;
@@ -40,7 +39,7 @@ public class MobileApplicationClientFactory extends SecureClientFactoryImpl {
     }
 
     private MobileApplicationClientFactory(EventBus eventBus, PlaceController placeController, MobilePlacesNavigator navigator) {
-        this(new MainView(navigator, eventBus), eventBus, placeController, navigator);
+        this(new MobileApplicationView(navigator, eventBus), eventBus, placeController, navigator);
     }
 
     public MobileApplicationClientFactory(ApplicationTopLevelView root, EventBus eventBus,
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/MainView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationView.java
similarity index 84%
rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/MainView.java
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationView.java
index 489f69d1f23..cd20074b22c 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/MainView.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationView.java
@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.mobile.places;
+package com.sap.sailing.gwt.home.mobile.app;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.place.shared.Place;
@@ -11,7 +11,6 @@ import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.web.bindery.event.shared.EventBus;
 import com.sap.sailing.gwt.home.desktop.app.ApplicationTopLevelView;
-import com.sap.sailing.gwt.home.mobile.app.MobilePlacesNavigator;
 import com.sap.sailing.gwt.home.mobile.partials.footer.Footer;
 import com.sap.sailing.gwt.home.mobile.partials.header.Header;
 import com.sap.sailing.gwt.home.shared.app.HasLocationTitle;
@@ -21,10 +20,10 @@ import com.sap.sse.gwt.client.ErrorReporter;
 
 /**
  * This is the top-level view of the application. Every time another presenter wants to reveal itself,
- * {@link MainView} will add its content of the target inside the {@code mainContantPanel}.
+ * {@link MobileApplicationView} will add its content of the target inside the {@code mainContantPanel}.
  */
-public class MainView extends Composite implements ApplicationTopLevelView {
-    interface MyBinder extends UiBinder<Widget, MainView> {
+public class MobileApplicationView extends Composite implements ApplicationTopLevelView {
+    interface MyBinder extends UiBinder<Widget, MobileApplicationView> {
     }
 
     private static MyBinder uiBinder = GWT.create(MyBinder.class);
@@ -40,7 +39,7 @@ public class MainView extends Composite implements ApplicationTopLevelView {
     @UiField
     SimplePanel mainContentPanel;
 
-    public MainView(MobilePlacesNavigator placeNavigator, EventBus eventBus) {
+    public MobileApplicationView(MobilePlacesNavigator placeNavigator, EventBus eventBus) {
         headerPanel = new Header(placeNavigator);
         footerPanel = new Footer(placeNavigator);
         initWidget(uiBinder.createAndBindUi(this));
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/MainView.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationView.ui.xml
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/MainView.ui.xml
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationView.ui.xml