Cleaned up, renamed packages

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/ApplicationActivityMapper.java

@@ -9,19 +9,19 @@ import com.sap.sailing.gwt.home.client.place.contact.ContactActivityProxy;
 import com.sap.sailing.gwt.home.client.place.contact.ContactPlace;
 import com.sap.sailing.gwt.home.client.place.error.ErrorActivityProxy;
 import com.sap.sailing.gwt.home.client.place.error.ErrorPlace;
-import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.EventActivityProxy;
-import com.sap.sailing.gwt.home.client.place.event2.EventContext;
-import com.sap.sailing.gwt.home.client.place.event2.EventDefaultPlace;
-import com.sap.sailing.gwt.home.client.place.event2.legacy.EventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.legacy.RegattaPlace;
-import com.sap.sailing.gwt.home.client.place.event2.legacy.SeriesPlace;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs.MultiregattaMediaPlace;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs.MultiregattaRegattasPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaCompetitorAnalyticsPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaLeaderboardPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaMediaPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaRacesPlace;
+import com.sap.sailing.gwt.home.client.place.event.AbstractEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventActivityProxy;
+import com.sap.sailing.gwt.home.client.place.event.EventContext;
+import com.sap.sailing.gwt.home.client.place.event.EventDefaultPlace;
+import com.sap.sailing.gwt.home.client.place.event.legacy.EventPlace;
+import com.sap.sailing.gwt.home.client.place.event.legacy.RegattaPlace;
+import com.sap.sailing.gwt.home.client.place.event.legacy.SeriesPlace;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.tabs.MultiregattaMediaPlace;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.tabs.MultiregattaRegattasPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaCompetitorAnalyticsPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaLeaderboardPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaMediaPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaRacesPlace;
 import com.sap.sailing.gwt.home.client.place.events.EventsActivityProxy;
 import com.sap.sailing.gwt.home.client.place.events.EventsPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.AbstractSeriesPlace;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/ApplicationClientFactory.java

@@ -3,8 +3,8 @@ package com.sap.sailing.gwt.home.client.app;
 import com.sap.sailing.gwt.home.client.place.aboutus.AboutUsClientFactory;
 import com.sap.sailing.gwt.home.client.place.contact.ContactClientFactory;
 import com.sap.sailing.gwt.home.client.place.error.ErrorClientFactory;
-import com.sap.sailing.gwt.home.client.place.event2.EventClientFactory;
-import com.sap.sailing.gwt.home.client.place.event2.legacy.SeriesClientFactory;
+import com.sap.sailing.gwt.home.client.place.event.EventClientFactory;
+import com.sap.sailing.gwt.home.client.place.event.legacy.SeriesClientFactory;
 import com.sap.sailing.gwt.home.client.place.events.EventsClientFactory;
 import com.sap.sailing.gwt.home.client.place.searchresult.SearchResultClientFactory;
 import com.sap.sailing.gwt.home.client.place.solutions.SolutionsClientFactory;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/ApplicationHistoryMapper.java

@@ -4,16 +4,16 @@ import com.google.gwt.place.shared.PlaceHistoryMapper;
 import com.google.gwt.place.shared.WithTokenizers;
 import com.sap.sailing.gwt.home.client.place.aboutus.AboutUsPlace;
 import com.sap.sailing.gwt.home.client.place.contact.ContactPlace;
-import com.sap.sailing.gwt.home.client.place.event2.EventDefaultPlace;
-import com.sap.sailing.gwt.home.client.place.event2.legacy.EventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.legacy.RegattaPlace;
-import com.sap.sailing.gwt.home.client.place.event2.legacy.SeriesPlace;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs.MultiregattaMediaPlace;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs.MultiregattaRegattasPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaCompetitorAnalyticsPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaLeaderboardPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaMediaPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaRacesPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventDefaultPlace;
+import com.sap.sailing.gwt.home.client.place.event.legacy.EventPlace;
+import com.sap.sailing.gwt.home.client.place.event.legacy.RegattaPlace;
+import com.sap.sailing.gwt.home.client.place.event.legacy.SeriesPlace;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.tabs.MultiregattaMediaPlace;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.tabs.MultiregattaRegattasPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaCompetitorAnalyticsPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaLeaderboardPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaMediaPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaRacesPlace;
 import com.sap.sailing.gwt.home.client.place.events.EventsPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesDefaultPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.EventSeriesCompetitorAnalyticsPlace;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/HomePlacesNavigator.java

@@ -3,13 +3,13 @@ package com.sap.sailing.gwt.home.client.app;
 import com.google.gwt.place.shared.PlaceController;
 import com.sap.sailing.gwt.home.client.place.aboutus.AboutUsPlace;
 import com.sap.sailing.gwt.home.client.place.contact.ContactPlace;
-import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.EventDefaultPlace;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs.MultiregattaRegattasPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.AbstractEventRegattaPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaCompetitorAnalyticsPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaLeaderboardPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaRacesPlace;
+import com.sap.sailing.gwt.home.client.place.event.AbstractEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventDefaultPlace;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.tabs.MultiregattaRegattasPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.AbstractEventRegattaPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaCompetitorAnalyticsPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaLeaderboardPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaRacesPlace;
 import com.sap.sailing.gwt.home.client.place.events.EventsPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesDefaultPlace;
 import com.sap.sailing.gwt.home.client.place.searchresult.SearchResultPlace;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/AbstractEventActivity.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2;
+package com.sap.sailing.gwt.home.client.place.event;
 
 import java.util.HashMap;
 import java.util.List;
@@ -16,8 +16,8 @@ import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
 import com.sap.sailing.gwt.home.client.app.ApplicationHistoryMapper;
 import com.sap.sailing.gwt.home.client.app.HomePlacesNavigator;
 import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.AbstractEventRegattaPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaRacesPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.AbstractEventRegattaPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaRacesPlace;
 import com.sap.sailing.gwt.home.client.place.events.EventsPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesDefaultPlace;
 import com.sap.sailing.gwt.home.client.place.start.StartPlace;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/AbstractEventPlace.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2;
