diff --git a/android/app/BUCK b/android/app/BUCK
index 474d72ac4..5c8b6508c 100644
--- a/android/app/BUCK
+++ b/android/app/BUCK
@@ -35,12 +35,12 @@ android_library(
 
 android_build_config(
     name = "build_config",
-    package = "app.esteem.mobile",
+    package = "app.esteem.mobile.android",
 )
 
 android_resource(
     name = "res",
-    package = "app.esteem.mobile",
+    package = "app.esteem.mobile.android",
     res = "src/main/res",
 )
 
diff --git a/android/app/build.gradle b/android/app/build.gradle
index b78e8a6fb..71c24fdde 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -110,7 +110,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "app.esteem.mobile"
+        applicationId "app.esteem.mobile.android"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 61a5127e8..1e9001dae 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="app.esteem.mobile">
+    package="app.esteem.mobile.android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA"/>
diff --git a/android/app/src/main/java/app/esteem/mobile/MainActivity.java b/android/app/src/main/java/app/esteem/mobile/android/MainActivity.java
similarity index 90%
rename from android/app/src/main/java/app/esteem/mobile/MainActivity.java
rename to android/app/src/main/java/app/esteem/mobile/android/MainActivity.java
index 513a3d967..162a30cb5 100644
--- a/android/app/src/main/java/app/esteem/mobile/MainActivity.java
+++ b/android/app/src/main/java/app/esteem/mobile/android/MainActivity.java
@@ -1,4 +1,4 @@
-package app.esteem.mobile;
+package app.esteem.mobile.android;
 
 import com.facebook.react.ReactActivity;
 
diff --git a/android/app/src/main/java/app/esteem/mobile/MainApplication.java b/android/app/src/main/java/app/esteem/mobile/android/MainApplication.java
similarity index 98%
rename from android/app/src/main/java/app/esteem/mobile/MainApplication.java
rename to android/app/src/main/java/app/esteem/mobile/android/MainApplication.java
index 8f5fefed9..e8cf916db 100644
--- a/android/app/src/main/java/app/esteem/mobile/MainApplication.java
+++ b/android/app/src/main/java/app/esteem/mobile/android/MainApplication.java
@@ -1,4 +1,4 @@
-package app.esteem.mobile;
+package app.esteem.mobile.android;
 
 import android.app.Application;