diff --git a/res/layout-xlarge/contacts_list_content.xml b/res/layout-xlarge/contacts_list_content.xml
index 0af4a81..6f82eff 100644
--- a/res/layout-xlarge/contacts_list_content.xml
+++ b/res/layout-xlarge/contacts_list_content.xml
@@ -55,7 +55,7 @@
             >
 
             <view
-                class="com.android.contacts.ContactEntryListView"
+                class="com.android.contacts.list.ContactEntryListView"
                 android:id="@android:id/list"
                 android:layout_width="match_parent"
                 android:layout_height="0dip"
diff --git a/res/layout/contacts_list_content.xml b/res/layout/contacts_list_content.xml
index 34d629f..79c11dd 100644
--- a/res/layout/contacts_list_content.xml
+++ b/res/layout/contacts_list_content.xml
@@ -39,7 +39,7 @@
         />
 
         <view
-            class="com.android.contacts.ContactEntryListView"
+            class="com.android.contacts.list.ContactEntryListView"
             android:id="@android:id/list"
             android:layout_width="match_parent"
             android:layout_height="0dip"
diff --git a/res/layout/contacts_list_content_join.xml b/res/layout/contacts_list_content_join.xml
index 1e91dab..de285fa 100644
--- a/res/layout/contacts_list_content_join.xml
+++ b/res/layout/contacts_list_content_join.xml
@@ -75,7 +75,7 @@
         />
 
         <view
-            class="com.android.contacts.ContactEntryListView" 
+            class="com.android.contacts.list.ContactEntryListView" 
             android:id="@android:id/list"
             android:layout_width="0px"
             android:layout_height="match_parent"
diff --git a/res/layout/custom_list_filter.xml b/res/layout/custom_list_filter.xml
index 5176ed2..2b029a7 100644
--- a/res/layout/custom_list_filter.xml
+++ b/res/layout/custom_list_filter.xml
@@ -38,7 +38,7 @@
         />
 
         <view
-            class="com.android.contacts.ContactEntryListView"
+            class="com.android.contacts.list.ContactEntryListView"
             android:id="@android:id/list"
             android:layout_width="match_parent"
             android:layout_height="0dip"
diff --git a/src/com/android/contacts/list/ContactEntryListAdapter.java b/src/com/android/contacts/list/ContactEntryListAdapter.java
index 7f00ff3..3d70ed3 100644
--- a/src/com/android/contacts/list/ContactEntryListAdapter.java
+++ b/src/com/android/contacts/list/ContactEntryListAdapter.java
@@ -15,8 +15,6 @@
  */
 package com.android.contacts.list;
 
-import com.android.contacts.ContactPhotoLoader;
-import com.android.contacts.ContactsSectionIndexer;
 import com.android.contacts.R;
 import com.android.contacts.widget.IndexerListAdapter;
 import com.android.contacts.widget.TextWithHighlightingFactory;
diff --git a/src/com/android/contacts/list/ContactEntryListFragment.java b/src/com/android/contacts/list/ContactEntryListFragment.java
index 7b9142b..2fbab99 100644
--- a/src/com/android/contacts/list/ContactEntryListFragment.java
+++ b/src/com/android/contacts/list/ContactEntryListFragment.java
@@ -17,9 +17,7 @@
 package com.android.contacts.list;
 
 import com.android.common.widget.CompositeCursorAdapter.Partition;
-import com.android.contacts.ContactEntryListView;
 import com.android.contacts.ContactListEmptyView;
-import com.android.contacts.ContactPhotoLoader;
 import com.android.contacts.ContactsSearchManager;
 import com.android.contacts.R;
 import com.android.contacts.preference.ContactsPreferences;
diff --git a/src/com/android/contacts/ContactEntryListView.java b/src/com/android/contacts/list/ContactEntryListView.java
similarity index 96%
rename from src/com/android/contacts/ContactEntryListView.java
rename to src/com/android/contacts/list/ContactEntryListView.java
index b5dfbeb..a0e5634 100644
--- a/src/com/android/contacts/ContactEntryListView.java
+++ b/src/com/android/contacts/list/ContactEntryListView.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.contacts;
+package com.android.contacts.list;
 
-import com.android.contacts.list.ContactEntryListAdapter;
+import com.android.contacts.R;
 import com.android.contacts.widget.PinnedHeaderListView;
 import com.android.contacts.widget.TextHighlightingAnimation;
 
@@ -43,7 +43,6 @@
     private boolean mHighlightNamesWhenScrolling;
     private Drawable mDefaultSelector;
     private boolean mSelectionVisible;
-    private ContactEntryListAdapter mAdapter;
 
     public ContactEntryListView(Context context) {
         this(context, null);
diff --git a/src/com/android/contacts/ContactNameHighlightingAnimation.java b/src/com/android/contacts/list/ContactNameHighlightingAnimation.java
similarity index 95%
rename from src/com/android/contacts/ContactNameHighlightingAnimation.java
rename to src/com/android/contacts/list/ContactNameHighlightingAnimation.java
index 801a522..05881ce 100644
--- a/src/com/android/contacts/ContactNameHighlightingAnimation.java
+++ b/src/com/android/contacts/list/ContactNameHighlightingAnimation.java
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts;
+package com.android.contacts.list;
 
-import com.android.contacts.list.ContactListItemView;
 import com.android.contacts.widget.TextHighlightingAnimation;
 
 import android.view.View;
diff --git a/src/com/android/contacts/ContactPhotoLoader.java b/src/com/android/contacts/list/ContactPhotoLoader.java
similarity index 99%
rename from src/com/android/contacts/ContactPhotoLoader.java
rename to src/com/android/contacts/list/ContactPhotoLoader.java
index b95d680..8681a4a 100644
--- a/src/com/android/contacts/ContactPhotoLoader.java
+++ b/src/com/android/contacts/list/ContactPhotoLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts;
+package com.android.contacts.list;
 
 import com.google.android.collect.Lists;
 
diff --git a/src/com/android/contacts/ContactsSectionIndexer.java b/src/com/android/contacts/list/ContactsSectionIndexer.java
similarity index 98%
rename from src/com/android/contacts/ContactsSectionIndexer.java
rename to src/com/android/contacts/list/ContactsSectionIndexer.java
index 01d461f..a80d1de 100644
--- a/src/com/android/contacts/ContactsSectionIndexer.java
+++ b/src/com/android/contacts/list/ContactsSectionIndexer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts;
+package com.android.contacts.list;
 
 import android.widget.SectionIndexer;