diff --git a/mobile/com.sap.sailing.android.shared/res/values/preferences.xml b/mobile/com.sap.sailing.android.shared/res/values/preferences.xml
index bfa77307b4e..0fbf93666e0 100644
--- a/mobile/com.sap.sailing.android.shared/res/values/preferences.xml
+++ b/mobile/com.sap.sailing.android.shared/res/values/preferences.xml
@@ -17,9 +17,12 @@
     
     <string name="preference_competitor_key">competitor</string>
     <string name="preference_competitor_default">-1</string>
-    
+    ‚
+    <string name="preference_last_scanned_qr_code">lastScannedQRCode</string>
+
     <!-- the following strings should be overridden by apps using this library (e.g. in their own preferences.xml) -->
     <string name="app_folder">com.sap.sailing</string>
     <string name="intent_send_saved_intents">com.sap.sailing.android.shared.action.sendSavedIntents</string>
     <string name="intent_send_message">com.sap.sailing.android.shared.action.sendMessage</string>
+
 </resources>
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/BaseAppPreferences.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/BaseAppPreferences.java
new file mode 100644
index 00000000000..e9c2e3a08b2
--- /dev/null
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/BaseAppPreferences.java
@@ -0,0 +1,31 @@
+package com.sap.sailing.android.shared.util;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import com.sap.sailing.android.shared.R;
+
+public class BaseAppPreferences {
+    protected final Context context;
+    protected final SharedPreferences preferences;
+
+    public BaseAppPreferences(Context context) {
+        this.context = context;
+        //multi process mode so that services read consistent values
+        preferences = context.getSharedPreferences(BaseAppPreferences.class.getName(), Context.MODE_MULTI_PROCESS);
+    }
+
+    public String getDeviceIdentifier() {
+        return UniqueDeviceUuid.getUniqueId(context);
+    }
+
+    public String getLastScannedQRCode()
+    {
+        return preferences.getString(context.getString(R.string.preference_last_scanned_qr_code), null);
+    }
+
+    public void setLastScannedQRCode(String lastQRCode)
+    {
+        preferences.edit().putString(context.getString(R.string.preference_last_scanned_qr_code), lastQRCode).commit();
+    }
+}
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_compass.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_compass.xml
index b472184950a..d4f25699ecc 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_compass.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_compass.xml
@@ -21,7 +21,7 @@
         android:paddingTop="15dp" 
         />
 
-    <com.sap.sailing.android.tracking.app.customviews.AutoResizeLightTextView
+    <com.sap.sailing.android.shared.ui.customviews.AutoResizeLightTextView
         android:id="@+id/compass_bearing_text_view"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_home.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_home.xml
index 6bddf568c85..179dfca76b6 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_home.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_home.xml
@@ -23,7 +23,7 @@
         android:background="@color/black_transparent"
         >
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
@@ -42,7 +42,7 @@
         android:layout_marginTop="10dp"
         >
         
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansButton
+    <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
         android:id="@+id/scanQr"
         android:layout_weight="1"
         android:layout_width="fill_parent"
@@ -55,7 +55,7 @@
         android:textStyle="bold"
         android:text="@string/scan_qr" />
         
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansButton
+    <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
         android:id="@+id/noQrCode"
         android:layout_weight="1"
         android:layout_width="fill_parent"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
index b4df7888977..c51722f6014 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
@@ -56,7 +56,7 @@
                     android:paddingRight="@dimen/activity_horizontal_margin"
                     android:src="@drawable/ic_menu_camera" />
 
-                <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                     android:id="@+id/add_photo_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -80,7 +80,7 @@
                 android:orientation="horizontal"
                 android:padding="10dp" >
 
-                <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                     android:id="@+id/competitor_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -111,7 +111,7 @@
                         android:textColor="@color/white" />
                 </RelativeLayout>
 
-                <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                     android:id="@+id/sail_id"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -167,7 +167,7 @@
                     android:orientation="horizontal"
                     android:visibility="invisible" >
 
-                    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                         android:id="@+id/thank_you_note"
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
@@ -186,7 +186,7 @@
                     android:measureWithLargestChild="false"
                     android:orientation="horizontal" >
 