+package com.sap.sailing.gwt.home.client.place.event;
 
 import java.util.HashMap;
 import java.util.Map;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/EventActivityProxy.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2;
+package com.sap.sailing.gwt.home.client.place.event;
 
 import java.util.UUID;
 
@@ -6,14 +6,14 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.sap.sailing.gwt.home.client.app.HomePlacesNavigator;
 import com.sap.sailing.gwt.home.client.place.error.ErrorPlace;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.AbstractMultiregattaEventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.EventMultiregattaActivity;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs.MultiregattaMediaPlace;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs.MultiregattaRegattasPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.AbstractEventRegattaPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.EventRegattaActivity;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaMediaPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaRacesPlace;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.AbstractMultiregattaEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.EventMultiregattaActivity;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.tabs.MultiregattaMediaPlace;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.tabs.MultiregattaRegattasPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.AbstractEventRegattaPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.EventRegattaActivity;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaMediaPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaRacesPlace;
 import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO;
 import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO.EventType;
 import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/EventClientFactory.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2;
+package com.sap.sailing.gwt.home.client.place.event;
 
 import com.sap.sailing.gwt.ui.client.SailingClientFactory;
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/EventContext.java

@@ -1,8 +1,8 @@
-package com.sap.sailing.gwt.home.client.place.event2;
+package com.sap.sailing.gwt.home.client.place.event;
 
 import java.util.List;
 
-import com.sap.sailing.gwt.home.client.place.event2.regatta.RegattaAnalyticsDataManager;
+import com.sap.sailing.gwt.home.client.place.event.regatta.RegattaAnalyticsDataManager;
 import com.sap.sailing.gwt.ui.shared.RaceGroupDTO;
 import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO;
 import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO.EventType;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/EventDefaultPlace.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2;
