diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/event/RegattaApi.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/regatta/RegattaApi.java
similarity index 99%
rename from java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/event/RegattaApi.java
rename to java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/regatta/RegattaApi.java
index 8b3f46d5078..dfa456d53be 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/event/RegattaApi.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/regatta/RegattaApi.java
@@ -1,4 +1,4 @@
-package com.sap.sailing.selenium.api.event;
+package com.sap.sailing.selenium.api.regatta;
 
 import java.util.Date;
 import java.util.Map;
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/ClosedRegattaTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/ClosedRegattaTest.java
index 5f3bc83a760..aa110285f1c 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/ClosedRegattaTest.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/ClosedRegattaTest.java
@@ -19,8 +19,8 @@ import com.sap.sailing.domain.common.CompetitorRegistrationType;
 import com.sap.sailing.selenium.api.core.ApiContext;
 import com.sap.sailing.selenium.api.event.EventApi;
 import com.sap.sailing.selenium.api.event.EventApi.Event;
-import com.sap.sailing.selenium.api.event.RegattaApi;
-import com.sap.sailing.selenium.api.event.RegattaApi.Competitor;
+import com.sap.sailing.selenium.api.regatta.RegattaApi;
+import com.sap.sailing.selenium.api.regatta.RegattaApi.Competitor;
 import com.sap.sailing.selenium.api.event.SecurityApi;
 import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage;
 import com.sap.sailing.selenium.test.AbstractSeleniumTest;
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/LeaderboardApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/LeaderboardApiTest.java
index 38b6c1ea632..bcf1347a563 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/LeaderboardApiTest.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/LeaderboardApiTest.java
@@ -18,8 +18,8 @@ import com.sap.sailing.selenium.api.core.ApiContext;
 import com.sap.sailing.selenium.api.event.EventApi;
 import com.sap.sailing.selenium.api.event.LeaderboardApi;
 import com.sap.sailing.selenium.api.event.LeaderboardApi.DeviceMappingRequest;
-import com.sap.sailing.selenium.api.event.RegattaApi;
-import com.sap.sailing.selenium.api.event.RegattaApi.Competitor;
+import com.sap.sailing.selenium.api.regatta.RegattaApi;
+import com.sap.sailing.selenium.api.regatta.RegattaApi.Competitor;
 import com.sap.sailing.selenium.test.AbstractSeleniumTest;
 
 public class LeaderboardApiTest extends AbstractSeleniumTest {
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkApiTest.java
index ab7a564695c..4105d25ede5 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkApiTest.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkApiTest.java
@@ -12,8 +12,8 @@ import com.sap.sailing.selenium.api.core.ApiContext;
 import com.sap.sailing.selenium.api.event.EventApi;
 import com.sap.sailing.selenium.api.event.MarkApi;
 import com.sap.sailing.selenium.api.event.MarkApi.Mark;
-import com.sap.sailing.selenium.api.event.RegattaApi;
-import com.sap.sailing.selenium.api.event.RegattaApi.Regatta;
+import com.sap.sailing.selenium.api.regatta.RegattaApi;
+import com.sap.sailing.selenium.api.regatta.RegattaApi.Regatta;
 import com.sap.sailing.selenium.test.AbstractSeleniumTest;
 
 public class MarkApiTest extends AbstractSeleniumTest {
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/OpenRegattaTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/OpenRegattaTest.java
index 25ba3257608..cb40ce759f3 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/OpenRegattaTest.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/OpenRegattaTest.java
@@ -24,9 +24,9 @@ import com.sap.sailing.selenium.api.event.LeaderboardApi;
 import com.sap.sailing.selenium.api.event.LeaderboardApi.DeviceMappingRequest;
 import com.sap.sailing.selenium.api.event.MarkApi;
 import com.sap.sailing.selenium.api.event.MarkApi.Mark;
-import com.sap.sailing.selenium.api.event.RegattaApi;
-import com.sap.sailing.selenium.api.event.RegattaApi.Competitor;
-import com.sap.sailing.selenium.api.event.RegattaApi.RaceColumn;
+import com.sap.sailing.selenium.api.regatta.RegattaApi;
+import com.sap.sailing.selenium.api.regatta.RegattaApi.Competitor;
+import com.sap.sailing.selenium.api.regatta.RegattaApi.RaceColumn;
 import com.sap.sailing.selenium.api.event.SecurityApi;
 import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage;
 import com.sap.sailing.selenium.test.AbstractSeleniumTest;
@@ -84,6 +84,8 @@ public class OpenRegattaTest extends AbstractSeleniumTest {
 
         leaderboardApi.setTrackingTimes(ownerCtx, EVENT_NAME, race.getRaceName(), "Default", currentTimeMillis(), null);
         leaderboardApi.startRaceLogTracking(ownerCtx, EVENT_NAME, race.getRaceName(), "Default");
+        
+        System.out.println(regattaApi.getRegattaRaces(ownerCtx, EVENT_NAME));
 
         for (double i = 0.0; i < 100.0; i++) {
             final Double longitude = 9.12 + i / 1000.0, latitude = .599 + i / 1000.0, speed = 10.0, course = 180.0;
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/RegattaApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/RegattaApiTest.java
index 3edb19e06c5..2f05da4a7d3 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/RegattaApiTest.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/RegattaApiTest.java
@@ -15,11 +15,11 @@ import org.junit.Test;
 import com.sap.sailing.selenium.api.core.ApiContext;
 import com.sap.sailing.selenium.api.event.EventApi;
 import com.sap.sailing.selenium.api.event.LeaderboardApi;
-import com.sap.sailing.selenium.api.event.RegattaApi;
-import com.sap.sailing.selenium.api.event.RegattaApi.Competitor;
-import com.sap.sailing.selenium.api.event.RegattaApi.RaceColumn;
-import com.sap.sailing.selenium.api.event.RegattaApi.Regatta;
-import com.sap.sailing.selenium.api.event.RegattaApi.RegattaRaces;
+import com.sap.sailing.selenium.api.regatta.RegattaApi;
+import com.sap.sailing.selenium.api.regatta.RegattaApi.Competitor;
+import com.sap.sailing.selenium.api.regatta.RegattaApi.RaceColumn;
+import com.sap.sailing.selenium.api.regatta.RegattaApi.Regatta;
+import com.sap.sailing.selenium.api.regatta.RegattaApi.RegattaRaces;
 import com.sap.sailing.selenium.test.AbstractSeleniumTest;
 
 public class RegattaApiTest extends AbstractSeleniumTest {