diff --git a/androidservice/androidservice.pro b/androidservice/androidservice.pro
index 75b241f7..2f43ab8a 100644
--- a/androidservice/androidservice.pro
+++ b/androidservice/androidservice.pro
@@ -45,13 +45,13 @@ HEADERS += \
     ../nymea-app/platformintegration/android/platformhelperandroid.h \
 
 DISTFILES += \
-    ../packaging/android/src/io/guh/nymeaapp/Action.java \
-    ../packaging/android/src/io/guh/nymeaapp/NymeaAppControlService.java \
-    ../packaging/android/src/io/guh/nymeaapp/NymeaAppService.java \
-    ../packaging/android/src/io/guh/nymeaapp/NymeaAppControlsActivity.java \
-    ../packaging/android/src/io/guh/nymeaapp/NymeaAppServiceConnection.java \
-    ../packaging/android/src/io/guh/nymeaapp/Thing.java \
-    ../packaging/android/src/io/guh/nymeaapp/State.java \
-    ../packaging/android/src/io/guh/nymeaapp/NymeaHost.java \
+    ../nymea-app/platformintegration/android/io/guh/nymeaapp/Action.java \
+    ../nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppControlService.java \
+    ../nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppService.java \
+    ../nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppControlsActivity.java \
+    ../nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppServiceConnection.java \
+    ../nymea-app/platformintegration/android/io/guh/nymeaapp/Thing.java \
+    ../nymea-app/platformintegration/android/io/guh/nymeaapp/State.java \
+    ../nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaHost.java \
     controlviews/Main.qml
 
diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro
index de1b6d26..b9112280 100644
--- a/nymea-app/nymea-app.pro
+++ b/nymea-app/nymea-app.pro
@@ -51,8 +51,8 @@ win32 {
 }
 
 android {
-    !equals(STYLES_PATH, ""):!equals(BRANDING, "") {
-        ANDROID_PACKAGE_SOURCE_DIR = $${STYLES_PATH}/packaging/android_$$BRANDING
+    !equals(OVERLAY_PATH, ""):!equals(BRANDING, "") {
+        ANDROID_PACKAGE_SOURCE_DIR = $${OVERLAY_PATH}/packaging/android_$$BRANDING
     } else {
         ANDROID_PACKAGE_SOURCE_DIR = $${top_srcdir}/packaging/android
     }
@@ -75,6 +75,10 @@ android {
     HEADERS += platformintegration/android/platformhelperandroid.h
     SOURCES += platformintegration/android/platformhelperandroid.cpp
 
+    javafiles.commands = $(COPY_DIR) $${PWD}/platformintegration/android/io $${ANDROID_PACKAGE_SOURCE_DIR}/src
+    QMAKE_EXTRA_TARGETS += javafiles
+    POST_TARGETDEPS += javafiles
+
     DISTFILES += \
         $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml \
         $$ANDROID_PACKAGE_SOURCE_DIR/google-services.json \
@@ -84,14 +88,12 @@ android {
         $$ANDROID_PACKAGE_SOURCE_DIR/build.gradle \
         $$ANDROID_PACKAGE_SOURCE_DIR/gradle/wrapper/gradle-wrapper.properties \
         $$ANDROID_PACKAGE_SOURCE_DIR/gradlew.bat \
-        $$ANDROID_PACKAGE_SOURCE_DIR/src/io/guh/nymeaapp/NymeaAppActivity.java \
-        $$ANDROID_PACKAGE_SOURCE_DIR/src/io/guh/nymeaapp/NymeaAppNotificationService.java \
-        $$ANDROID_PACKAGE_SOURCE_DIR/LICENSE
+        $$ANDROID_PACKAGE_SOURCE_DIR/LICENSE \
+        platformintegration/android/io/guh/nymeaapp/NymeaAppActivity.java \
+        platformintegration/android/io/guh/nymeaapp/NymeaAppNotificationService.java \
 
     # https://bugreports.qt.io/browse/QTBUG-83165
     LIBS += -L$${top_builddir}/libnymea-app/$${ANDROID_TARGET_ARCH}
-
-    ANDROID_ABIS = armeabi-v7a arm64-v8a
 }
 
 macx: {
diff --git a/packaging/android/src/io/guh/nymeaapp/Action.java b/nymea-app/platformintegration/android/io/guh/nymeaapp/Action.java
similarity index 100%
rename from packaging/android/src/io/guh/nymeaapp/Action.java
rename to nymea-app/platformintegration/android/io/guh/nymeaapp/Action.java
diff --git a/packaging/android/src/io/guh/nymeaapp/NymeaAppActivity.java b/nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppActivity.java
similarity index 100%
rename from packaging/android/src/io/guh/nymeaapp/NymeaAppActivity.java
rename to nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppActivity.java
diff --git a/packaging/android/src/io/guh/nymeaapp/NymeaAppControlService.java b/nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppControlService.java
similarity index 100%
rename from packaging/android/src/io/guh/nymeaapp/NymeaAppControlService.java
rename to nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppControlService.java
diff --git a/packaging/android/src/io/guh/nymeaapp/NymeaAppControlsActivity.java b/nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppControlsActivity.java
similarity index 100%
rename from packaging/android/src/io/guh/nymeaapp/NymeaAppControlsActivity.java
rename to nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppControlsActivity.java
diff --git a/packaging/android/src/io/guh/nymeaapp/NymeaAppNotificationService.java b/nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppNotificationService.java
similarity index 98%
rename from packaging/android/src/io/guh/nymeaapp/NymeaAppNotificationService.java
rename to nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppNotificationService.java
index 5b8d2da3..aaa433c7 100644
--- a/packaging/android/src/io/guh/nymeaapp/NymeaAppNotificationService.java
+++ b/nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppNotificationService.java
@@ -18,6 +18,8 @@ import android.support.v4.app.NotificationCompat;
 
 import java.util.Random;
 
+import R;
+
 public class NymeaAppNotificationService extends FirebaseMessagingService {
 
 
@@ -48,6 +50,7 @@ public class NymeaAppNotificationService extends FirebaseMessagingService {
 //        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0 /* Request code */, intent, PendingIntent.FLAG_ONE_SHOT);
         PendingIntent pendingIntent = PendingIntent.getActivity(this, 0 /* Request code */, intent, 0);
 
+        Resources r = Context.getResources();
         NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, "notify_001")
                 .setSmallIcon(R.drawable.ic_stat_notificationicon)
                 .setColor(0xFF57BAAE)
diff --git a/packaging/android/src/io/guh/nymeaapp/NymeaAppService.java b/nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppService.java
similarity index 100%
rename from packaging/android/src/io/guh/nymeaapp/NymeaAppService.java
rename to nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppService.java
diff --git a/packaging/android/src/io/guh/nymeaapp/NymeaAppServiceConnection.java b/nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppServiceConnection.java
similarity index 100%
rename from packaging/android/src/io/guh/nymeaapp/NymeaAppServiceConnection.java
rename to nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppServiceConnection.java
diff --git a/packaging/android/src/io/guh/nymeaapp/NymeaHost.java b/nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaHost.java
similarity index 100%
rename from packaging/android/src/io/guh/nymeaapp/NymeaHost.java
rename to nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaHost.java
diff --git a/packaging/android/src/io/guh/nymeaapp/State.java b/nymea-app/platformintegration/android/io/guh/nymeaapp/State.java
similarity index 100%
rename from packaging/android/src/io/guh/nymeaapp/State.java
rename to nymea-app/platformintegration/android/io/guh/nymeaapp/State.java
diff --git a/packaging/android/src/io/guh/nymeaapp/Thing.java b/nymea-app/platformintegration/android/io/guh/nymeaapp/Thing.java
similarity index 100%
rename from packaging/android/src/io/guh/nymeaapp/Thing.java
rename to nymea-app/platformintegration/android/io/guh/nymeaapp/Thing.java