diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/TabletAndDesktopEventsView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/TabletAndDesktopEventsView.java
index 2d8ba151a41..0fa96ccf4d1 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/TabletAndDesktopEventsView.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/TabletAndDesktopEventsView.java
@@ -6,9 +6,9 @@ import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.gwt.common.client.controls.tabbar.BreadcrumbPane;
 import com.sap.sailing.gwt.home.client.place.events.recent.EventsOverviewRecent;
-import com.sap.sailing.gwt.home.client.place.events.upcoming.EventsOverviewUpcoming;
 import com.sap.sailing.gwt.home.client.place.start.StartPlace;
 import com.sap.sailing.gwt.home.desktop.app.DesktopPlacesNavigator;
+import com.sap.sailing.gwt.home.desktop.partials.eventsupcoming.EventsOverviewUpcoming;
 import com.sap.sailing.gwt.home.shared.app.PlaceNavigation;
 import com.sap.sailing.gwt.ui.client.StringMessages;
 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/TabletAndDesktopEventsView.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/TabletAndDesktopEventsView.ui.xml
index efb3f24bf7b..41c9aeec773 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/TabletAndDesktopEventsView.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/TabletAndDesktopEventsView.ui.xml
@@ -1,9 +1,8 @@
 <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
-<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" 
-    xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared"
-    xmlns:p="urn:import:com.sap.sailing.gwt.home.client.place.events"
-    xmlns:g="urn:import:com.google.gwt.user.client.ui"
-    xmlns:c="urn:import:com.sap.sailing.gwt.common.client.controls.tabbar">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui"
+    xmlns:c="urn:import:com.sap.sailing.gwt.common.client.controls.tabbar"
+    xmlns:dp="urn:import:com.sap.sailing.gwt.home.desktop.partials"
+    xmlns:p="urn:import:com.sap.sailing.gwt.home.client.place.events">
   <ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
   <ui:with field="res" type="com.sap.sailing.gwt.common.client.SharedResources" />
   <ui:style>
@@ -20,7 +19,7 @@
   <g:HTMLPanel addStyleNames="{res.mediaCss.grid}">
     <div class="{res.mediaCss.small12} {res.mediaCss.columns}">
       <c:BreadcrumbPane ui:field="breadcrumbs" addStyleNames="{style.breadcrumb}" />