+package com.sap.sailing.gwt.home.client.place.event;
 
 import com.google.gwt.place.shared.Prefix;
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/EventPrefixes.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2;
+package com.sap.sailing.gwt.home.client.place.event;
 
 
 public class EventPrefixes {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/EventView.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2;
+package com.sap.sailing.gwt.home.client.place.event;
 
 import java.util.List;
 
@@ -9,8 +9,8 @@ import com.google.gwt.user.client.ui.IsWidget;
 import com.sap.sailing.domain.common.dto.RaceDTO;
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
 import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.AbstractEventRegattaPlace;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaRacesPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.AbstractEventRegattaPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaRacesPlace;
 import com.sap.sailing.gwt.home.client.place.events.EventsPlace;
 import com.sap.sailing.gwt.home.client.place.fakeseries.SeriesDefaultPlace;
 import com.sap.sailing.gwt.home.client.place.start.StartPlace;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/legacy/EventPlace.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.legacy;
+package com.sap.sailing.gwt.home.client.place.event.legacy;
 
 import com.google.gwt.place.shared.PlaceTokenizer;
 import com.sap.sailing.gwt.common.client.AbstractBasePlace;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/legacy/RegattaPlace.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.legacy;
+package com.sap.sailing.gwt.home.client.place.event.legacy;
 
 import com.google.gwt.place.shared.PlaceTokenizer;
 import com.sap.sailing.gwt.common.client.AbstractBasePlace;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/legacy/SeriesClientFactory.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.legacy;
+package com.sap.sailing.gwt.home.client.place.event.legacy;
 
 import com.sap.sailing.gwt.ui.client.SailingClientFactory;
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/legacy/SeriesPlace.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.legacy;
+package com.sap.sailing.gwt.home.client.place.event.legacy;
 
 import com.google.gwt.place.shared.PlaceTokenizer;
 import com.sap.sailing.gwt.common.client.AbstractBasePlace;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/multiregatta/AbstractMultiregattaEventPlace.java

@@ -1,7 +1,7 @@
-package com.sap.sailing.gwt.home.client.place.event2.multiregatta;
+package com.sap.sailing.gwt.home.client.place.event.multiregatta;
 
-import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.EventContext;
+import com.sap.sailing.gwt.home.client.place.event.AbstractEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventContext;
 
 public abstract class AbstractMultiregattaEventPlace extends AbstractEventPlace {
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/multiregatta/EventMultiregattaActivity.java

@@ -1,12 +1,12 @@
-package com.sap.sailing.gwt.home.client.place.event2.multiregatta;
+package com.sap.sailing.gwt.home.client.place.event.multiregatta;
 
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import com.sap.sailing.gwt.home.client.app.HomePlacesNavigator;
-import com.sap.sailing.gwt.home.client.place.event2.AbstractEventActivity;
-import com.sap.sailing.gwt.home.client.place.event2.EventClientFactory;
-import com.sap.sailing.gwt.home.client.place.event2.EventView;
-import com.sap.sailing.gwt.home.client.place.event2.EventView.PlaceCallback;
+import com.sap.sailing.gwt.home.client.place.event.AbstractEventActivity;
+import com.sap.sailing.gwt.home.client.place.event.EventClientFactory;
+import com.sap.sailing.gwt.home.client.place.event.EventView;
+import com.sap.sailing.gwt.home.client.place.event.EventView.PlaceCallback;
 
 public class EventMultiregattaActivity extends AbstractEventActivity<AbstractMultiregattaEventPlace> implements EventMultiregattaView.Presenter {
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/multiregatta/EventMultiregattaView.java

@@ -1,6 +1,6 @@
-package com.sap.sailing.gwt.home.client.place.event2.multiregatta;
+package com.sap.sailing.gwt.home.client.place.event.multiregatta;
 
-import com.sap.sailing.gwt.home.client.place.event2.EventView;
+import com.sap.sailing.gwt.home.client.place.event.EventView;
 
 public interface EventMultiregattaView extends EventView<AbstractMultiregattaEventPlace, EventMultiregattaView.Presenter> {
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/multiregatta/MultiregattaTabView.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.multiregatta;
+package com.sap.sailing.gwt.home.client.place.event.multiregatta;
 
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/multiregatta/TabletAndDesktopEventView.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.multiregatta;
+package com.sap.sailing.gwt.home.client.place.event.multiregatta;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
@@ -14,7 +14,7 @@ import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
 import com.sap.sailing.gwt.common.client.i18n.TextMessages;
 import com.sap.sailing.gwt.home.client.app.ApplicationHistoryMapper;
 import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
-import com.sap.sailing.gwt.home.client.place.event2.partials.header.EventHeader;
+import com.sap.sailing.gwt.home.client.place.event.partials.header.EventHeader;
 import com.sap.sailing.gwt.ui.client.StringMessages;
 
 public class TabletAndDesktopEventView extends Composite implements EventMultiregattaView {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/multiregatta/TabletAndDesktopEventView.ui.xml

@@ -2,8 +2,8 @@
 <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:tabs="urn:import:com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs" 
-	xmlns:h="urn:import:com.sap.sailing.gwt.home.client.place.event2.partials.header">
+	xmlns:tabs="urn:import:com.sap.sailing.gwt.home.client.place.event.multiregatta.tabs" 
+	xmlns:h="urn:import:com.sap.sailing.gwt.home.client.place.event.partials.header">
 	<ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
 	<ui:style>
 		.header {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/multiregatta/tabs/MultiregattaMediaPlace.java

@@ -1,10 +1,10 @@
-package com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.multiregatta.tabs;
 
 import com.google.gwt.place.shared.Prefix;
-import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.EventContext;
-import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.AbstractMultiregattaEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.AbstractEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventContext;
+import com.sap.sailing.gwt.home.client.place.event.EventPrefixes;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.AbstractMultiregattaEventPlace;
 
 public class MultiregattaMediaPlace extends AbstractMultiregattaEventPlace {
     public MultiregattaMediaPlace(String id) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/multiregatta/tabs/MultiregattaMediaTabView.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.multiregatta.tabs;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
@@ -7,9 +7,9 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.EventMultiregattaView;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.EventMultiregattaView.Presenter;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.MultiregattaTabView;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.EventMultiregattaView;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.MultiregattaTabView;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.EventMultiregattaView.Presenter;
 import com.sap.sailing.gwt.home.client.shared.media.MediaPage;
 import com.sap.sailing.gwt.ui.shared.media.MediaDTO;
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/multiregatta/tabs/MultiregattaOverviewPlace.java

@@ -1,10 +1,10 @@
-package com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.multiregatta.tabs;
 
 import com.google.gwt.place.shared.Prefix;
-import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.EventContext;
-import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.AbstractMultiregattaEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.AbstractEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventContext;
+import com.sap.sailing.gwt.home.client.place.event.EventPrefixes;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.AbstractMultiregattaEventPlace;
 
 public class MultiregattaOverviewPlace extends AbstractMultiregattaEventPlace {
     public MultiregattaOverviewPlace(String id) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/multiregatta/tabs/MultiregattaOverviewTabView.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.multiregatta.tabs;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
@@ -6,9 +6,9 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.EventMultiregattaView;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.EventMultiregattaView.Presenter;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.MultiregattaTabView;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.EventMultiregattaView;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.MultiregattaTabView;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.EventMultiregattaView.Presenter;
 
 /**
  * Created by pgtaboada on 25.11.14.

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/multiregatta/tabs/MultiregattaRegattasPlace.java

@@ -1,10 +1,10 @@
-package com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.multiregatta.tabs;
 
 import com.google.gwt.place.shared.Prefix;
-import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.EventContext;
-import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.AbstractMultiregattaEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.AbstractEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventContext;
+import com.sap.sailing.gwt.home.client.place.event.EventPrefixes;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.AbstractMultiregattaEventPlace;
 
 public class MultiregattaRegattasPlace extends AbstractMultiregattaEventPlace {
     public MultiregattaRegattasPlace(String id) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/multiregatta/tabs/MultiregattaRegattasTabView.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.multiregatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.multiregatta.tabs;
 
 import java.util.HashMap;
 import java.util.List;
@@ -13,10 +13,10 @@ import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.EventMultiregattaView;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.EventMultiregattaView.Presenter;
-import com.sap.sailing.gwt.home.client.place.event2.multiregatta.MultiregattaTabView;
-import com.sap.sailing.gwt.home.client.place.event2.partials.eventregatta.EventRegattaList;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.EventMultiregattaView;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.MultiregattaTabView;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.EventMultiregattaView.Presenter;
+import com.sap.sailing.gwt.home.client.place.event.partials.eventregatta.EventRegattaList;
 import com.sap.sailing.gwt.ui.shared.EventDTO;
 import com.sap.sailing.gwt.ui.shared.LeaderboardGroupDTO;
 import com.sap.sailing.gwt.ui.shared.RaceGroupDTO;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/Regatta.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials;
+package com.sap.sailing.gwt.home.client.place.event.partials;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,9 +21,9 @@ import com.sap.sailing.gwt.common.client.BoatClassImageResolver;
 import com.sap.sailing.gwt.common.client.BoatClassImageResources;
 import com.sap.sailing.gwt.common.client.LinkUtil;
 import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
-import com.sap.sailing.gwt.home.client.place.event2.EventView;
-import com.sap.sailing.gwt.home.client.place.event2.EventView.Presenter;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaRacesPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventView;
+import com.sap.sailing.gwt.home.client.place.event.EventView.Presenter;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaRacesPlace;
 import com.sap.sailing.gwt.home.client.shared.LongNamesUtil;
 import com.sap.sailing.gwt.ui.shared.EventDTO;
 import com.sap.sailing.gwt.ui.shared.LeaderboardGroupDTO;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/Regatta.ui.xml

@@ -4,7 +4,7 @@
     xmlns:s="urn:import:com.sap.sailing.gwt.home.client.place.event">
     <ui:with field="i18n" 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.event2.partials.RegattaResources" />
+    <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.RegattaResources" />
     <g:HTMLPanel>
 <!-- A view, introducing a regatta-->
 <div ui:field="regattaDiv" class="{local_res.css.regatta}" data-labeltype="">

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/RegattaPhase.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials;
+package com.sap.sailing.gwt.home.client.place.event.partials;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.AnchorElement;
@@ -13,8 +13,8 @@ import com.sap.sailing.domain.common.LeaderboardNameConstants;
 import com.sap.sailing.domain.common.dto.RaceColumnDTO;
 import com.sap.sailing.gwt.common.client.LinkUtil;
 import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
-import com.sap.sailing.gwt.home.client.place.event2.EventView;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaRacesPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventView;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaRacesPlace;
 import com.sap.sailing.gwt.ui.shared.LeaderboardGroupDTO;
 import com.sap.sailing.gwt.ui.shared.RaceGroupDTO;
 import com.sap.sailing.gwt.ui.shared.RaceGroupSeriesDTO;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/RegattaPhase.ui.xml

@@ -4,7 +4,7 @@
     xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared">
     <ui:with field="i18n" 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.event2.partials.RegattaResources" />
+    <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.RegattaResources" />
 <div class="{local_res.css.regatta_intro_phases_phase}">
     <div class="{local_res.css.regatta_intro_phases_phase_name}"><span ui:field="phaseName" /></div>
   <a ui:field="phaseRacesAnchor" href="javascript:;">

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/RegattaPhaseRace.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials;
+package com.sap.sailing.gwt.home.client.place.event.partials;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.DivElement;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/RegattaPhaseRace.ui.xml

@@ -4,6 +4,6 @@
     xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared">
     <ui:with field="i18n" 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.event2.partials.RegattaResources" />
+    <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.RegattaResources" />
 	<div ui:field="raceStatus" class="{local_res.css.regatta_intro_phases_phase_races_race}"></div>
 </ui:UiBinder>

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/RegattaResources.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials;
+package com.sap.sailing.gwt.home.client.place.event.partials;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ClientBundle;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/eventregatta/EventRegattaList.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials.eventregatta;
+package com.sap.sailing.gwt.home.client.place.event.partials.eventregatta;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -20,9 +20,9 @@ import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.gwt.common.client.SharedResources;
-import com.sap.sailing.gwt.home.client.place.event2.EventView;
-import com.sap.sailing.gwt.home.client.place.event2.EventView.Presenter;
-import com.sap.sailing.gwt.home.client.place.event2.partials.Regatta;
+import com.sap.sailing.gwt.home.client.place.event.EventView;
+import com.sap.sailing.gwt.home.client.place.event.EventView.Presenter;
+import com.sap.sailing.gwt.home.client.place.event.partials.Regatta;
 import com.sap.sailing.gwt.home.client.shared.LongNamesUtil;
 import com.sap.sailing.gwt.ui.shared.LeaderboardGroupDTO;
 import com.sap.sailing.gwt.ui.shared.RaceGroupDTO;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/eventregatta/EventRegattaList.ui.xml

@@ -4,7 +4,7 @@
     xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared">
     <ui:with field="i18n" 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.event2.partials.eventregatta.EventRegattaListResources" />
+    <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.eventregatta.EventRegattaListResources" />
     <g:HTMLPanel>
 <!-- A list of regattas-->
 <div class="{local_res.css.eventregattalist}">

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/eventregatta/EventRegattaListResources.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials.eventregatta;
+package com.sap.sailing.gwt.home.client.place.event.partials.eventregatta;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ClientBundle;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/header/DropdownItem.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials.header;
+package com.sap.sailing.gwt.home.client.place.event.partials.header;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.AnchorElement;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/header/DropdownItem.ui.xml

@@ -2,7 +2,7 @@
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder">
   <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.event2.partials.header.EventHeaderResources" />
+  <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.header.EventHeaderResources" />
   <ui:style>
   .important {
     font-weight: bold;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/header/EventHeader.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials.header;
+package com.sap.sailing.gwt.home.client.place.event.partials.header;
 
 import java.util.Date;
 
@@ -25,10 +25,10 @@ import com.google.gwt.user.client.ui.Widget;
 import com.google.web.bindery.event.shared.HandlerRegistration;
 import com.sap.sailing.gwt.common.client.LinkUtil;
 import com.sap.sailing.gwt.common.client.i18n.TextMessages;
-import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.EventView;
-import com.sap.sailing.gwt.home.client.place.event2.EventView.PlaceCallback;
-import com.sap.sailing.gwt.home.client.place.event2.EventView.Presenter;
+import com.sap.sailing.gwt.home.client.place.event.AbstractEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventView;
+import com.sap.sailing.gwt.home.client.place.event.EventView.PlaceCallback;
+import com.sap.sailing.gwt.home.client.place.event.EventView.Presenter;
 import com.sap.sailing.gwt.home.client.shared.EventDatesFormatterUtil;
 import com.sap.sailing.gwt.home.client.shared.LabelTypeUtil;
 import com.sap.sailing.gwt.home.client.shared.sharing.SharingButtons;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/header/EventHeader.ui.xml

@@ -5,7 +5,7 @@
   xmlns:sharing="urn:import:com.sap.sailing.gwt.home.client.shared.sharing">
   <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.event2.partials.header.EventHeaderResources" />
+  <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.header.EventHeaderResources" />
   <g:HTMLPanel addStyleNames="{res.mediaCss.grid}">
         <div class="{res.mediaCss.small12} {res.mediaCss.large9} {res.mediaCss.columns}">
           <div class="{local_res.css.eventheader_intro}">

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/header/EventHeaderResources.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials.header;
+package com.sap.sailing.gwt.home.client.place.event.partials.header;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ClientBundle;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaHeader/RegattaHeader.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials.regattaHeader;
+package com.sap.sailing.gwt.home.client.place.event.partials.regattaHeader;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaHeader/RegattaHeader.ui.xml

@@ -2,12 +2,12 @@
 <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.place.event2.partials"
+	xmlns:s="urn:import:com.sap.sailing.gwt.home.client.place.event.partials"
 	>
 
   <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.event2.partials.regattaHeader.RegattaHeaderResources" />
+  <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.regattaHeader.RegattaHeaderResources" />
   <g:HTMLPanel>
     <!-- The regatta header contains basic regatta information-->
     <div>

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaHeader/RegattaHeaderBody.ui.xml

@@ -2,12 +2,12 @@
 <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.place.event2.ui"
+	xmlns:s="urn:import:com.sap.sailing.gwt.home.client.place.event.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.client.place.event2.ui.regattaHeader.RegattaHeaderResources" />
+  <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.ui.regattaHeader.RegattaHeaderResources" />
 
   <g:HTMLPanel>
     <div class="{local_res.css.regattaheader_logo}">

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaHeader/RegattaHeaderResources.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials.regattaHeader;
+package com.sap.sailing.gwt.home.client.place.event.partials.regattaHeader;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ClientBundle;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRaces.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials.regattaraces;
+package com.sap.sailing.gwt.home.client.place.event.partials.regattaraces;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,9 +9,9 @@ import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.sap.sailing.gwt.home.client.place.event2.EventView;
-import com.sap.sailing.gwt.home.client.place.event2.EventView.Presenter;
-import com.sap.sailing.gwt.home.client.place.event2.partials.Regatta;
+import com.sap.sailing.gwt.home.client.place.event.EventView;
+import com.sap.sailing.gwt.home.client.place.event.EventView.Presenter;
+import com.sap.sailing.gwt.home.client.place.event.partials.Regatta;
 import com.sap.sailing.gwt.ui.shared.LeaderboardGroupDTO;
 import com.sap.sailing.gwt.ui.shared.RaceGroupDTO;
 import com.sap.sailing.gwt.ui.shared.RaceGroupSeriesDTO;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRaces.ui.xml

@@ -1,10 +1,10 @@
 <!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.place.event2.partials">
+    xmlns:s="urn:import:com.sap.sailing.gwt.home.client.place.event.partials">
     <ui:with field="i18n" 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.event2.partials.regattaraces.EventRegattaRacesResources" />
+    <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.regattaraces.EventRegattaRacesResources" />
     <g:HTMLPanel ui:field="rootPanel">
 
 <!-- The races of races for a day-->

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesFleet.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials.regattaraces;
+package com.sap.sailing.gwt.home.client.place.event.partials.regattaraces;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.DivElement;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesFleet.ui.xml

@@ -4,7 +4,7 @@
     xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared">
     <ui:with field="i18n" 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.event2.partials.regattaraces.EventRegattaRacesResources" />
+    <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.regattaraces.EventRegattaRacesResources" />
 <div class="{local_res.css.eventregattaraces_phase_fleet}">
   <div ui:field="fleetCountAndColor" class="{local_res.css.eventregattaraces_phase_fleet_count}"></div>
   <div class="{local_res.css.eventregattaraces_phase_fleet_name}"><span ui:field="fleetName" /></div>

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesFleetGroup.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials.regattaraces;
+package com.sap.sailing.gwt.home.client.place.event.partials.regattaraces;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -13,7 +13,7 @@ import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.domain.common.dto.FleetDTO;
 import com.sap.sailing.domain.common.dto.RaceColumnDTO;
-import com.sap.sailing.gwt.home.client.place.event2.EventView;
+import com.sap.sailing.gwt.home.client.place.event.EventView;
 import com.sap.sailing.gwt.home.client.shared.EventDatesFormatterUtil;
 import com.sap.sailing.gwt.ui.shared.RaceGroupSeriesDTO;
 import com.sap.sailing.gwt.ui.shared.StrippedLeaderboardDTO;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesFleetGroup.ui.xml

@@ -4,7 +4,7 @@
     xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared">
     <ui:with field="i18n" 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.event2.partials.regattaraces.EventRegattaRacesResources" />
+    <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.regattaraces.EventRegattaRacesResources" />
     <g:HTMLPanel>
 	<div ui:field="fleetsPanel" class="{local_res.css.eventregattaraces_phase_fleets}"></div>
 	<div ui:field="racesFromToDate" class="{local_res.css.eventregattaraces_phase_day}"></div>

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesNavigationLink.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials.regattaraces;
+package com.sap.sailing.gwt.home.client.place.event.partials.regattaraces;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.SpanElement;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesNavigationLink.ui.xml

@@ -4,7 +4,7 @@
     xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared">
     <ui:with field="i18n" 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.event2.partials.regattaraces.EventRegattaRacesResources" />
+    <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.regattaraces.EventRegattaRacesResources" />
     <g:HTMLPanel>
 		<a href="#phaseName" class="{local_res.css.regattanavigation_link}"><span ui:field="phaseName" /></a>
     </g:HTMLPanel>

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesPhase.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials.regattaraces;
+package com.sap.sailing.gwt.home.client.place.event.partials.regattaraces;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,7 +12,7 @@ import com.google.gwt.user.client.ui.UIObject;
 import com.sap.sailing.domain.common.LeaderboardNameConstants;
 import com.sap.sailing.domain.common.dto.FleetDTO;
 import com.sap.sailing.gwt.common.client.i18n.TextMessages;
-import com.sap.sailing.gwt.home.client.place.event2.EventView;
+import com.sap.sailing.gwt.home.client.place.event.EventView;
 import com.sap.sailing.gwt.ui.shared.RaceGroupSeriesDTO;
 import com.sap.sailing.gwt.ui.shared.StrippedLeaderboardDTO;
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesPhase.ui.xml

@@ -4,7 +4,7 @@
     xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared">
     <ui:with field="i18n" 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.event2.partials.regattaraces.EventRegattaRacesResources" />
+    <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.regattaraces.EventRegattaRacesResources" />
 <div class="{local_res.css.eventregattaraces_phase}">
   <h3 id="phaseName" class="{local_res.css.eventregattaraces_phase_name}"><span ui:field="phaseName" /></h3>
   <div ui:field="fleetGroupsPanel" />

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesRace.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials.regattaraces;
+package com.sap.sailing.gwt.home.client.place.event.partials.regattaraces;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.DivElement;
@@ -16,8 +16,8 @@ import com.sap.sailing.domain.common.dto.CompetitorDTO;
 import com.sap.sailing.domain.common.dto.FleetDTO;
 import com.sap.sailing.domain.common.dto.RaceColumnDTO;
 import com.sap.sailing.domain.common.dto.RaceDTO;
-import com.sap.sailing.gwt.home.client.place.event2.EventView;
-import com.sap.sailing.gwt.home.client.place.event2.EventView.Presenter;
+import com.sap.sailing.gwt.home.client.place.event.EventView;
+import com.sap.sailing.gwt.home.client.place.event.EventView.Presenter;
 import com.sap.sailing.gwt.ui.shared.StrippedLeaderboardDTO;
 
 public class EventRegattaRacesRace extends Composite {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesRace.ui.xml

@@ -4,7 +4,7 @@
     xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared">
     <ui:with field="i18n" 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.event2.partials.regattaraces.EventRegattaRacesResources" />
+    <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.regattaraces.EventRegattaRacesResources" />
 <g:HTMLPanel styleName="{local_res.css.eventregattarace}">
   <div ui:field="fleetColor" class="{local_res.css.eventregattarace_fleetindicator}"></div>
   <!-- race name  -->

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesRaceday.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials.regattaraces;
+package com.sap.sailing.gwt.home.client.place.event.partials.regattaraces;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.DivElement;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesRaceday.ui.xml

@@ -4,7 +4,7 @@
     xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared">
     <ui:with field="i18n" 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.event2.partials.regattaraces.EventRegattaRacesResources" />
+    <ui:with field="local_res" type="com.sap.sailing.gwt.home.client.place.event.partials.regattaraces.EventRegattaRacesResources" />
     <g:HTMLPanel>
 
 <div ui:field="raceDayDate" class="{local_res.css.eventregattaraces_phase_day}"></div>

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesResources.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.partials.regattaraces;
+package com.sap.sailing.gwt.home.client.place.event.partials.regattaraces;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ClientBundle;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/AbstractEventRegattaPlace.java

@@ -1,7 +1,7 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta;
+package com.sap.sailing.gwt.home.client.place.event.regatta;
 
-import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.EventContext;
+import com.sap.sailing.gwt.home.client.place.event.AbstractEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventContext;
 
 public abstract class AbstractEventRegattaPlace extends AbstractEventPlace {
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/EventRegattaActivity.java

@@ -1,16 +1,16 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta;
+package com.sap.sailing.gwt.home.client.place.event.regatta;
 
 import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import com.sap.sailing.gwt.home.client.app.HomePlacesNavigator;
 import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
-import com.sap.sailing.gwt.home.client.place.event2.AbstractEventActivity;
-import com.sap.sailing.gwt.home.client.place.event2.EventClientFactory;
-import com.sap.sailing.gwt.home.client.place.event2.EventContext;
-import com.sap.sailing.gwt.home.client.place.event2.EventView;
-import com.sap.sailing.gwt.home.client.place.event2.EventView.PlaceCallback;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaRacesPlace;
+import com.sap.sailing.gwt.home.client.place.event.AbstractEventActivity;
+import com.sap.sailing.gwt.home.client.place.event.EventClientFactory;
+import com.sap.sailing.gwt.home.client.place.event.EventContext;
+import com.sap.sailing.gwt.home.client.place.event.EventView;
+import com.sap.sailing.gwt.home.client.place.event.EventView.PlaceCallback;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaRacesPlace;
 import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO;
 import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO.EventType;
 import com.sap.sailing.gwt.ui.shared.eventview.RegattaReferenceDTO;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/EventRegattaView.java

@@ -1,8 +1,8 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta;
+package com.sap.sailing.gwt.home.client.place.event.regatta;
 
 import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
-import com.sap.sailing.gwt.home.client.place.event2.EventView;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.tabs.RegattaRacesPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventView;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaRacesPlace;
 import com.sap.sse.gwt.client.player.Timer;
 
 public interface EventRegattaView extends EventView<AbstractEventRegattaPlace, EventRegattaView.Presenter> {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/RegattaAnalyticsDataManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta;
+package com.sap.sailing.gwt.home.client.place.event.regatta;
 
 import java.util.ArrayList;
 import java.util.Iterator;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/RegattaTabView.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta;
+package com.sap.sailing.gwt.home.client.place.event.regatta;
 
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/TabletAndDesktopEventView.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta;
+package com.sap.sailing.gwt.home.client.place.event.regatta;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
@@ -14,7 +14,7 @@ import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
 import com.sap.sailing.gwt.common.client.i18n.TextMessages;
 import com.sap.sailing.gwt.home.client.app.ApplicationHistoryMapper;
 import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
-import com.sap.sailing.gwt.home.client.place.event2.partials.header.EventHeader;
+import com.sap.sailing.gwt.home.client.place.event.partials.header.EventHeader;
 import com.sap.sailing.gwt.ui.client.StringMessages;
 import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO.EventType;
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/TabletAndDesktopEventView.ui.xml

@@ -2,8 +2,8 @@
 <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:tabs="urn:import:com.sap.sailing.gwt.home.client.place.event2.regatta.tabs" 
-	xmlns:h="urn:import:com.sap.sailing.gwt.home.client.place.event2.partials.header">
+	xmlns:tabs="urn:import:com.sap.sailing.gwt.home.client.place.event.regatta.tabs" 
+	xmlns:h="urn:import:com.sap.sailing.gwt.home.client.place.event.partials.header">
 	<ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
 	<ui:style>
 		.header {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/tabs/RegattaCompetitorAnalyticsPlace.java

@@ -1,10 +1,10 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.regatta.tabs;
 
 import com.google.gwt.place.shared.Prefix;
-import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.EventContext;
-import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.AbstractEventRegattaPlace;
+import com.sap.sailing.gwt.home.client.place.event.AbstractEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventContext;
+import com.sap.sailing.gwt.home.client.place.event.EventPrefixes;
+import com.sap.sailing.gwt.home.client.place.event.regatta.AbstractEventRegattaPlace;
 
 public class RegattaCompetitorAnalyticsPlace extends AbstractEventRegattaPlace {
     public RegattaCompetitorAnalyticsPlace(String id, String regattaId) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/tabs/RegattaCompetitorAnalyticsTabView.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.regatta.tabs;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +13,10 @@ import com.google.gwt.user.client.ui.HTMLPanel;
 import com.sap.sailing.domain.common.DetailType;
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
 import com.sap.sailing.gwt.home.client.place.event.oldcompetitorcharts.OldCompetitorCharts;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.EventRegattaView;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.RegattaAnalyticsDataManager;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.EventRegattaView.Presenter;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.RegattaTabView;
+import com.sap.sailing.gwt.home.client.place.event.regatta.EventRegattaView;
+import com.sap.sailing.gwt.home.client.place.event.regatta.RegattaAnalyticsDataManager;
+import com.sap.sailing.gwt.home.client.place.event.regatta.RegattaTabView;
+import com.sap.sailing.gwt.home.client.place.event.regatta.EventRegattaView.Presenter;
 import com.sap.sailing.gwt.home.client.shared.placeholder.Placeholder;
 
 /**

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/tabs/RegattaLeaderboardPlace.java

@@ -1,10 +1,10 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.regatta.tabs;
 
 import com.google.gwt.place.shared.Prefix;
-import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.EventContext;
-import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.AbstractEventRegattaPlace;
+import com.sap.sailing.gwt.home.client.place.event.AbstractEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventContext;
+import com.sap.sailing.gwt.home.client.place.event.EventPrefixes;
+import com.sap.sailing.gwt.home.client.place.event.regatta.AbstractEventRegattaPlace;
 
 public class RegattaLeaderboardPlace extends AbstractEventRegattaPlace {
     public RegattaLeaderboardPlace(String id, String regattaId) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/tabs/RegattaLeaderboardTabView.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.regatta.tabs;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
@@ -13,11 +13,11 @@ import com.sap.sailing.domain.common.dto.LeaderboardDTO;
 import com.sap.sailing.domain.common.dto.RaceColumnDTO;
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
 import com.sap.sailing.gwt.home.client.place.event.oldleaderboard.OldLeaderboard;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.EventRegattaView;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.RegattaAnalyticsDataManager;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.EventRegattaView.Presenter;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.RegattaTabView;
-import com.sap.sailing.gwt.home.client.place.event2.utils.EventParamUtils;
+import com.sap.sailing.gwt.home.client.place.event.regatta.EventRegattaView;
+import com.sap.sailing.gwt.home.client.place.event.regatta.RegattaAnalyticsDataManager;
+import com.sap.sailing.gwt.home.client.place.event.regatta.RegattaTabView;
+import com.sap.sailing.gwt.home.client.place.event.regatta.EventRegattaView.Presenter;
+import com.sap.sailing.gwt.home.client.place.event.utils.EventParamUtils;
 import com.sap.sailing.gwt.home.client.shared.placeholder.Placeholder;
 import com.sap.sailing.gwt.ui.client.LeaderboardUpdateListener;
 import com.sap.sailing.gwt.ui.leaderboard.LeaderboardPanel;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/tabs/RegattaMediaPlace.java

@@ -1,10 +1,10 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.regatta.tabs;
 
 import com.google.gwt.place.shared.Prefix;
-import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.EventContext;
-import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.AbstractEventRegattaPlace;
+import com.sap.sailing.gwt.home.client.place.event.AbstractEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventContext;
+import com.sap.sailing.gwt.home.client.place.event.EventPrefixes;
+import com.sap.sailing.gwt.home.client.place.event.regatta.AbstractEventRegattaPlace;
 
 public class RegattaMediaPlace extends AbstractEventRegattaPlace {
     public RegattaMediaPlace(String id, String regattaId) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/tabs/RegattaMediaTabView.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.regatta.tabs;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
@@ -7,9 +7,9 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.EventRegattaView;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.EventRegattaView.Presenter;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.RegattaTabView;
+import com.sap.sailing.gwt.home.client.place.event.regatta.EventRegattaView;
+import com.sap.sailing.gwt.home.client.place.event.regatta.RegattaTabView;
+import com.sap.sailing.gwt.home.client.place.event.regatta.EventRegattaView.Presenter;
 import com.sap.sailing.gwt.home.client.shared.media.MediaPage;
 import com.sap.sailing.gwt.ui.shared.media.MediaDTO;
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/tabs/RegattaOverviewPlace.java

@@ -1,10 +1,10 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.regatta.tabs;
 
 import com.google.gwt.place.shared.Prefix;
-import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.EventContext;
-import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.AbstractEventRegattaPlace;
+import com.sap.sailing.gwt.home.client.place.event.AbstractEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventContext;
+import com.sap.sailing.gwt.home.client.place.event.EventPrefixes;
+import com.sap.sailing.gwt.home.client.place.event.regatta.AbstractEventRegattaPlace;
 
 public class RegattaOverviewPlace extends AbstractEventRegattaPlace {
     public RegattaOverviewPlace(String id, String regattaId) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/tabs/RegattaOverviewTabView.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.regatta.tabs;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
@@ -6,9 +6,9 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.EventRegattaView;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.EventRegattaView.Presenter;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.RegattaTabView;
+import com.sap.sailing.gwt.home.client.place.event.regatta.EventRegattaView;
+import com.sap.sailing.gwt.home.client.place.event.regatta.RegattaTabView;
+import com.sap.sailing.gwt.home.client.place.event.regatta.EventRegattaView.Presenter;
 
 /**
  * Created by pgtaboada on 25.11.14.

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/tabs/RegattaRacesPlace.java

@@ -1,10 +1,10 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.regatta.tabs;
 
 import com.google.gwt.place.shared.Prefix;
-import com.sap.sailing.gwt.home.client.place.event2.AbstractEventPlace;
-import com.sap.sailing.gwt.home.client.place.event2.EventContext;
-import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.AbstractEventRegattaPlace;
+import com.sap.sailing.gwt.home.client.place.event.AbstractEventPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventContext;
+import com.sap.sailing.gwt.home.client.place.event.EventPrefixes;
+import com.sap.sailing.gwt.home.client.place.event.regatta.AbstractEventRegattaPlace;
 
 public class RegattaRacesPlace extends AbstractEventRegattaPlace {
     public RegattaRacesPlace(String id, String leaderboardName) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/tabs/RegattaRacesTabView.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.regatta.tabs;
+package com.sap.sailing.gwt.home.client.place.event.regatta.tabs;
 
 import java.util.HashMap;
 import java.util.List;
@@ -12,9 +12,9 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
-import com.sap.sailing.gwt.home.client.place.event2.partials.regattaraces.EventRegattaRaces;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.EventRegattaView.Presenter;
-import com.sap.sailing.gwt.home.client.place.event2.regatta.RegattaTabView;
+import com.sap.sailing.gwt.home.client.place.event.partials.regattaraces.EventRegattaRaces;
+import com.sap.sailing.gwt.home.client.place.event.regatta.RegattaTabView;
+import com.sap.sailing.gwt.home.client.place.event.regatta.EventRegattaView.Presenter;
 import com.sap.sailing.gwt.ui.shared.EventDTO;
 import com.sap.sailing.gwt.ui.shared.LeaderboardGroupDTO;
 import com.sap.sailing.gwt.ui.shared.RaceGroupDTO;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/tabs/RegattaRacesTabView.ui.xml

@@ -1,6 +1,6 @@
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
              xmlns:g='urn:import:com.google.gwt.user.client.ui'
-             xmlns:p='urn:import:com.sap.sailing.gwt.home.client.place.event2.partials'
+             xmlns:p='urn:import:com.sap.sailing.gwt.home.client.place.event.partials'
              >
     <g:HTMLPanel ui:field="contentPanel">
         <p:regattaraces.EventRegattaRaces  ui:field="regattaRaces"/>

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/utils/EventParamUtils.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.utils;
+package com.sap.sailing.gwt.home.client.place.event.utils;
 
 import java.util.ArrayList;
 import java.util.Collections;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/utils/WindowUtils.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.gwt.home.client.place.event2.utils;
+package com.sap.sailing.gwt.home.client.place.event.utils;
 
 import com.google.gwt.user.client.Window;
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/recent/EventsOverviewRecentYear.java

@@ -16,7 +16,7 @@ import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.gwt.home.client.app.HomePlacesNavigator;
 import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
-import com.sap.sailing.gwt.home.client.place.event2.EventDefaultPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventDefaultPlace;
 import com.sap.sailing.gwt.home.client.place.events.CollapseAnimation;
 import com.sap.sailing.gwt.ui.shared.eventlist.EventListEventDTO;
 import com.sap.sailing.gwt.ui.shared.eventlist.EventListYearDTO;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/upcoming/EventsOverviewUpcomingEvent.java

@@ -13,7 +13,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.gwt.common.client.DateUtil;
 import com.sap.sailing.gwt.home.client.app.HomePlacesNavigator;
 import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
-import com.sap.sailing.gwt.home.client.place.event2.EventDefaultPlace;
+import com.sap.sailing.gwt.home.client.place.event.EventDefaultPlace;
 import com.sap.sailing.gwt.home.client.shared.EventDatesFormatterUtil;
 import com.sap.sailing.gwt.ui.client.StringMessages;
 import com.sap.sailing.gwt.ui.shared.eventlist.EventListEventDTO;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/AbstractSeriesActivity.java

@@ -12,8 +12,8 @@ import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
 import com.sap.sailing.gwt.home.client.app.ApplicationHistoryMapper;
 import com.sap.sailing.gwt.home.client.app.HomePlacesNavigator;
 import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
-import com.sap.sailing.gwt.home.client.place.event2.EventDefaultPlace;
-import com.sap.sailing.gwt.home.client.place.event2.legacy.SeriesClientFactory;
+import com.sap.sailing.gwt.home.client.place.event.EventDefaultPlace;
+import com.sap.sailing.gwt.home.client.place.event.legacy.SeriesClientFactory;
 import com.sap.sailing.gwt.home.client.place.events.EventsPlace;
 import com.sap.sailing.gwt.home.client.place.start.StartPlace;
 import com.sap.sailing.gwt.ui.shared.media.MediaDTO;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/SeriesActivity.java

@@ -15,8 +15,8 @@ import com.sap.sailing.gwt.common.client.controls.tabbar.TabView;
 import com.sap.sailing.gwt.home.client.app.ApplicationHistoryMapper;
 import com.sap.sailing.gwt.home.client.app.HomePlacesNavigator;
 import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
-import com.sap.sailing.gwt.home.client.place.event2.EventDefaultPlace;
-import com.sap.sailing.gwt.home.client.place.event2.legacy.SeriesClientFactory;
+import com.sap.sailing.gwt.home.client.place.event.EventDefaultPlace;
+import com.sap.sailing.gwt.home.client.place.event.legacy.SeriesClientFactory;
 import com.sap.sailing.gwt.home.client.place.events.EventsPlace;
 import com.sap.sailing.gwt.home.client.place.start.StartPlace;
 import com.sap.sailing.gwt.ui.shared.media.MediaDTO;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/SeriesActivityProxy.java

@@ -6,7 +6,7 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.sap.sailing.gwt.home.client.app.HomePlacesNavigator;
 import com.sap.sailing.gwt.home.client.place.error.ErrorPlace;
-import com.sap.sailing.gwt.home.client.place.event2.legacy.SeriesClientFactory;
+import com.sap.sailing.gwt.home.client.place.event.legacy.SeriesClientFactory;
 import com.sap.sailing.gwt.home.client.place.fakeseries.tabs.SeriesEventsPlace;
 import com.sap.sailing.gwt.ui.shared.fakeseries.EventSeriesViewDTO;
 import com.sap.sse.gwt.client.mvp.AbstractActivityProxy;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/fakeseries/SeriesDefaultPlace.java

@@ -1,7 +1,7 @@
 package com.sap.sailing.gwt.home.client.place.fakeseries;
 
 import com.google.gwt.place.shared.Prefix;
-import com.sap.sailing.gwt.home.client.place.event2.EventPrefixes;
+import com.sap.sailing.gwt.home.client.place.event.EventPrefixes;
 
 
 public class SeriesDefaultPlace extends AbstractSeriesPlace {