diff --git a/.gitignore b/.gitignore
index a593bc294..39da0b873 100644
--- a/.gitignore
+++ b/.gitignore
@@ -154,7 +154,7 @@ Ankh.NoLoad
 Examples/testapp_rn
 
 # Android debug build files (conflict ignoring #Visual Studio files)
-!android/app/src/debug/
+!android/src/debug/
 
 # prevent CLI code ignored (ignored by "[Rr]elease*/")
 !cli/commands/releaseCommand/
diff --git a/android/app/build.gradle b/android/app/build.gradle
deleted file mode 100644
index efb68e82f..000000000
--- a/android/app/build.gradle
+++ /dev/null
@@ -1,58 +0,0 @@
-apply plugin: "com.android.library"
-apply plugin: "com.facebook.react"
-
-def DEFAULT_COMPILE_SDK_VERSION = 26
-def DEFAULT_BUILD_TOOLS_VERSION = "26.0.3"
-def DEFAULT_TARGET_SDK_VERSION = 26
-def DEFAULT_MIN_SDK_VERSION = 16
-
-react {
-    jsRootDir = file("../..")
-    libraryName = "RNCodePushSpec"
-    codegenJavaPackageName = "com.microsoft.codepush.react"
-}
-
-android {
-    namespace "com.microsoft.codepush.react"
-
-    compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
-    buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
-
-    defaultConfig {
-        minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
-        targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
-        versionCode 1
-        versionName "1.0"
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-
-    defaultConfig {
-        consumerProguardFiles 'proguard-rules.pro'
-    }
-
-    // Builds the binary patch applier. Its sources are the shared ones at the root of the
-    // repository, which the CMake file points at; nothing is compiled twice.
-    externalNativeBuild {
-        cmake {
-            path "src/main/cpp/CMakeLists.txt"
-        }
-    }
-
-    testOptions {
-        // The unit tests exercise plain logic, so the android framework classes they touch
-        // in passing (logging above all) are allowed to do nothing instead of throwing.
-        unitTests.returnDefaultValues = true
-    }
-}
-
-dependencies {
-    implementation "com.facebook.react:react-native:+"
-
-    testImplementation "junit:junit:4.13.2"
-    // org.json ships as stubs in the android framework jar, and the unit tests parse real
-    // manifests, so they need an implementation that actually parses.
-    testImplementation "org.json:json:20231013"
-}
diff --git a/android/build.gradle b/android/build.gradle
index 31a524838..60f24dca3 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,24 +1,58 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+apply plugin: "com.android.library"
+apply plugin: "com.facebook.react"
 
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
+def DEFAULT_COMPILE_SDK_VERSION = 26
+def DEFAULT_BUILD_TOOLS_VERSION = "26.0.3"
+def DEFAULT_TARGET_SDK_VERSION = 26
+def DEFAULT_MIN_SDK_VERSION = 16
+
+react {
+    jsRootDir = file("..")
+    libraryName = "RNCodePushSpec"
+    codegenJavaPackageName = "com.microsoft.codepush.react"
+}
+
+android {
+    namespace "com.microsoft.codepush.react"
+
+    compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
+    buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
+
+    defaultConfig {
+        minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
+        targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
+        versionCode 1
+        versionName "1.0"
     }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
 
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+    lintOptions {
+        abortOnError false
     }
-}
 
-allprojects {
-    android {
-        namespace "com.microsoft.codepush.react"
+    defaultConfig {
+        consumerProguardFiles 'proguard-rules.pro'
     }
-    repositories {
-        mavenLocal()
-        mavenCentral()
+
+    // Builds the binary patch applier. Its sources are the shared ones at the root of the
+    // repository, which the CMake file points at; nothing is compiled twice.
+    externalNativeBuild {
+        cmake {
+            path "src/main/cpp/CMakeLists.txt"
+        }
+    }
+
+    testOptions {
+        // The unit tests exercise plain logic, so the android framework classes they touch
+        // in passing (logging above all) are allowed to do nothing instead of throwing.
+        unitTests.returnDefaultValues = true
     }
 }
+
+dependencies {
+    implementation "com.facebook.react:react-native:+"
+
+    testImplementation "junit:junit:4.13.2"
+    // org.json ships as stubs in the android framework jar, and the unit tests parse real
+    // manifests, so they need an implementation that actually parses.
+    testImplementation "org.json:json:20231013"
+}
diff --git a/android/gradle.properties b/android/gradle.properties
deleted file mode 100644
index 1fd964e90..000000000
--- a/android/gradle.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-
-android.useDeprecatedNdk=true
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index b5166dad4..000000000
Binary files a/android/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index b9fbfaba0..000000000
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
diff --git a/android/gradlew b/android/gradlew
deleted file mode 100755
index 91a7e269e..000000000
--- a/android/gradlew
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/android/gradlew.bat b/android/gradlew.bat
deleted file mode 100644
index aec99730b..000000000
--- a/android/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/android/app/proguard-rules.pro b/android/proguard-rules.pro
similarity index 100%
rename from android/app/proguard-rules.pro
rename to android/proguard-rules.pro
diff --git a/android/settings.gradle b/android/settings.gradle
deleted file mode 100644
index 9d495b34f..000000000
--- a/android/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':app'
\ No newline at end of file
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/src/debug/AndroidManifest.xml
similarity index 100%
rename from android/app/src/debug/AndroidManifest.xml
rename to android/src/debug/AndroidManifest.xml
diff --git a/android/app/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
similarity index 100%
rename from android/app/src/main/AndroidManifest.xml
rename to android/src/main/AndroidManifest.xml
diff --git a/android/app/src/main/cpp/CMakeLists.txt b/android/src/main/cpp/CMakeLists.txt
similarity index 95%
rename from android/app/src/main/cpp/CMakeLists.txt
rename to android/src/main/cpp/CMakeLists.txt
index eedf2efeb..978fe8842 100644
--- a/android/app/src/main/cpp/CMakeLists.txt
+++ b/android/src/main/cpp/CMakeLists.txt
@@ -6,7 +6,7 @@ project(codepush-binarypatch C)
 # the other platform compile the very same files. Referencing them where they are is
 # what keeps the appliers of the platforms from drifting apart, so they are deliberately
 # not copied into this directory.
-set(BINARY_PATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../cpp/binarypatch)
+set(BINARY_PATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../cpp/binarypatch)
 
 add_library(codepush-binarypatch SHARED
         ${CMAKE_CURRENT_SOURCE_DIR}/binarypatch_jni.c
diff --git a/android/app/src/main/cpp/binarypatch_jni.c b/android/src/main/cpp/binarypatch_jni.c
similarity index 100%
rename from android/app/src/main/cpp/binarypatch_jni.c
rename to android/src/main/cpp/binarypatch_jni.c
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/ArchiveAttemptLog.java b/android/src/main/java/com/microsoft/codepush/react/ArchiveAttemptLog.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/ArchiveAttemptLog.java
rename to android/src/main/java/com/microsoft/codepush/react/ArchiveAttemptLog.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/ArchiveRestoreResult.java b/android/src/main/java/com/microsoft/codepush/react/ArchiveRestoreResult.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/ArchiveRestoreResult.java
rename to android/src/main/java/com/microsoft/codepush/react/ArchiveRestoreResult.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java b/android/src/main/java/com/microsoft/codepush/react/CodePush.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePush.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePush.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushBinaryPatch.java b/android/src/main/java/com/microsoft/codepush/react/CodePushBinaryPatch.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushBinaryPatch.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushBinaryPatch.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushConstants.java b/android/src/main/java/com/microsoft/codepush/react/CodePushConstants.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushConstants.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushConstants.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushErrorCode.java b/android/src/main/java/com/microsoft/codepush/react/CodePushErrorCode.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushErrorCode.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushErrorCode.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushHttpException.java b/android/src/main/java/com/microsoft/codepush/react/CodePushHttpException.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushHttpException.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushHttpException.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushIncompleteDownloadException.java b/android/src/main/java/com/microsoft/codepush/react/CodePushIncompleteDownloadException.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushIncompleteDownloadException.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushIncompleteDownloadException.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushInstallMode.java b/android/src/main/java/com/microsoft/codepush/react/CodePushInstallMode.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushInstallMode.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushInstallMode.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushInvalidUpdateException.java b/android/src/main/java/com/microsoft/codepush/react/CodePushInvalidUpdateException.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushInvalidUpdateException.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushInvalidUpdateException.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushMalformedDataException.java b/android/src/main/java/com/microsoft/codepush/react/CodePushMalformedDataException.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushMalformedDataException.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushMalformedDataException.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java b/android/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushNotInitializedException.java b/android/src/main/java/com/microsoft/codepush/react/CodePushNotInitializedException.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushNotInitializedException.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushNotInitializedException.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushTelemetryManager.java b/android/src/main/java/com/microsoft/codepush/react/CodePushTelemetryManager.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushTelemetryManager.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushTelemetryManager.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushUnknownException.java b/android/src/main/java/com/microsoft/codepush/react/CodePushUnknownException.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushUnknownException.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushUnknownException.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateManager.java b/android/src/main/java/com/microsoft/codepush/react/CodePushUpdateManager.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateManager.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushUpdateManager.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateState.java b/android/src/main/java/com/microsoft/codepush/react/CodePushUpdateState.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateState.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushUpdateState.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java b/android/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushUtils.java b/android/src/main/java/com/microsoft/codepush/react/CodePushUtils.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/CodePushUtils.java
rename to android/src/main/java/com/microsoft/codepush/react/CodePushUtils.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/DownloadProgress.java b/android/src/main/java/com/microsoft/codepush/react/DownloadProgress.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/DownloadProgress.java
rename to android/src/main/java/com/microsoft/codepush/react/DownloadProgress.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/DownloadProgressCallback.java b/android/src/main/java/com/microsoft/codepush/react/DownloadProgressCallback.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/DownloadProgressCallback.java
rename to android/src/main/java/com/microsoft/codepush/react/DownloadProgressCallback.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/DownloadProgressEventDispatcher.java b/android/src/main/java/com/microsoft/codepush/react/DownloadProgressEventDispatcher.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/DownloadProgressEventDispatcher.java
rename to android/src/main/java/com/microsoft/codepush/react/DownloadProgressEventDispatcher.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java b/android/src/main/java/com/microsoft/codepush/react/FileUtils.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java
rename to android/src/main/java/com/microsoft/codepush/react/FileUtils.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/HDiffPatchNative.java b/android/src/main/java/com/microsoft/codepush/react/HDiffPatchNative.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/HDiffPatchNative.java
rename to android/src/main/java/com/microsoft/codepush/react/HDiffPatchNative.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/SettingsManager.java b/android/src/main/java/com/microsoft/codepush/react/SettingsManager.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/SettingsManager.java
rename to android/src/main/java/com/microsoft/codepush/react/SettingsManager.java
diff --git a/android/app/src/main/java/com/microsoft/codepush/react/TLSSocketFactory.java b/android/src/main/java/com/microsoft/codepush/react/TLSSocketFactory.java
similarity index 100%
rename from android/app/src/main/java/com/microsoft/codepush/react/TLSSocketFactory.java
rename to android/src/main/java/com/microsoft/codepush/react/TLSSocketFactory.java
diff --git a/android/app/src/test/java/com/microsoft/codepush/react/CodePushBinaryPatchTest.java b/android/src/test/java/com/microsoft/codepush/react/CodePushBinaryPatchTest.java
similarity index 100%
rename from android/app/src/test/java/com/microsoft/codepush/react/CodePushBinaryPatchTest.java
rename to android/src/test/java/com/microsoft/codepush/react/CodePushBinaryPatchTest.java
diff --git a/android/app/src/test/java/com/microsoft/codepush/react/CodePushErrorCodeTest.java b/android/src/test/java/com/microsoft/codepush/react/CodePushErrorCodeTest.java
similarity index 100%
rename from android/app/src/test/java/com/microsoft/codepush/react/CodePushErrorCodeTest.java
rename to android/src/test/java/com/microsoft/codepush/react/CodePushErrorCodeTest.java
diff --git a/android/app/src/test/java/com/microsoft/codepush/react/CodePushUpdateManagerBinaryPatchTest.java b/android/src/test/java/com/microsoft/codepush/react/CodePushUpdateManagerBinaryPatchTest.java
similarity index 100%
rename from android/app/src/test/java/com/microsoft/codepush/react/CodePushUpdateManagerBinaryPatchTest.java
rename to android/src/test/java/com/microsoft/codepush/react/CodePushUpdateManagerBinaryPatchTest.java
diff --git a/android/app/src/test/java/com/microsoft/codepush/react/CodePushUpdateManagerDownloadTest.java b/android/src/test/java/com/microsoft/codepush/react/CodePushUpdateManagerDownloadTest.java
similarity index 100%
rename from android/app/src/test/java/com/microsoft/codepush/react/CodePushUpdateManagerDownloadTest.java
rename to android/src/test/java/com/microsoft/codepush/react/CodePushUpdateManagerDownloadTest.java
diff --git a/android/app/src/test/java/com/microsoft/codepush/react/DownloadProgressEventDispatcherTest.java b/android/src/test/java/com/microsoft/codepush/react/DownloadProgressEventDispatcherTest.java
similarity index 100%
rename from android/app/src/test/java/com/microsoft/codepush/react/DownloadProgressEventDispatcherTest.java
rename to android/src/test/java/com/microsoft/codepush/react/DownloadProgressEventDispatcherTest.java
diff --git a/package.json b/package.json
index e6974687f..49a6d52a0 100644
--- a/package.json
+++ b/package.json
@@ -58,10 +58,6 @@
     "!ios/build",
     "!ios/CodePushTests",
     "!android/build",
-    "!android/app/build",
-    "!android/gradle",
-    "!android/gradlew",
-    "!android/gradlew.bat",
     "!android/local.properties",
     "!cpp/binarypatch/host",
     "!**/__tests__",
diff --git a/react-native.config.js b/react-native.config.js
index 81f9bd45a..1ad773b2c 100644
--- a/react-native.config.js
+++ b/react-native.config.js
@@ -5,7 +5,7 @@ module.exports = {
                 packageImportPath: "import com.microsoft.codepush.react.CodePush;",
                 packageInstance:
                     "CodePush.getInstance(getApplicationContext(), BuildConfig.DEBUG)",
-                sourceDir: './android/app',
+                sourceDir: './android',
                 libraryName: 'RNCodePushSpec',
                 cmakeListsPath: 'build/generated/source/codegen/jni/CMakeLists.txt',
             }