-                    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                         android:id="@+id/regatta_starts_in"
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
@@ -221,7 +221,7 @@
                             android:orientation="vertical"
                             android:padding="0dp" >
 
-                            <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                                 android:id="@+id/starts_in_days"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -229,7 +229,7 @@
                                 android:textColor="@color/white"
                                 android:textSize="40sp" />
 
-                            <com.sap.sailing.android.tracking.app.customviews.AutoResizeTextView
+                            <com.sap.sailing.android.shared.ui.customviews.AutoResizeTextView
                                 android:id="@+id/starts_in_days_label"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -252,7 +252,7 @@
                             android:orientation="vertical"
                             android:padding="0dp" >
 
-                            <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                                 android:id="@+id/starts_in_hours"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -260,7 +260,7 @@
                                 android:textColor="@color/white"
                                 android:textSize="40sp" />
 
-                            <com.sap.sailing.android.tracking.app.customviews.AutoResizeTextView
+                            <com.sap.sailing.android.shared.ui.customviews.AutoResizeTextView
                                 android:id="@+id/starts_in_hours_label"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -283,7 +283,7 @@
                             android:orientation="vertical"
                             android:padding="0dp" >
 
-                            <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                                 android:id="@+id/starts_in_minutes"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -291,7 +291,7 @@
                                 android:textColor="@color/white"
                                 android:textSize="40sp" />
 
-                            <com.sap.sailing.android.tracking.app.customviews.AutoResizeTextView
+                            <com.sap.sailing.android.shared.ui.customviews.AutoResizeTextView
                                 android:id="@+id/starts_in_minutes_label"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -338,7 +338,7 @@
             android:layout_below="@id/white_bar"
             android:orientation="horizontal" >
 
-            <com.sap.sailing.android.tracking.app.customviews.OpenSansButton
+            <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
                 android:id="@+id/show_leaderboards_button"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
@@ -352,7 +352,7 @@
                 android:textAllCaps="true"
                 android:textStyle="bold" />
 
-            <com.sap.sailing.android.tracking.app.customviews.OpenSansButton
+            <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
                 android:id="@+id/start_tracking"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
@@ -377,7 +377,7 @@
         android:layout_alignParentStart="true"
         android:background="@color/darker_gray" >
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/bottom_announcement"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_speed.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_speed.xml
index edf51d37a34..75f81ceea57 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_speed.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_speed.xml
@@ -25,7 +25,7 @@
         android:layout_centerInParent="true"
         android:orientation="vertical" >
 
-        <com.sap.sailing.android.tracking.app.customviews.AutoResizeLightTextView
+        <com.sap.sailing.android.shared.ui.customviews.AutoResizeLightTextView
             android:id="@+id/speed_text_view"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
             android:textSize="124sp"
             android:textStyle="bold" />
 
-        <com.sap.sailing.android.tracking.app.customviews.AutoResizeLightTextView
+        <com.sap.sailing.android.shared.ui.customviews.AutoResizeLightTextView
             android:id="@+id/speed_unit_text_view"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_stop_button.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_stop_button.xml
index 45e5cae6c40..d319dbf88ba 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_stop_button.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_stop_button.xml
@@ -23,7 +23,7 @@
             android:layout_alignParentTop="true"
             android:background="@color/white_transparent" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansButton
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
             android:id="@+id/stop_tracking"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_tracking.xml
index c0bab166e8a..9724d80f772 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_tracking.xml
@@ -17,7 +17,7 @@
         android:layout_height="wrap_content"
         android:background="@color/black" >
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/mode_label"
             android:layout_width="wrap_content"
             android:layout_height="35dp"
@@ -29,7 +29,7 @@
             android:paddingRight="10dp"
             android:text="@string/tracking_mode" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/mode"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
             android:text="@string/tracking_mode_caching"
             android:textColor="@color/sap_green" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/tracking_unsent_fixes_label"
             android:layout_width="wrap_content"
             android:layout_height="35dp"
