diff --git a/Android.mk b/Android.mk
index 4f8feb6..1d1c609 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,7 +12,7 @@
 endif
 
 src_dirs := src src-bind $(phone_common_dir)/src
-res_dirs := res res-aosp res-common icons/res $(phone_common_dir)/res
+res_dirs := res res-aosp res-common res-icons $(phone_common_dir)/res
 asset_dirs := assets
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
diff --git a/icons/res/mipmap-hdpi/ic_contacts_launcher.png b/res-icons/mipmap-hdpi/ic_contacts_launcher.png
similarity index 100%
rename from icons/res/mipmap-hdpi/ic_contacts_launcher.png
rename to res-icons/mipmap-hdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/icons/res/mipmap-hdpi/ic_contacts_launcher_square.png b/res-icons/mipmap-hdpi/ic_contacts_launcher_square.png
similarity index 100%
rename from icons/res/mipmap-hdpi/ic_contacts_launcher_square.png
rename to res-icons/mipmap-hdpi/ic_contacts_launcher_square.png
Binary files differ
diff --git a/icons/res/mipmap-mdpi/ic_contacts_launcher.png b/res-icons/mipmap-mdpi/ic_contacts_launcher.png
similarity index 100%
rename from icons/res/mipmap-mdpi/ic_contacts_launcher.png
rename to res-icons/mipmap-mdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/icons/res/mipmap-mdpi/ic_contacts_launcher_square.png b/res-icons/mipmap-mdpi/ic_contacts_launcher_square.png
similarity index 100%
rename from icons/res/mipmap-mdpi/ic_contacts_launcher_square.png
rename to res-icons/mipmap-mdpi/ic_contacts_launcher_square.png
Binary files differ
diff --git a/icons/res/mipmap-xhdpi/ic_contacts_launcher.png b/res-icons/mipmap-xhdpi/ic_contacts_launcher.png
similarity index 100%
rename from icons/res/mipmap-xhdpi/ic_contacts_launcher.png
rename to res-icons/mipmap-xhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/icons/res/mipmap-xhdpi/ic_contacts_launcher_square.png b/res-icons/mipmap-xhdpi/ic_contacts_launcher_square.png
similarity index 100%
rename from icons/res/mipmap-xhdpi/ic_contacts_launcher_square.png
rename to res-icons/mipmap-xhdpi/ic_contacts_launcher_square.png
Binary files differ
diff --git a/icons/res/mipmap-xxhdpi/ic_contacts_launcher.png b/res-icons/mipmap-xxhdpi/ic_contacts_launcher.png
similarity index 100%
rename from icons/res/mipmap-xxhdpi/ic_contacts_launcher.png
rename to res-icons/mipmap-xxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/icons/res/mipmap-xxhdpi/ic_contacts_launcher_square.png b/res-icons/mipmap-xxhdpi/ic_contacts_launcher_square.png
similarity index 100%
rename from icons/res/mipmap-xxhdpi/ic_contacts_launcher_square.png
rename to res-icons/mipmap-xxhdpi/ic_contacts_launcher_square.png
Binary files differ
diff --git a/icons/res/mipmap-xxxhdpi/ic_contacts_launcher.png b/res-icons/mipmap-xxxhdpi/ic_contacts_launcher.png
similarity index 100%
rename from icons/res/mipmap-xxxhdpi/ic_contacts_launcher.png
rename to res-icons/mipmap-xxxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/icons/res/mipmap-xxxhdpi/ic_contacts_launcher_square.png b/res-icons/mipmap-xxxhdpi/ic_contacts_launcher_square.png
similarity index 100%
rename from icons/res/mipmap-xxxhdpi/ic_contacts_launcher_square.png
rename to res-icons/mipmap-xxxhdpi/ic_contacts_launcher_square.png
Binary files differ
diff --git a/tests/src/com/android/contacts/common/format/TextHighlighterTest.java b/tests/src/com/android/contacts/common/format/TextHighlighterTest.java
index 8450697..7bf28c5 100644
--- a/tests/src/com/android/contacts/common/format/TextHighlighterTest.java
+++ b/tests/src/com/android/contacts/common/format/TextHighlighterTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package src.com.android.contacts.common.format;
+package com.android.contacts.common.format;
 
 import android.graphics.Typeface;
 import android.test.suitebuilder.annotation.SmallTest;
diff --git a/tests/src/com/android/contacts/common/model/RawContactTest.java b/tests/src/com/android/contacts/common/model/RawContactTest.java
index 1c698c0..b8e03c3 100644
--- a/tests/src/com/android/contacts/common/model/RawContactTest.java
+++ b/tests/src/com/android/contacts/common/model/RawContactTest.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package src.com.android.contacts.common.model;
+package com.android.contacts.common.model;
 
 import android.content.ContentValues;
 import android.net.Uri;
diff --git a/tests/src/com/android/contacts/common/util/NameConverterTests.java b/tests/src/com/android/contacts/common/util/NameConverterTests.java
index c4f67c3..5a261eb 100644
--- a/tests/src/com/android/contacts/common/util/NameConverterTests.java
+++ b/tests/src/com/android/contacts/common/util/NameConverterTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package src.com.android.contacts.common.util;
+package com.android.contacts.common.util;
 
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.test.AndroidTestCase;