diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/analyzers/FinishedTimeFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/racecommittee/domain/state/impl/analyzers/FinishedTimeFinder.java
similarity index 86%
rename from mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/analyzers/FinishedTimeFinder.java
rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/racecommittee/domain/state/impl/analyzers/FinishedTimeFinder.java
index 3a430dee50c..1fb0d4214d0 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/analyzers/FinishedTimeFinder.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/racecommittee/domain/state/impl/analyzers/FinishedTimeFinder.java
@@ -1,11 +1,10 @@
-package com.sap.sailing.racecommittee.app.domain.state.impl.analyzers;
+package com.sap.sailing.racecommittee.domain.state.impl.analyzers;
 
 import com.sap.sailing.domain.common.TimePoint;
 import com.sap.sailing.domain.common.racelog.RaceLogRaceStatus;
 import com.sap.sailing.domain.racelog.RaceLog;
 import com.sap.sailing.domain.racelog.RaceLogEvent;
 import com.sap.sailing.domain.racelog.RaceLogRaceStatusEvent;
-import com.sap.sailing.racecommittee.domain.state.impl.analyzers.RaceLogAnalyzer;
 
 public class FinishedTimeFinder extends RaceLogAnalyzer {
 
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/analyzers/FinishingTimeFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/racecommittee/domain/state/impl/analyzers/FinishingTimeFinder.java
similarity index 86%
rename from mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/analyzers/FinishingTimeFinder.java
rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/racecommittee/domain/state/impl/analyzers/FinishingTimeFinder.java
index 82eb6ce33a0..1dfb8011e1d 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/analyzers/FinishingTimeFinder.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/racecommittee/domain/state/impl/analyzers/FinishingTimeFinder.java
@@ -1,11 +1,10 @@
-package com.sap.sailing.racecommittee.app.domain.state.impl.analyzers;
+package com.sap.sailing.racecommittee.domain.state.impl.analyzers;
 
 import com.sap.sailing.domain.common.TimePoint;
 import com.sap.sailing.domain.common.racelog.RaceLogRaceStatus;
 import com.sap.sailing.domain.racelog.RaceLog;
 import com.sap.sailing.domain.racelog.RaceLogEvent;
 import com.sap.sailing.domain.racelog.RaceLogRaceStatusEvent;
-import com.sap.sailing.racecommittee.domain.state.impl.analyzers.RaceLogAnalyzer;
 
 public class FinishingTimeFinder extends RaceLogAnalyzer {
 
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/RaceStateImpl.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/RaceStateImpl.java
index c72a9986f57..9330205c3b3 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/RaceStateImpl.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/RaceStateImpl.java
@@ -19,8 +19,8 @@ import com.sap.sailing.racecommittee.app.domain.racelog.impl.RaceLogChangedVisit
 import com.sap.sailing.racecommittee.app.domain.state.RaceState;
 import com.sap.sailing.racecommittee.app.domain.state.RaceStateChangedListener;
 import com.sap.sailing.racecommittee.app.domain.state.StartProcedure;
-import com.sap.sailing.racecommittee.app.domain.state.impl.analyzers.FinishedTimeFinder;
-import com.sap.sailing.racecommittee.app.domain.state.impl.analyzers.FinishingTimeFinder;
+import com.sap.sailing.racecommittee.domain.state.impl.analyzers.FinishedTimeFinder;
+import com.sap.sailing.racecommittee.domain.state.impl.analyzers.FinishingTimeFinder;
 import com.sap.sailing.racecommittee.domain.state.impl.analyzers.LastPublishedCourseDesignFinder;
 import com.sap.sailing.racecommittee.domain.state.impl.analyzers.RaceStatusAnalyzer;
 import com.sap.sailing.racecommittee.domain.state.impl.analyzers.StartTimeFinder;