@@ -52,7 +52,7 @@
             android:paddingRight="10dp"
             android:text="@string/tracking_unsent_fixes" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/tracking_unsent_fixes"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
@@ -64,7 +64,7 @@
             android:paddingLeft="10dp"
             android:text="@string/none" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/tracking_status_label"
             android:layout_width="wrap_content"
             android:layout_height="35dp"
@@ -74,7 +74,7 @@
             android:paddingRight="10dp"
             android:text="@string/tracking_status" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/tracking_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -87,7 +87,7 @@
             android:text="@string/tracking_status_tracking"
             android:textColor="@color/sap_green" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/gps_quality"
             android:layout_width="wrap_content"
             android:layout_height="35dp"
@@ -131,7 +131,7 @@
             android:layout_alignTop="@+id/tracking_time_info_label"
             android:background="@android:color/darker_gray" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/tracking_time_info_label"
             android:layout_width="fill_parent"
             android:layout_height="35dp"
@@ -143,7 +143,7 @@
             android:paddingRight="10dp"
             android:text="@string/tracking_time" />
 
-        <com.sap.sailing.android.tracking.app.customviews.AutoResizeTextView
+        <com.sap.sailing.android.shared.ui.customviews.AutoResizeTextView
             tools:ignore="InconsistentLayout"
             android:id="@+id/tracking_time_label"
             android:layout_width="match_parent"
@@ -166,7 +166,7 @@
             android:layout_alignParentEnd="true"
             android:orientation="horizontal" >
 
-            <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                 android:id="@+id/gps_accuracy_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -174,7 +174,7 @@
                 android:paddingLeft="9dp"
                 android:text="" />
 
-            <com.sap.sailing.android.tracking.app.customviews.SignalQualityIndicatorView
+            <com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView
                 android:id="@+id/gps_quality_indicator"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml
index e6e8fd85457..ef389421aa2 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml
@@ -19,7 +19,7 @@
         android:paddingTop="15dp" 
         />
 
-    <com.sap.sailing.android.tracking.app.customviews.AutoResizeLightTextView
+    <com.sap.sailing.android.shared.ui.customviews.AutoResizeLightTextView
         android:id="@+id/compass_bearing_text_view"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
index b44ca78a31d..bf374a68b02 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
@@ -2,7 +2,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansToolbar
+    <com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
@@ -14,7 +14,7 @@
             android:layout_height="match_parent"
             android:padding="10dp">
              
-            <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                 android:id="@+id/toolbar_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
                 android:singleLine="true"
                 android:textSize="16sp"/>
 
-            <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                 android:id="@+id/toolbar_subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
             
         </LinearLayout>
         
-    </com.sap.sailing.android.tracking.app.customviews.OpenSansToolbar>
+    </com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
 
     <FrameLayout
         android:id="@+id/content_frame"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
index 139f1475cd8..aa16f58a387 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
@@ -23,7 +23,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true">
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
@@ -33,7 +33,7 @@
             android:textColor="@color/white" />
     </RelativeLayout>
 
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansButton
+    <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
         android:id="@+id/scanQr"
         android:layout_width="fill_parent"
         android:layout_height="80dp"
@@ -47,7 +47,7 @@
         android:textStyle="bold"
         android:text="@string/scan_qr" />
         
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansButton
+    <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
         android:id="@+id/noQrCode"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_hud_container.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_hud_container.xml
index a2b95b4edea..e93db488893 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_hud_container.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_hud_container.xml
@@ -2,7 +2,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansToolbar
+    <com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
             android:orientation="vertical"
             android:padding="0dp" >
 
-            <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                 android:id="@+id/toolbar_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
                 android:singleLine="true"
                 android:textSize="16sp" />
 
-            <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                 android:id="@+id/toolbar_subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
                 android:singleLine="true"
                 android:textSize="12sp" />
         </LinearLayout>
-    </com.sap.sailing.android.tracking.app.customviews.OpenSansToolbar>
+    </com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
     
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index 1b7499dd5e2..4566d61a214 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -37,7 +37,7 @@
                 android:paddingRight="@dimen/activity_horizontal_margin"
                 android:src="@drawable/ic_menu_camera" />
 