-      <p:upcoming.EventsOverviewUpcoming ui:field='upcomingEventsWidget'/>
+      <dp:eventsupcoming.EventsOverviewUpcoming ui:field='upcomingEventsWidget'/>
       <p:recent.EventsOverviewRecent ui:field='recentEventsWidget'/>
     </div>
   </g:HTMLPanel>
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcoming.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcoming.ui.xml
deleted file mode 100644
index 78f99b4f9ac..00000000000
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcoming.ui.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
-<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
-  xmlns:g="urn:import:com.google.gwt.user.client.ui"
-    xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared">
-    <ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
-    <ui:with field="i18n_ubi" type="com.sap.sailing.gwt.common.client.i18n.TextMessages" />
-    <ui:with field="res" type="com.sap.sailing.gwt.common.client.SharedResources" />
-    <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.events.upcoming.EventsOverviewUpcomingResources" />
-  <g:HTMLPanel addStyleNames="{local_res.css.eventsoverviewupcoming} {local_res.css.accordion}">
-      <!-- IFEND upcomingEvents.events.length > 1 ADD CLASS local_res.css.accordion ELSE ADD CLASS local_res.css.accordioncollapsed -->
-      <g:HTMLPanel  ui:field="header" addStyleNames="{local_res.css.eventsoverviewupcoming_header} {local_res.css.accordion_trigger}">
-        <div class="{res.mediaCss.grid}">
-          <div class="{res.mediaCss.small9} {res.mediaCss.columns}">
-            <img src="images/home/upcoming-events-icon.png" class="{local_res.css.eventsoverviewupcoming_header_icon}"></img>
-            <!-- IF upcomingEvents.events.length < 2 -->
-            <span>
-              <h3 class="{local_res.css.eventsoverviewupcoming_header_title}">
-                <ui:text from="{i18n_ubi.seriesHeaderUpcoming}" /><span ui:field="colon" style="display: none;">:</span></h3>
-              <span ui:field="ticker" class="{local_res.css.eventsoverviewupcoming_header_ticker}" style="display: none;" />
-            </span>
-            <!-- IFEND upcomingEvents.events.length < 2 -->
-          </div>
-          <!-- IF upcomingEvents.events.length > 1 -->
-          <div class="{res.mediaCss.small3} {res.mediaCss.columns}">
-            <table class="{local_res.css.eventsoverviewupcoming_header_info}">
-              <tr>
-                <td>
-                  <div class="{local_res.css.eventsoverviewupcoming_header_info_item}">
-                    <span ui:field="eventsCount" class="{local_res.css.eventsoverviewupcoming_header_info_item_value}" />
-                  </div>
-                </td>
-                <td>
-                  <div class="{local_res.css.eventsoverviewupcoming_header_info_arrow}">
-                    <img src="images/home/arrow-down-grey.png" class="{local_res.css.eventsoverviewupcoming_header_info_arrow_image}"></img>
-                  </div>
-                </td>
-              </tr>
-            </table>
-          </div>
-          <!-- IFEND upcomingEvents.events.length > 1 -->
-        </div>
-      </g:HTMLPanel>
-      <!-- IF upcomingEvents.events.length > 1 -->
-      <g:FlowPanel ui:field="eventsPlaceholder" addStyleNames="{local_res.css.eventsoverviewupcoming_content} {local_res.css.accordion_content}" />
-      <!-- IFEND upcomingEvents.events.length > 1 -->
-  </g:HTMLPanel>
-</ui:UiBinder>
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcomingEvent.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcomingEvent.ui.xml
deleted file mode 100644
index b70d82b55d4..00000000000
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcomingEvent.ui.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
-<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
-  xmlns:g="urn:import:com.google.gwt.user.client.ui"
-    xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared">
-	<ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
-	<ui:with field="res" type="com.sap.sailing.gwt.common.client.SharedResources" />
-    <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.events.upcoming.EventsOverviewUpcomingResources" />
-  <g:HTMLPanel addStyleNames="{local_res.css.eventsoverviewupcoming_content_event}">
-      <g:Anchor ui:field="eventOverviewLink" addStyleNames="{res.mediaCss.grid}">
-        <div ui:field='eventName' class="{res.mediaCss.small5} {res.mediaCss.columns} {local_res.css.eventsoverviewupcoming_content_event_name}" />
-        <div class="{res.mediaCss.small4} {res.mediaCss.columns} {local_res.css.eventsoverviewupcoming_content_event_location}">
-          <span ui:field='venueName' />,
-          <span ui:field='eventStartDate' />
-        </div>
-        <div ui:field="days" class="{res.mediaCss.small3} {res.mediaCss.columns} {local_res.css.eventsoverviewupcoming_content_event_countdown}">starts in days</div>
-      </g:Anchor>
-  </g:HTMLPanel>
-</ui:UiBinder>
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcoming.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcoming.gss
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcoming.gss
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcoming.gss
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcoming.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcoming.java
similarity index 98%
rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcoming.java
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcoming.java
index 3d22706aca3..46ce5f5087b 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcoming.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcoming.java
@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.events.upcoming;
+package com.sap.sailing.gwt.home.desktop.partials.eventsupcoming;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcoming.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcoming.ui.xml
new file mode 100644
index 00000000000..8bcbcd52241
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcoming.ui.xml
@@ -0,0 +1,47 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui">
+	<ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
+	<ui:with field="i18n_ubi" type="com.sap.sailing.gwt.common.client.i18n.TextMessages" />
+	<ui:with field="res" type="com.sap.sailing.gwt.common.client.SharedResources" />
+	<ui:with field="local_res" type="com.sap.sailing.gwt.home.desktop.partials.eventsupcoming.EventsOverviewUpcomingResources" />
+	<g:HTMLPanel addStyleNames="{local_res.css.eventsoverviewupcoming} {local_res.css.accordion}">
+		<!-- IFEND upcomingEvents.events.length > 1 ADD CLASS local_res.css.accordion ELSE ADD CLASS local_res.css.accordioncollapsed -->
+		<g:HTMLPanel ui:field="header" addStyleNames="{local_res.css.eventsoverviewupcoming_header} {local_res.css.accordion_trigger}">
+			<div class="{res.mediaCss.grid}">
+				<div class="{res.mediaCss.small9} {res.mediaCss.columns}">
+					<img src="images/home/upcoming-events-icon.png" class="{local_res.css.eventsoverviewupcoming_header_icon}"></img>
+					<!-- IF upcomingEvents.events.length < 2 -->
+					<span>
+						<h3 class="{local_res.css.eventsoverviewupcoming_header_title}">
+							<ui:text from="{i18n_ubi.seriesHeaderUpcoming}" />
+							<span ui:field="colon" style="display: none;">:</span>
+						</h3>
+						<span ui:field="ticker" class="{local_res.css.eventsoverviewupcoming_header_ticker}" style="display: none;" />
+					</span>
+					<!-- IFEND upcomingEvents.events.length < 2 -->
+				</div>
+				<!-- IF upcomingEvents.events.length > 1 -->
+				<div class="{res.mediaCss.small3} {res.mediaCss.columns}">
+					<table class="{local_res.css.eventsoverviewupcoming_header_info}">
+						<tr>
+							<td>
+								<div class="{local_res.css.eventsoverviewupcoming_header_info_item}">
+									<span ui:field="eventsCount" class="{local_res.css.eventsoverviewupcoming_header_info_item_value}" />
+								</div>
+							</td>
+							<td>
+								<div class="{local_res.css.eventsoverviewupcoming_header_info_arrow}">
+									<img src="images/home/arrow-down-grey.png" class="{local_res.css.eventsoverviewupcoming_header_info_arrow_image}"></img>
+								</div>
+							</td>
+						</tr>
+					</table>
+				</div>
+				<!-- IFEND upcomingEvents.events.length > 1 -->
+			</div>
+		</g:HTMLPanel>
+		<!-- IF upcomingEvents.events.length > 1 -->
+		<g:FlowPanel ui:field="eventsPlaceholder" addStyleNames="{local_res.css.eventsoverviewupcoming_content} {local_res.css.accordion_content}" />
+		<!-- IFEND upcomingEvents.events.length > 1 -->
+	</g:HTMLPanel>
+</ui:UiBinder>
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcomingEvent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcomingEvent.java
similarity index 97%
rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcomingEvent.java
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcomingEvent.java
index b15479a6544..f2729b26a98 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcomingEvent.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcomingEvent.java
@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.events.upcoming;
+package com.sap.sailing.gwt.home.desktop.partials.eventsupcoming;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.DivElement;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcomingEvent.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcomingEvent.ui.xml
new file mode 100644
index 00000000000..a584e23138c
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcomingEvent.ui.xml
@@ -0,0 +1,16 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui">
+	<ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
+	<ui:with field="res" type="com.sap.sailing.gwt.common.client.SharedResources" />
+    <ui:with field="local_res" type="com.sap.sailing.gwt.home.desktop.partials.eventsupcoming.EventsOverviewUpcomingResources" />
+	<g:HTMLPanel addStyleNames="{local_res.css.eventsoverviewupcoming_content_event}">
+		<g:Anchor ui:field="eventOverviewLink" addStyleNames="{res.mediaCss.grid}">
+			<div ui:field='eventName' class="{res.mediaCss.small5} {res.mediaCss.columns} {local_res.css.eventsoverviewupcoming_content_event_name}" />
+			<div class="{res.mediaCss.small4} {res.mediaCss.columns} {local_res.css.eventsoverviewupcoming_content_event_location}">
+				<span ui:field='venueName' />,
+				<span ui:field='eventStartDate' />
+			</div>
+			<div ui:field="days" class="{res.mediaCss.small3} {res.mediaCss.columns} {local_res.css.eventsoverviewupcoming_content_event_countdown}">starts in days</div>
+		</g:Anchor>
+	</g:HTMLPanel>
+</ui:UiBinder>
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcomingResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcomingResources.java
similarity index 90%
rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcomingResources.java
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcomingResources.java
index 824c4b236e0..26e871d5cee 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcomingResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventsupcoming/EventsOverviewUpcomingResources.java
@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.events.upcoming;
+package com.sap.sailing.gwt.home.desktop.partials.eventsupcoming;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ClientBundle;
@@ -7,7 +7,7 @@ import com.google.gwt.resources.client.CssResource;
 public interface EventsOverviewUpcomingResources extends ClientBundle {
     public static final EventsOverviewUpcomingResources INSTANCE = GWT.create(EventsOverviewUpcomingResources.class);
 
-    @Source("com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcoming.gss")
+    @Source("EventsOverviewUpcoming.gss")
     LocalCss css();
 
     public interface LocalCss extends CssResource {