diff --git a/android/sample/build.gradle b/android/sample/build.gradle
index ed0f5db6d..771e01fc8 100644
--- a/android/sample/build.gradle
+++ b/android/sample/build.gradle
@@ -16,12 +16,6 @@ android {
     sourceSets {
         main {
             manifest.srcFile './AndroidManifest.xml'
-            java {
-                srcDir 'src'
-            }
-            res {
-                srcDir 'res'
-            }
         }
     }
 }
diff --git a/android/sample/src/sonar/com/facebook/sonar/sample/MainActivity.java b/android/sample/src/main/java/com/facebook/sonar/sample/MainActivity.java
similarity index 100%
rename from android/sample/src/sonar/com/facebook/sonar/sample/MainActivity.java
rename to android/sample/src/main/java/com/facebook/sonar/sample/MainActivity.java
diff --git a/android/sample/src/sonar/com/facebook/sonar/sample/RootComponentSpec.java b/android/sample/src/main/java/com/facebook/sonar/sample/RootComponentSpec.java
similarity index 100%
rename from android/sample/src/sonar/com/facebook/sonar/sample/RootComponentSpec.java
rename to android/sample/src/main/java/com/facebook/sonar/sample/RootComponentSpec.java
diff --git a/android/sample/src/sonar/com/facebook/sonar/sample/SonarSampleApplication.java b/android/sample/src/main/java/com/facebook/sonar/sample/SonarSampleApplication.java
similarity index 100%
rename from android/sample/src/sonar/com/facebook/sonar/sample/SonarSampleApplication.java
rename to android/sample/src/main/java/com/facebook/sonar/sample/SonarSampleApplication.java
diff --git a/android/sample/res/drawable-hdpi/ic_launcher.png b/android/sample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from android/sample/res/drawable-hdpi/ic_launcher.png
rename to android/sample/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/android/sample/res/drawable-mdpi/ic_launcher.png b/android/sample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from android/sample/res/drawable-mdpi/ic_launcher.png
rename to android/sample/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/android/sample/res/drawable-xhdpi/ic_launcher.png b/android/sample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from android/sample/res/drawable-xhdpi/ic_launcher.png
rename to android/sample/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/android/sample/res/drawable-xxhdpi/ic_launcher.png b/android/sample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/sample/res/drawable-xxhdpi/ic_launcher.png
rename to android/sample/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/android/sample/res/drawable-xxxhdpi/ic_launcher.png b/android/sample/src/main/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/sample/res/drawable-xxxhdpi/ic_launcher.png
rename to android/sample/src/main/res/drawable-xxxhdpi/ic_launcher.png
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