-            <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                 android:id="@+id/add_photo_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
             android:orientation="horizontal"
             android:padding="10dp" >
 
-            <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                 android:id="@+id/competitor_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -92,7 +92,7 @@
                     android:textColor="@color/white" />
             </RelativeLayout>
             
-		<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+		<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                 android:id="@+id/sail_id"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -168,7 +168,7 @@
                 android:padding="10dp"
                 android:visibility="invisible" >
 
-                <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                     android:id="@+id/thank_you_note"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
@@ -187,7 +187,7 @@
                 android:orientation="horizontal"
                 android:padding="10dp" >
 
-                <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                     android:id="@+id/regatta_starts_in"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
@@ -222,7 +222,7 @@
                         android:orientation="vertical"
                         android:padding="0dp" >
 
-                        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                             android:id="@+id/starts_in_days"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -230,7 +230,7 @@
                             android:textColor="@color/white"
                             android:textSize="40sp" />
 
-                        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                             android:id="@+id/starts_in_days_label"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -253,7 +253,7 @@
                         android:orientation="vertical"
                         android:padding="0dp" >
 
-                        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                             android:id="@+id/starts_in_hours"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -261,7 +261,7 @@
                             android:textColor="@color/white"
                             android:textSize="40sp" />
 
-                        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                             android:id="@+id/starts_in_hours_label"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -284,7 +284,7 @@
                         android:orientation="vertical"
                         android:padding="0dp" >
 
-                        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                             android:id="@+id/starts_in_minutes"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -292,7 +292,7 @@
                             android:textColor="@color/white"
                             android:textSize="40sp" />
 
-                        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+                        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                             android:id="@+id/starts_in_minutes_label"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -331,7 +331,7 @@
                     android:layout_below="@id/white_bar"
                     android:orientation="horizontal" >
 
-                    <com.sap.sailing.android.tracking.app.customviews.OpenSansButton
+                    <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
                         android:id="@+id/show_leaderboards_button"
                         android:layout_width="fill_parent"
                         android:layout_height="fill_parent"
@@ -345,7 +345,7 @@
                         android:textAllCaps="true"
                         android:textStyle="bold" />
 
-                    <com.sap.sailing.android.tracking.app.customviews.OpenSansButton
+                    <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
                         android:id="@+id/start_tracking"
                         android:layout_width="fill_parent"
                         android:layout_height="fill_parent"
@@ -370,7 +370,7 @@
         android:layout_alignParentStart="true"
         android:background="@color/darker_gray" >
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/bottom_announcement"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
index 3cb390e635a..65a8fe8bca9 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
@@ -23,7 +23,7 @@
         android:layout_centerInParent="true"
         android:orientation="vertical" >
 
-        <com.sap.sailing.android.tracking.app.customviews.AutoResizeLightTextView
+        <com.sap.sailing.android.shared.ui.customviews.AutoResizeLightTextView
             android:id="@+id/speed_text_view"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
             android:textSize="124sp"
             android:textStyle="bold" />
 
-        <com.sap.sailing.android.tracking.app.customviews.AutoResizeLightTextView
+        <com.sap.sailing.android.shared.ui.customviews.AutoResizeLightTextView
             android:id="@+id/speed_unit_text_view"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_stop_button.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_stop_button.xml
index f7bab93af82..f031c3cdd84 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_stop_button.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_stop_button.xml
@@ -14,7 +14,7 @@
         android:baselineAligned="false"
         android:paddingTop="15dp" >
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/tracking_time"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             android:layout_alignParentTop="true"
             android:text="@string/tracking_time" />
 
-        <com.sap.sailing.android.tracking.app.customviews.AutoResizeLightTextView
+        <com.sap.sailing.android.shared.ui.customviews.AutoResizeLightTextView
             tools:ignore="InconsistentLayout"
             android:id="@+id/tracking_time_label"
             android:layout_width="match_parent"
@@ -44,7 +44,7 @@
         android:layout_height="100dp"
         android:layout_alignParentBottom="true" >
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansButton
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
             android:id="@+id/stop_tracking"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
