diff --git a/YOGA_DEFS b/YOGA_DEFS
index 7f2f082a..1aaf9c11 100644
--- a/YOGA_DEFS
+++ b/YOGA_DEFS
@@ -12,7 +12,7 @@ FBJNI_TARGET = '//lib/fb:fbjni'
 APPCOMPAT_TARGET = '//lib/appcompat:appcompat'
 ANDROID_SUPPORT_TARGET = '//lib/android-support:android-support'
 ANDROID_SAMPLE_JAVA_TARGET = '//android/sample/java/com/facebook/samples/yoga:yoga'
-ANDROID_SAMPLE_RES_TARGET = '//android/sample/res/com/facebook/samples/yoga:res'
+ANDROID_SAMPLE_RES_TARGET = '//android/sample:res'
 
 THIS_IS_FBOBJC = False
 
diff --git a/android/sample/BUCK b/android/sample/BUCK
index 5eeb672e..238d0ed2 100644
--- a/android/sample/BUCK
+++ b/android/sample/BUCK
@@ -17,6 +17,15 @@ android_binary(
   ],
 )
 
+android_resource(
+  name = 'res',
+  res = 'res',
+  package = 'com.facebook.samples.yoga',
+  visibility = [
+    'PUBLIC',
+  ],
+)
+
 keystore(
     name='debug_keystore',
     store='debug.keystore',
diff --git a/android/sample/res/com/facebook/samples/yoga/BUCK b/android/sample/res/com/facebook/samples/yoga/BUCK
deleted file mode 100644
index 83268716..00000000
--- a/android/sample/res/com/facebook/samples/yoga/BUCK
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
-#
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
-
-include_defs('//YOGA_DEFS')
-
-android_resource(
-  name = 'res',
-  res = 'res',
-  package = 'com.facebook.samples.yoga',
-  visibility = [
-    'PUBLIC',
-  ],
-)
-
-project_config(
-  src_target = ':res'
-)
diff --git a/android/sample/res/com/facebook/samples/yoga/res/drawable/action_bar_background.xml b/android/sample/res/drawable/action_bar_background.xml
similarity index 100%
rename from android/sample/res/com/facebook/samples/yoga/res/drawable/action_bar_background.xml
rename to android/sample/res/drawable/action_bar_background.xml
diff --git a/android/sample/res/com/facebook/samples/yoga/res/drawable/ic_launcher.png b/android/sample/res/drawable/ic_launcher.png
similarity index 100%
rename from android/sample/res/com/facebook/samples/yoga/res/drawable/ic_launcher.png
rename to android/sample/res/drawable/ic_launcher.png
diff --git a/android/sample/res/com/facebook/samples/yoga/res/drawable/sample_children_background.xml b/android/sample/res/drawable/sample_children_background.xml
similarity index 100%
rename from android/sample/res/com/facebook/samples/yoga/res/drawable/sample_children_background.xml
rename to android/sample/res/drawable/sample_children_background.xml
diff --git a/android/sample/res/com/facebook/samples/yoga/res/layout/main_layout.xml b/android/sample/res/layout/main_layout.xml
similarity index 100%
rename from android/sample/res/com/facebook/samples/yoga/res/layout/main_layout.xml
rename to android/sample/res/layout/main_layout.xml
diff --git a/android/sample/res/com/facebook/samples/yoga/res/layout/splash_layout.xml b/android/sample/res/layout/splash_layout.xml
similarity index 100%
rename from android/sample/res/com/facebook/samples/yoga/res/layout/splash_layout.xml
rename to android/sample/res/layout/splash_layout.xml
diff --git a/android/sample/res/com/facebook/samples/yoga/res/values/attrs.xml b/android/sample/res/values/attrs.xml
similarity index 100%
rename from android/sample/res/com/facebook/samples/yoga/res/values/attrs.xml
rename to android/sample/res/values/attrs.xml
diff --git a/android/sample/res/com/facebook/samples/yoga/res/values/colors.xml b/android/sample/res/values/colors.xml
similarity index 100%
rename from android/sample/res/com/facebook/samples/yoga/res/values/colors.xml
rename to android/sample/res/values/colors.xml
diff --git a/android/sample/res/com/facebook/samples/yoga/res/values/strings.xml b/android/sample/res/values/strings.xml
similarity index 100%
rename from android/sample/res/com/facebook/samples/yoga/res/values/strings.xml
rename to android/sample/res/values/strings.xml
diff --git a/android/sample/res/com/facebook/samples/yoga/res/values/styles.xml b/android/sample/res/values/styles.xml
similarity index 100%
rename from android/sample/res/com/facebook/samples/yoga/res/values/styles.xml
rename to android/sample/res/values/styles.xml