diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/util/CountryCode.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/CountryCode.java
similarity index 73%
rename from java/com.sap.sailing.domain/src/com/sap/sailing/util/CountryCode.java
rename to java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/CountryCode.java
index 5df945adb78..57ca803b4cf 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/util/CountryCode.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/CountryCode.java
@@ -1,9 +1,6 @@
-package com.sap.sailing.util;
-
-import java.util.Locale;
+package com.sap.sailing.domain.common;
 
 public interface CountryCode {
-    Locale getLocale();
 
     String getTwoLetterISOCode();
 
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/util/CountryCodeFactory.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/CountryCodeFactory.java
similarity index 84%
rename from java/com.sap.sailing.domain/src/com/sap/sailing/util/CountryCodeFactory.java
rename to java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/CountryCodeFactory.java
index 3bff0666454..29d7cdbc4fb 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/util/CountryCodeFactory.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/CountryCodeFactory.java
@@ -1,6 +1,6 @@
-package com.sap.sailing.util;
+package com.sap.sailing.domain.common;
 
-import com.sap.sailing.util.impl.CountryCodeFactoryImpl;
+import com.sap.sailing.domain.common.impl.CountryCodeFactoryImpl;
 
 public interface CountryCodeFactory {
     CountryCodeFactory INSTANCE = new CountryCodeFactoryImpl();
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/CountryCodeFactoryImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/CountryCodeFactoryImpl.java
similarity index 98%
rename from java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/CountryCodeFactoryImpl.java
rename to java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/CountryCodeFactoryImpl.java
index 78285acf9f4..2654bac2246 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/CountryCodeFactoryImpl.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/CountryCodeFactoryImpl.java
@@ -1,4 +1,4 @@
-package com.sap.sailing.util.impl;
+package com.sap.sailing.domain.common.impl;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -6,8 +6,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.sap.sailing.util.CountryCode;
-import com.sap.sailing.util.CountryCodeFactory;
+import com.sap.sailing.domain.common.CountryCode;
+import com.sap.sailing.domain.common.CountryCodeFactory;
 
 public class CountryCodeFactoryImpl implements CountryCodeFactory {
     private final Map<String, CountryCode> byThreeLetterIOCName;
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/CountryCodeImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/CountryCodeImpl.java
similarity index 77%
rename from java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/CountryCodeImpl.java
rename to java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/CountryCodeImpl.java
index 256c7611974..44d52ef18ef 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/CountryCodeImpl.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/CountryCodeImpl.java
@@ -1,8 +1,6 @@
-package com.sap.sailing.util.impl;
+package com.sap.sailing.domain.common.impl;
 
-import java.util.Locale;
-
-import com.sap.sailing.util.CountryCode;
+import com.sap.sailing.domain.common.CountryCode;
 
 public class CountryCodeImpl implements CountryCode {
     private final String name;
@@ -42,16 +40,6 @@ public class CountryCodeImpl implements CountryCode {
         return twoLetterISOCode;
     }
 
-    @Override
-    public Locale getLocale() {
-        for (Locale l : Locale.getAvailableLocales()) {
-            if (l.getISO3Country().equalsIgnoreCase(getThreeLetterISOCode())) {
-                return l;
-            }
-        }
-        return new Locale(getTwoLetterISOCode(), getTwoLetterISOCode());
-    }
-
     @Override
     public String getThreeLetterISOCode() {
         return threeLetterISOCode;
diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CountryCodeTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CountryCodeTest.java
index 1febc653259..5c5c3690593 100755
--- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CountryCodeTest.java
+++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CountryCodeTest.java
@@ -18,9 +18,9 @@ import java.util.regex.Pattern;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import com.sap.sailing.domain.common.CountryCode;
+import com.sap.sailing.domain.common.CountryCodeFactory;
 import com.sap.sailing.domain.common.Util;
-import com.sap.sailing.util.CountryCode;
-import com.sap.sailing.util.CountryCodeFactory;
 
 public class CountryCodeTest {
     private static final int NUMBER_OF_COUNTRY_CODES = 259;
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Nationality.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Nationality.java
index 7b96e0cfc65..eba8c125a32 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Nationality.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Nationality.java
@@ -1,7 +1,7 @@
 package com.sap.sailing.domain.base;
 
+import com.sap.sailing.domain.common.CountryCode;
 import com.sap.sailing.domain.common.Named;
-import com.sap.sailing.util.CountryCode;
 
 public interface Nationality extends Named, WithImage {
     String getThreeLetterIOCAcronym();
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/NationalityImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/NationalityImpl.java
index 30649413133..8a497690cbd 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/NationalityImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/NationalityImpl.java
@@ -3,8 +3,8 @@ package com.sap.sailing.domain.base.impl;
 import java.io.InputStream;
 
 import com.sap.sailing.domain.base.Nationality;
-import com.sap.sailing.util.CountryCode;
-import com.sap.sailing.util.CountryCodeFactory;
+import com.sap.sailing.domain.common.CountryCode;
+import com.sap.sailing.domain.common.CountryCodeFactory;
 
 public class NationalityImpl implements Nationality {
     private final String threeLetterIOCAcronym;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
index b893d9bf18d..c65e4fc6f41 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
@@ -48,6 +48,7 @@ import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl;
 import com.sap.sailing.domain.base.impl.MeterDistance;
 import com.sap.sailing.domain.base.impl.MillisecondsTimePoint;
 import com.sap.sailing.domain.common.Bearing;
+import com.sap.sailing.domain.common.CountryCode;
 import com.sap.sailing.domain.common.DegreePosition;
 import com.sap.sailing.domain.common.Distance;
 import com.sap.sailing.domain.common.LegType;
@@ -126,7 +127,6 @@ import com.sap.sailing.server.api.EventNameAndRaceName;
 import com.sap.sailing.server.api.LeaderboardNameAndRaceColumnName;
 import com.sap.sailing.server.api.RaceFetcher;
 import com.sap.sailing.server.api.RaceIdentifier;
-import com.sap.sailing.util.CountryCode;
 
 /**
  * The server side implementation of the RPC service.
@@ -152,7 +152,7 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
 
     private final com.sap.sailing.domain.tractracadapter.persistence.DomainObjectFactory tractracDomainObjectFactory;
     
-    private final com.sap.sailing.util.CountryCodeFactory countryCodeFactory;
+    private final com.sap.sailing.domain.common.CountryCodeFactory countryCodeFactory;
     
     private final Executor executor;
 
@@ -165,7 +165,7 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
         tractracDomainObjectFactory = com.sap.sailing.domain.tractracadapter.persistence.DomainObjectFactory.INSTANCE;
         tractracMongoObjectFactory = com.sap.sailing.domain.tractracadapter.persistence.MongoObjectFactory.INSTANCE;
         swissTimingFactory = SwissTimingFactory.INSTANCE;
-        countryCodeFactory = com.sap.sailing.util.CountryCodeFactory.INSTANCE;
+        countryCodeFactory = com.sap.sailing.domain.common.CountryCodeFactory.INSTANCE;
         executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
     }
 
diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ModeratorApp.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ModeratorApp.java
index b218f12e711..65aae91c44c 100755
--- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ModeratorApp.java
+++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ModeratorApp.java
@@ -20,6 +20,7 @@ import com.sap.sailing.domain.base.Person;
 import com.sap.sailing.domain.base.RaceDefinition;
 import com.sap.sailing.domain.base.Waypoint;
 import com.sap.sailing.domain.base.impl.MillisecondsTimePoint;
+import com.sap.sailing.domain.common.CountryCode;
 import com.sap.sailing.domain.common.Distance;
 import com.sap.sailing.domain.common.NoWindException;
 import com.sap.sailing.domain.common.Position;
@@ -33,7 +34,6 @@ import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor;
 import com.sap.sailing.domain.tracking.TrackedRace;
 import com.sap.sailing.domain.tracking.Wind;
 import com.sap.sailing.server.Servlet;
-import com.sap.sailing.util.CountryCode;
 import com.sap.sailing.util.InvalidDateException;
 
 public class ModeratorApp extends Servlet {