index 4dcb12b21db..46923fce6b7 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
@@ -16,7 +16,7 @@
         android:layout_height="wrap_content"
         android:background="@color/black" >
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/mode_label"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
@@ -28,7 +28,7 @@
             android:paddingRight="10dp"
             android:text="@string/tracking_mode" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/mode"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
             android:text="@string/tracking_mode_caching"
             android:textColor="@color/sap_green" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/tracking_unsent_fixes_label"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
@@ -51,7 +51,7 @@
             android:paddingLeft="10dp"
             android:text="@string/tracking_unsent_fixes" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/tracking_unsent_fixes"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
@@ -63,7 +63,7 @@
             android:paddingLeft="10dp"
             android:text="@string/none" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/tracking_status_label"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
@@ -73,7 +73,7 @@
             android:paddingRight="10dp"
             android:text="@string/tracking_status" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/tracking_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -95,7 +95,7 @@
             android:gravity="center_vertical"
             android:orientation="horizontal" >
 
-            <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                 android:id="@+id/gps_accuracy_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -103,7 +103,7 @@
                 android:paddingLeft="9dp"
                 android:text="" />
 
-            <com.sap.sailing.android.tracking.app.customviews.SignalQualityIndicatorView
+            <com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView
                 android:id="@+id/gps_quality_indicator"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -114,7 +114,7 @@
                 app:signalQuality="none" />
         </LinearLayout>
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
             android:id="@+id/gps_quality"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/pref_with_actionbar.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/pref_with_actionbar.xml
index 6f7137aefe9..c187560e91d 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/pref_with_actionbar.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/pref_with_actionbar.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-     <com.sap.sailing.android.tracking.app.customviews.OpenSansToolbar
+     <com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
@@ -17,7 +17,7 @@
             android:layout_height="match_parent"
             android:padding="10dp">
              
-            <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                 android:id="@+id/toolbar_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
                 android:singleLine="true"
                 android:textSize="16sp"/>
 
-            <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                 android:id="@+id/toolbar_subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
             
         </LinearLayout>
         
-    </com.sap.sailing.android.tracking.app.customviews.OpenSansToolbar>
+    </com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
     
     <View
     	android:id="@+id/top_bar"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
index 3dc8c672884..5ab7a7d5c20 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
@@ -22,7 +22,7 @@
         android:layout_marginEnd="10dp"
         android:textColor="@color/white" />
 
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
         android:id="@+id/regattaName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
index 5c1c6d8c02c..f43cf46f706 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
@@ -13,7 +13,7 @@
             android:layout_alignParentTop="true"
             android:background="@color/sap_yellow" />
 
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/top_bar"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/preferences.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/preferences.xml
index 066d27d82a9..8a745d5ad9d 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/preferences.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/preferences.xml
@@ -27,7 +27,6 @@
     <string name="preference_tracking_timer_started">trackingTimerStarted</string>
     <string name="preference_tracker_is_tracking">trackerIsTracking</string>
     <string name="preference_tracker_is_tracking_checkin_digest">trackerIsTrackingCheckinDigest</string>
-    <string name="preference_last_scanned_qr_code">lastScannedQRCode</string>
 
     <string name="preference_heading_with_declination_subtracted_is_enabled">On</string>
     <string name="preference_heading_with_declination_subtracted_is_disabled">Off</string>
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
index 1421ded7d6a..602998c3923 100755
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
@@ -25,16 +25,16 @@ import com.sap.sailing.android.tracking.app.R;
 import com.sap.sailing.android.tracking.app.ui.fragments.RegattaFragment;
 import com.sap.sailing.android.tracking.app.utils.CheckinManager;
 import com.sap.sailing.android.tracking.app.utils.DatabaseHelper;
