diff --git a/2015/android/Geofence/app/src/main/AndroidManifest.xml b/2015/android/Geofence/app/src/main/AndroidManifest.xml
index d0e2fa3..c84fdfd 100644
--- a/2015/android/Geofence/app/src/main/AndroidManifest.xml
+++ b/2015/android/Geofence/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name">
         <service
-            android:name=".MyService"
+            android:name="com.esrlabs.geofence.MyService"
             android:enabled="true"
             android:exported="true" >
         </service>
diff --git a/2015/android/Geofence/app/src/main/java/esrlabs/com/geofence/MyService.java b/2015/android/Geofence/app/src/main/java/com/esrlabs/geofence/MyService.java
similarity index 98%
rename from 2015/android/Geofence/app/src/main/java/esrlabs/com/geofence/MyService.java
rename to 2015/android/Geofence/app/src/main/java/com/esrlabs/geofence/MyService.java
index c790346..3c221e3 100644
--- a/2015/android/Geofence/app/src/main/java/esrlabs/com/geofence/MyService.java
+++ b/2015/android/Geofence/app/src/main/java/com/esrlabs/geofence/MyService.java
@@ -1,4 +1,4 @@
-package esrlabs.com.geofence;
+package com.esrlabs.geofence;
 
 import android.app.Service;
 import android.content.Context;
diff --git a/2015/android/Geofence/app/src/test/java/esrlabs.com.geofence/MyServiceTest.java b/2015/android/Geofence/app/src/test/java/com/esrlabs/geofence/MyServiceTest.java
similarity index 92%
rename from 2015/android/Geofence/app/src/test/java/esrlabs.com.geofence/MyServiceTest.java
rename to 2015/android/Geofence/app/src/test/java/com/esrlabs/geofence/MyServiceTest.java
index c70e331..dacf07b 100644
--- a/2015/android/Geofence/app/src/test/java/esrlabs.com.geofence/MyServiceTest.java
+++ b/2015/android/Geofence/app/src/test/java/com/esrlabs/geofence/MyServiceTest.java
@@ -1,12 +1,14 @@
-package esrlabs.com.geofence;
+package com.esrlabs.geofence;
 
-import static esrlabs.com.geofence.MyService.CAN_PROVIDER;
+import static com.esrlabs.geofence.MyService.CAN_PROVIDER;
 
 import android.content.Context;
 import android.location.Location;
 import android.location.LocationManager;
 import android.test.ServiceTestCase;
 
+import com.esrlabs.geofence.MyService;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -17,6 +19,8 @@ import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLocationManager;
 
+import esrlabs.com.geofence.BuildConfig;
+
 
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(constants = BuildConfig.class, emulateSdk = 17)