diff --git a/.gitignore b/.gitignore
index c4a6bf0f..6d847cab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+.idea/
+*.iml
+local.properties
 .DS_STORE
 
 /buck-cache/
diff --git a/android/sample/BUCK b/android/sample/BUCK
index 0989fcd6..f248059e 100644
--- a/android/sample/BUCK
+++ b/android/sample/BUCK
@@ -10,7 +10,7 @@ load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_RES_TARGET", "ANDROID_SAMP
 yoga_android_binary(
     name = "sample",
     keystore = ":debug_keystore",
-    manifest = "AndroidManifest.xml",
+    manifest = "src/main/AndroidManifest.xml",
     deps = [
         ANDROID_SAMPLE_JAVA_TARGET,
         ANDROID_SAMPLE_RES_TARGET,
diff --git a/android/sample/build.gradle b/android/sample/build.gradle
new file mode 100644
index 00000000..cffb4165
--- /dev/null
+++ b/android/sample/build.gradle
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
+
+    defaultConfig {
+        applicationId "com.facebook.samples.yoga"
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
+    }
+
+    compileOptions {
+        targetCompatibility rootProject.targetCompatibilityVersion
+        sourceCompatibility rootProject.sourceCompatibilityVersion
+    }
+}
+
+dependencies {
+  implementation project(':yoga-layout')
+  implementation "com.android.support:appcompat-v7:28.0.0"
+  implementation "com.facebook.soloader:soloader:0.6.0"
+}
diff --git a/android/sample/AndroidManifest.xml b/android/sample/src/main/AndroidManifest.xml
similarity index 85%
rename from android/sample/AndroidManifest.xml
rename to android/sample/src/main/AndroidManifest.xml
index a47e1e0d..3775d73f 100644
--- a/android/sample/AndroidManifest.xml
+++ b/android/sample/src/main/AndroidManifest.xml
@@ -14,14 +14,6 @@
           android:versionName="1.0"
           >
 
-  <variable name="applicationId" value="com.facebook.yoga"/>
-  <variable name="app_label" value="Yoga Sample App"/>
-
-  <uses-sdk
-    android:minSdkVersion="15"
-    android:targetSdkVersion="19"
-    />
-
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
   <application
diff --git a/android/sample/java/com/facebook/samples/yoga/BUCK b/android/sample/src/main/java/com/facebook/samples/yoga/BUCK
similarity index 100%
rename from android/sample/java/com/facebook/samples/yoga/BUCK
rename to android/sample/src/main/java/com/facebook/samples/yoga/BUCK
diff --git a/android/sample/java/com/facebook/samples/yoga/BenchmarkActivity.java b/android/sample/src/main/java/com/facebook/samples/yoga/BenchmarkActivity.java
similarity index 100%
rename from android/sample/java/com/facebook/samples/yoga/BenchmarkActivity.java
rename to android/sample/src/main/java/com/facebook/samples/yoga/BenchmarkActivity.java
diff --git a/android/sample/java/com/facebook/samples/yoga/BenchmarkAggregator.java b/android/sample/src/main/java/com/facebook/samples/yoga/BenchmarkAggregator.java
similarity index 100%
rename from android/sample/java/com/facebook/samples/yoga/BenchmarkAggregator.java
rename to android/sample/src/main/java/com/facebook/samples/yoga/BenchmarkAggregator.java
diff --git a/android/sample/java/com/facebook/samples/yoga/BenchmarkFragment.java b/android/sample/src/main/java/com/facebook/samples/yoga/BenchmarkFragment.java
similarity index 100%
rename from android/sample/java/com/facebook/samples/yoga/BenchmarkFragment.java
rename to android/sample/src/main/java/com/facebook/samples/yoga/BenchmarkFragment.java
diff --git a/android/sample/java/com/facebook/samples/yoga/BenchmarkInflate.java b/android/sample/src/main/java/com/facebook/samples/yoga/BenchmarkInflate.java
similarity index 100%
rename from android/sample/java/com/facebook/samples/yoga/BenchmarkInflate.java
rename to android/sample/src/main/java/com/facebook/samples/yoga/BenchmarkInflate.java
diff --git a/android/sample/java/com/facebook/samples/yoga/BenchmarkLayout.java b/android/sample/src/main/java/com/facebook/samples/yoga/BenchmarkLayout.java
similarity index 100%
rename from android/sample/java/com/facebook/samples/yoga/BenchmarkLayout.java
rename to android/sample/src/main/java/com/facebook/samples/yoga/BenchmarkLayout.java
diff --git a/android/sample/java/com/facebook/samples/yoga/BenchmarkMeasure.java b/android/sample/src/main/java/com/facebook/samples/yoga/BenchmarkMeasure.java
similarity index 100%
rename from android/sample/java/com/facebook/samples/yoga/BenchmarkMeasure.java
rename to android/sample/src/main/java/com/facebook/samples/yoga/BenchmarkMeasure.java
diff --git a/android/sample/java/com/facebook/samples/yoga/MainActivity.java b/android/sample/src/main/java/com/facebook/samples/yoga/MainActivity.java
similarity index 100%
rename from android/sample/java/com/facebook/samples/yoga/MainActivity.java
rename to android/sample/src/main/java/com/facebook/samples/yoga/MainActivity.java
diff --git a/android/sample/res/drawable/action_bar_background.xml b/android/sample/src/main/res/drawable/action_bar_background.xml
similarity index 100%
rename from android/sample/res/drawable/action_bar_background.xml
rename to android/sample/src/main/res/drawable/action_bar_background.xml
diff --git a/android/sample/res/drawable/ic_launcher.png b/android/sample/src/main/res/drawable/ic_launcher.png
similarity index 100%
rename from android/sample/res/drawable/ic_launcher.png
rename to android/sample/src/main/res/drawable/ic_launcher.png
diff --git a/android/sample/res/drawable/sample_children_background.xml b/android/sample/src/main/res/drawable/sample_children_background.xml
similarity index 100%
rename from android/sample/res/drawable/sample_children_background.xml
rename to android/sample/src/main/res/drawable/sample_children_background.xml
diff --git a/android/sample/res/layout/benchmark_fragment.xml b/android/sample/src/main/res/layout/benchmark_fragment.xml
similarity index 100%
rename from android/sample/res/layout/benchmark_fragment.xml
rename to android/sample/src/main/res/layout/benchmark_fragment.xml
diff --git a/android/sample/res/layout/benchmark_layout_1.xml b/android/sample/src/main/res/layout/benchmark_layout_1.xml
similarity index 100%
rename from android/sample/res/layout/benchmark_layout_1.xml
rename to android/sample/src/main/res/layout/benchmark_layout_1.xml
diff --git a/android/sample/res/layout/benchmark_layout_1_linear.xml b/android/sample/src/main/res/layout/benchmark_layout_1_linear.xml
similarity index 100%
rename from android/sample/res/layout/benchmark_layout_1_linear.xml
rename to android/sample/src/main/res/layout/benchmark_layout_1_linear.xml
diff --git a/android/sample/res/layout/benchmark_layout_2.xml b/android/sample/src/main/res/layout/benchmark_layout_2.xml
similarity index 100%
rename from android/sample/res/layout/benchmark_layout_2.xml
rename to android/sample/src/main/res/layout/benchmark_layout_2.xml
diff --git a/android/sample/res/layout/benchmark_layout_2_linear.xml b/android/sample/src/main/res/layout/benchmark_layout_2_linear.xml
similarity index 100%
rename from android/sample/res/layout/benchmark_layout_2_linear.xml
rename to android/sample/src/main/res/layout/benchmark_layout_2_linear.xml
diff --git a/android/sample/res/layout/benchmark_layout_3.xml b/android/sample/src/main/res/layout/benchmark_layout_3.xml
similarity index 100%
rename from android/sample/res/layout/benchmark_layout_3.xml
rename to android/sample/src/main/res/layout/benchmark_layout_3.xml
diff --git a/android/sample/res/layout/benchmark_layout_3_linear.xml b/android/sample/src/main/res/layout/benchmark_layout_3_linear.xml
similarity index 100%
rename from android/sample/res/layout/benchmark_layout_3_linear.xml
rename to android/sample/src/main/res/layout/benchmark_layout_3_linear.xml
diff --git a/android/sample/res/layout/benchmark_select_layout.xml b/android/sample/src/main/res/layout/benchmark_select_layout.xml
similarity index 100%
rename from android/sample/res/layout/benchmark_select_layout.xml
rename to android/sample/src/main/res/layout/benchmark_select_layout.xml
diff --git a/android/sample/res/layout/main_layout.xml b/android/sample/src/main/res/layout/main_layout.xml
similarity index 100%
rename from android/sample/res/layout/main_layout.xml
rename to android/sample/src/main/res/layout/main_layout.xml
diff --git a/android/sample/res/menu/action_bar_benchmark.xml b/android/sample/src/main/res/menu/action_bar_benchmark.xml
similarity index 100%
rename from android/sample/res/menu/action_bar_benchmark.xml
rename to android/sample/src/main/res/menu/action_bar_benchmark.xml
diff --git a/android/sample/res/menu/action_bar_home.xml b/android/sample/src/main/res/menu/action_bar_home.xml
similarity index 100%
rename from android/sample/res/menu/action_bar_home.xml
rename to android/sample/src/main/res/menu/action_bar_home.xml
diff --git a/android/sample/res/values/colors.xml b/android/sample/src/main/res/values/colors.xml
similarity index 100%
rename from android/sample/res/values/colors.xml
rename to android/sample/src/main/res/values/colors.xml
diff --git a/android/sample/res/values/strings.xml b/android/sample/src/main/res/values/strings.xml
similarity index 100%
rename from android/sample/res/values/strings.xml
rename to android/sample/src/main/res/values/strings.xml
diff --git a/android/sample/res/values/styles.xml b/android/sample/src/main/res/values/styles.xml
similarity index 100%
rename from android/sample/res/values/styles.xml
rename to android/sample/src/main/res/values/styles.xml
diff --git a/build.gradle b/build.gradle
index 23a36e80..0c08835b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
         maven { url 'https://maven.google.com/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 
@@ -33,8 +33,8 @@ allprojects {
 ext {
     minSdkVersion = 14
     targetSdkVersion = 25
-    compileSdkVersion = 26
-    buildToolsVersion = '26.0.2'
+    compileSdkVersion = 28
+    buildToolsVersion = '28.0.3'
     sourceCompatibilityVersion = JavaVersion.VERSION_1_7
     targetCompatibilityVersion = JavaVersion.VERSION_1_7
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8772300a..9e2d8204 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
diff --git a/settings.gradle b/settings.gradle
index 1c136f10..eb75b3c2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,6 +6,7 @@
  */
 
 include ':yoga', ':yogacore', ':yoga-layout', ':yoga:proguard-annotations', ':libfb'
+include ':android:sample'
 project(':yoga').projectDir = file('java')
 project(':yoga:proguard-annotations').projectDir = file('java/proguard-annotations')
 project(':yoga-layout').projectDir = file('android')