-import com.sap.sailing.android.tracking.app.utils.NetworkHelper;
-import com.sap.sailing.android.tracking.app.utils.NetworkHelper.NetworkHelperError;
-import com.sap.sailing.android.tracking.app.utils.NetworkHelper.NetworkHelperFailureListener;
-import com.sap.sailing.android.tracking.app.utils.NetworkHelper.NetworkHelperSuccessListener;
-import com.sap.sailing.android.tracking.app.utils.UniqueDeviceUuid;
+import com.sap.sailing.android.shared.util.NetworkHelper;
+import com.sap.sailing.android.shared.util.NetworkHelper.NetworkHelperError;
+import com.sap.sailing.android.shared.util.NetworkHelper.NetworkHelperFailureListener;
+import com.sap.sailing.android.shared.util.NetworkHelper.NetworkHelperSuccessListener;
+import com.sap.sailing.android.shared.util.UniqueDeviceUuid;
 import com.sap.sailing.android.tracking.app.valueobjects.CheckinData;
 import com.sap.sailing.android.tracking.app.valueobjects.CheckinUrlInfo;
 import com.sap.sailing.android.tracking.app.valueobjects.CompetitorInfo;
 import com.sap.sailing.android.tracking.app.valueobjects.EventInfo;
-import com.sap.sailing.android.tracking.app.valueobjects.LeaderboardInfo;
+import com.sap.sailing.android.shared.data.LeaderboardInfo;
 
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
index eaf454aac43..e762cbe0a46 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
@@ -27,7 +27,7 @@ import com.sap.sailing.android.shared.data.http.HttpJsonPostRequest;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.tracking.app.BuildConfig;
 import com.sap.sailing.android.tracking.app.R;
-import com.sap.sailing.android.tracking.app.adapter.RegattaAdapter;
+import com.sap.sailing.android.shared.ui.adapters.RegattaAdapter;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract;
 import com.sap.sailing.android.tracking.app.ui.activities.RegattaActivity;
 import com.sap.sailing.android.tracking.app.ui.activities.StartActivity;
@@ -36,10 +36,10 @@ import com.sap.sailing.android.tracking.app.utils.CheckinHelper;
 import com.sap.sailing.android.tracking.app.utils.CheckinManager;
 import com.sap.sailing.android.tracking.app.utils.DatabaseHelper;
 import com.sap.sailing.android.tracking.app.utils.DatabaseHelper.GeneralDatabaseHelperException;
-import com.sap.sailing.android.tracking.app.utils.NetworkHelper;
-import com.sap.sailing.android.tracking.app.utils.NetworkHelper.NetworkHelperError;
-import com.sap.sailing.android.tracking.app.utils.NetworkHelper.NetworkHelperFailureListener;
-import com.sap.sailing.android.tracking.app.utils.NetworkHelper.NetworkHelperSuccessListener;
+import com.sap.sailing.android.shared.util.NetworkHelper;
+import com.sap.sailing.android.shared.util.NetworkHelper.NetworkHelperError;
+import com.sap.sailing.android.shared.util.NetworkHelper.NetworkHelperFailureListener;
+import com.sap.sailing.android.shared.util.NetworkHelper.NetworkHelperSuccessListener;
 import com.sap.sailing.android.tracking.app.valueobjects.CheckinData;
 
 import org.json.JSONException;
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/TrackingFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/TrackingFragment.java
index 77e33277588..6a3ff4c7049 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/TrackingFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/TrackingFragment.java
@@ -18,7 +18,7 @@ import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.services.sending.MessageSendingService.APIConnectivity;
 import com.sap.sailing.android.tracking.app.BuildConfig;
 import com.sap.sailing.android.tracking.app.R;
-import com.sap.sailing.android.tracking.app.customviews.SignalQualityIndicatorView;
+import com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView;
 import com.sap.sailing.android.tracking.app.services.TrackingService.GPSQuality;
 import com.sap.sailing.android.tracking.app.ui.activities.TrackingActivity;
 import com.sap.sailing.android.tracking.app.utils.AppPreferences;
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/preference/GeneralPreferenceFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/preference/GeneralPreferenceFragment.java
index 249cb001d88..7e3e592d563 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/preference/GeneralPreferenceFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/preference/GeneralPreferenceFragment.java
@@ -8,7 +8,7 @@ import android.preference.SwitchPreference;
 import com.sap.sailing.android.shared.ui.fragments.preference.BasePreferenceFragment;
 import com.sap.sailing.android.tracking.app.R;
 import com.sap.sailing.android.tracking.app.utils.AppPreferences;
