diff --git a/.gitignore b/.gitignore
index e3bdbed..5d8b128 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@
 .externalNativeBuild
 .cxx
 local.properties
-/app/build
+/platypush/build
+/app/release
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0ce317c..c7a0ad1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="tech.platypush.app">
+    package="tech.platypush.platypush">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
@@ -13,7 +13,7 @@
         android:theme="@style/Theme.Platypush"
         android:usesCleartextTraffic="true">
         <activity
-            android:name=".MainActivity"
+            android:name="tech.platypush.platypush.MainActivity"
             android:label="@string/app_name"
             android:theme="@style/Theme.Platypush.NoActionBar">
             <intent-filter>
diff --git a/app/src/main/java/tech/platypush/app/JSON.kt b/app/src/main/java/tech/platypush/platypush/JSON.kt
similarity index 97%
rename from app/src/main/java/tech/platypush/app/JSON.kt
rename to app/src/main/java/tech/platypush/platypush/JSON.kt
index bbd1d32..0457fbd 100644
--- a/app/src/main/java/tech/platypush/app/JSON.kt
+++ b/app/src/main/java/tech/platypush/platypush/JSON.kt
@@ -1,4 +1,4 @@
-package tech.platypush.app
+package tech.platypush.platypush
 
 import org.json.JSONArray
 import org.json.JSONObject
diff --git a/app/src/main/java/tech/platypush/app/MainActivity.kt b/app/src/main/java/tech/platypush/platypush/MainActivity.kt
similarity index 96%
rename from app/src/main/java/tech/platypush/app/MainActivity.kt
rename to app/src/main/java/tech/platypush/platypush/MainActivity.kt
index 96852a8..01ad9cb 100644
--- a/app/src/main/java/tech/platypush/app/MainActivity.kt
+++ b/app/src/main/java/tech/platypush/platypush/MainActivity.kt
@@ -1,4 +1,4 @@
-package tech.platypush.app
+package tech.platypush.platypush
 
 import android.annotation.SuppressLint
 import android.os.Bundle
diff --git a/app/src/main/java/tech/platypush/app/Services.kt b/app/src/main/java/tech/platypush/platypush/Services.kt
similarity index 99%
rename from app/src/main/java/tech/platypush/app/Services.kt
rename to app/src/main/java/tech/platypush/platypush/Services.kt
index e3884ce..257e9be 100644
--- a/app/src/main/java/tech/platypush/app/Services.kt
+++ b/app/src/main/java/tech/platypush/platypush/Services.kt
@@ -1,4 +1,4 @@
-package tech.platypush.app
+package tech.platypush.platypush
 
 import android.content.ContentValues.TAG
 import android.content.Context
diff --git a/app/src/main/java/tech/platypush/app/WebAppInterface.kt b/app/src/main/java/tech/platypush/platypush/WebAppInterface.kt
similarity index 98%
rename from app/src/main/java/tech/platypush/app/WebAppInterface.kt
rename to app/src/main/java/tech/platypush/platypush/WebAppInterface.kt
index fb63a49..8298335 100644
--- a/app/src/main/java/tech/platypush/app/WebAppInterface.kt
+++ b/app/src/main/java/tech/platypush/platypush/WebAppInterface.kt
@@ -1,4 +1,4 @@
-package tech.platypush.app
+package tech.platypush.platypush
 
 import android.content.ContentValues.TAG
 import android.content.Context
diff --git a/app/src/main/java/tech/platypush/app/WebView.kt b/app/src/main/java/tech/platypush/platypush/WebView.kt
similarity index 96%
rename from app/src/main/java/tech/platypush/app/WebView.kt
rename to app/src/main/java/tech/platypush/platypush/WebView.kt
index 975ee03..d60e130 100644
--- a/app/src/main/java/tech/platypush/app/WebView.kt
+++ b/app/src/main/java/tech/platypush/platypush/WebView.kt
@@ -1,4 +1,4 @@
-package tech.platypush.app
+package tech.platypush.platypush
 
 import android.webkit.WebResourceRequest
 import android.webkit.WebView