diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceDTO.java
index 66ee2725514..66f5de60813 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceDTO.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceDTO.java
@@ -5,8 +5,6 @@ import java.util.Date;
 import com.google.gwt.user.client.rpc.IsSerializable;
 import com.sap.sailing.domain.common.EventAndRaceIdentifier;
 import com.sap.sailing.domain.common.EventNameAndRaceName;
-import com.sap.sailing.domain.tracking.TrackedRace;
-import com.sap.sailing.domain.tractracadapter.TracTracRaceTracker;
 
 public class RaceDTO extends NamedDTO implements IsSerializable {
     public Iterable<CompetitorDTO> competitors;
diff --git a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/ServerReplicationMasterService.java b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/ServerReplicationMasterService.java
index 944d112cf59..c58538e689a 100644
--- a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/ServerReplicationMasterService.java
+++ b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/ServerReplicationMasterService.java
@@ -2,10 +2,10 @@ package com.sap.sailing.server.replication;
 
 import java.io.Serializable;
 
-import com.sap.sailing.server.operationaltransformation.RacingEventServiceOperation;
+import com.sap.sailing.server.RacingEventServiceOperation;
 
 public interface ServerReplicationMasterService {
-    void broadcastOperation(RacingEventServiceOperation operation) throws Exception;
+    void broadcastOperation(RacingEventServiceOperation<?> operation) throws Exception;
     
     void broadcastInitialServerState(Serializable state) throws Exception;
 }
diff --git a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ServerReplicationMasterServiceImpl.java b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ServerReplicationMasterServiceImpl.java
index f49bda198ad..a929bcdc239 100644
--- a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ServerReplicationMasterServiceImpl.java
+++ b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ServerReplicationMasterServiceImpl.java
@@ -9,7 +9,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
-import com.sap.sailing.server.operationaltransformation.RacingEventServiceOperation;
+import com.sap.sailing.server.RacingEventServiceOperation;
 import com.sap.sailing.server.replication.ServerReplicationMasterService;
 
 public class ServerReplicationMasterServiceImpl implements ServerReplicationMasterService {
diff --git a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ServerReplicationSlaveServiceImpl.java b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ServerReplicationSlaveServiceImpl.java
index a9cb44a9740..210fa9dc179 100644
--- a/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ServerReplicationSlaveServiceImpl.java
+++ b/java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ServerReplicationSlaveServiceImpl.java
@@ -2,9 +2,6 @@ package com.sap.sailing.server.replication.impl;
 
 import java.util.UUID;
 
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-
 import com.sap.sailing.server.replication.ReplicationSlaveDescriptor;
 import com.sap.sailing.server.replication.ServerReplicationSlaveService;
 
diff --git a/java/com.sap.sailing.targetplatform.updater/.classpath b/java/com.sap.sailing.targetplatform.updater/.classpath
new file mode 100755
index 00000000000..b1dabee3829
--- /dev/null
+++ b/java/com.sap.sailing.targetplatform.updater/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/java/com.sap.sailing.targetplatform.updater/.project b/java/com.sap.sailing.targetplatform.updater/.project
new file mode 100755
index 00000000000..4c5d62555a0
--- /dev/null
+++ b/java/com.sap.sailing.targetplatform.updater/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.sap.sailing.targetplatform.updater</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/java/com.sap.sailing.targetplatform.updater/.settings/org.eclipse.jdt.core.prefs b/java/com.sap.sailing.targetplatform.updater/.settings/org.eclipse.jdt.core.prefs
new file mode 100755
index 00000000000..11f6e462df7
--- /dev/null
+++ b/java/com.sap.sailing.targetplatform.updater/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/java/com.sap.sailing.targetplatform.updater/.settings/org.eclipse.pde.core.prefs b/java/com.sap.sailing.targetplatform.updater/.settings/org.eclipse.pde.core.prefs
new file mode 100755
index 00000000000..b7e72d019c2
--- /dev/null
+++ b/java/com.sap.sailing.targetplatform.updater/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/java/com.sap.sailing.targetplatform.updater/META-INF/MANIFEST.MF b/java/com.sap.sailing.targetplatform.updater/META-INF/MANIFEST.MF
new file mode 100755
index 00000000000..3abe7b4b804
--- /dev/null
+++ b/java/com.sap.sailing.targetplatform.updater/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Updater
+Bundle-SymbolicName: com.sap.sailing.targetplatform.updater
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.eclipse.equinox.launcher;bundle-version="1.2.0"
diff --git a/java/com.sap.sailing.targetplatform.updater/TargetPlatformUpdater.launch b/java/com.sap.sailing.targetplatform.updater/TargetPlatformUpdater.launch
new file mode 100755
index 00000000000..516179375ed
--- /dev/null
+++ b/java/com.sap.sailing.targetplatform.updater/TargetPlatformUpdater.launch
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/com.sap.sailing.targetplatform.updater"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.launcher.Main"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-consolelog -nosplash -verbose -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher -metadataRepository &quot;file:/${project_loc:com.sap.sailing.targetplatform.base}/gen/p2&quot; -artifactRepository &quot;file:/${project_loc:com.sap.sailing.targetplatform.base}/gen/p2&quot; -source &quot;${project_loc:com.sap.sailing.targetplatform.base}&quot; -publishArtifacts -publishArtifactRepository -compress -noDefaultIUs"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.targetplatform.updater"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-jar ${eclipse_home}/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar"/>
+</launchConfiguration>
diff --git a/java/com.sap.sailing.targetplatform.updater/build.properties b/java/com.sap.sailing.targetplatform.updater/build.properties
new file mode 100755
index 00000000000..41eb6ade2b4
--- /dev/null
+++ b/java/com.sap.sailing.targetplatform.updater/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/java/pom.xml b/java/pom.xml
index 14cf884f161..66119e6ef19 100755
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -33,6 +33,8 @@
 		<module>com.sap.sailing.expeditionconnector</module>
 		<module>com.sap.sailing.expeditionconnector.test</module>
 		<module>com.sap.sailing.server</module>
+		<module>com.sap.sailing.server.replication</module>
+		<module>com.sap.sailing.server.replication.test</module>
 		<module>com.sap.sailing.www</module>
 		<module>com.sap.sailing.www.events</module>
 		<module>com.sap.sailing.xcelsiusadapter</module>