-import com.sap.sailing.android.tracking.app.utils.UniqueDeviceUuid;
+import com.sap.sailing.android.shared.util.UniqueDeviceUuid;
 
 public class GeneralPreferenceFragment extends BasePreferenceFragment {
 	
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java
index 1fc261160a4..3726faae147 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java
@@ -1,33 +1,22 @@
 package com.sap.sailing.android.tracking.app.utils;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 
 import com.sap.sailing.android.shared.util.PrefUtils;
 import com.sap.sailing.android.tracking.app.R;
+import com.sap.sailing.android.shared.util.BaseAppPreferences;
 import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
 import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl;
 
-public class AppPreferences {
-    protected final Context context;
-    protected final SharedPreferences preferences;
-    public static final AbstractLogEventAuthor raceLogEventAuthor = new LogEventAuthorImpl("Tracking App", 0);
-    
-    public AppPreferences(Context context) {
-        this.context = context;
-        //multi process mode so that services read consistent values
-        this.preferences = context.getSharedPreferences(AppPreferences.class.getName(), Context.MODE_MULTI_PROCESS);
-    }
-    
-    public void setDeviceIdentifier(String deviceId)
-    {
-    	preferences.edit().putString(context.getString(R.string.preference_device_identifier_key), deviceId).commit();
+public class AppPreferences extends BaseAppPreferences {
+
+    public AppPreferences(Context context){
+        super(context);
     }
 
-    public String getDeviceIdentifier() {
-        return UniqueDeviceUuid.getUniqueId(context);
-    }
+    public static final AbstractLogEventAuthor raceLogEventAuthor = new LogEventAuthorImpl("Tracking App", 0);
     
+
     public String getServerUploadTeamImagePath() {
     	 return PrefUtils.getString(context, R.string.preference_server_team_image_upload_path, R.string.preference_server_team_image_upload_path);
     }
@@ -145,16 +134,6 @@ public class AppPreferences {
     	return false;
     }
     
-    public String getLastScannedQRCode()
-    {
-    	return preferences.getString(context.getString(R.string.preference_last_scanned_qr_code), null);
-    }
-    
-    public void setLastScannedQRCode(String lastQRCode)
-    {
-    	preferences.edit().putString(context.getString(R.string.preference_last_scanned_qr_code), lastQRCode).commit();
-    }
-    
     public void setMessageResendInterval(int interval)
     {
     	preferences.edit().putInt(context.getString(R.string.preference_messageResendIntervalMillis_key), interval).commit();
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinManager.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinManager.java
index ac55cab5245..f0166431234 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinManager.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinManager.java
@@ -7,6 +7,8 @@ import android.widget.Toast;
 
 import com.sap.sailing.android.shared.data.http.HttpGetRequest;
 import com.sap.sailing.android.shared.logging.ExLog;
+import com.sap.sailing.android.shared.util.NetworkHelper;
+import com.sap.sailing.android.shared.util.UniqueDeviceUuid;
 import com.sap.sailing.android.tracking.app.R;
 import com.sap.sailing.android.tracking.app.ui.activities.CheckinDataActivity;
 import com.sap.sailing.android.tracking.app.valueobjects.CheckinData;
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java
index 83455c8698f..54ad387bc05 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java
@@ -20,7 +20,7 @@ import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.CheckinUr
 import com.sap.sailing.android.tracking.app.valueobjects.CheckinUrlInfo;
 import com.sap.sailing.android.tracking.app.valueobjects.CompetitorInfo;
 import com.sap.sailing.android.tracking.app.valueobjects.EventInfo;
-import com.sap.sailing.android.tracking.app.valueobjects.LeaderboardInfo;
+import com.sap.sailing.android.shared.data.LeaderboardInfo;
 
 import java.util.ArrayList;
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java
index 10b81acc82e..3aeb9a78891 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java
@@ -1,5 +1,7 @@
 package com.sap.sailing.android.tracking.app.valueobjects;
 
+import com.sap.sailing.android.shared.data.LeaderboardInfo;
+
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;