diff --git a/src/com/android/contacts/AppCompatContactsActivity.java b/src/com/android/contacts/AppCompatContactsActivity.java
index 7654b27..e4a24e9 100644
--- a/src/com/android/contacts/AppCompatContactsActivity.java
+++ b/src/com/android/contacts/AppCompatContactsActivity.java
@@ -26,7 +26,7 @@
 import android.view.View;
 
 import com.android.contacts.common.activity.AppCompatTransactionSafeActivity;
-import com.android.contacts.common.testing.InjectedServices;
+import com.android.contacts.testing.InjectedServices;
 
 /**
  * A common superclass for Contacts activities that handles application-wide services, copied from
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index 76a77c0..2aba4c0 100755
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -52,18 +52,18 @@
 import android.widget.Toast;
 
 import com.android.contacts.activities.ContactEditorActivity;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.database.ContactUpdateUtils;
-import com.android.contacts.common.database.SimContactDao;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.CPOWrapper;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.contacts.common.util.PermissionsUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.database.ContactUpdateUtils;
+import com.android.contacts.database.SimContactDao;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.CPOWrapper;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.ContactsPreferences;
+import com.android.contacts.util.ContactDisplayUtils;
+import com.android.contacts.util.PermissionsUtil;
 import com.android.contacts.compat.PinnedPositionsCompat;
 import com.android.contacts.util.ContactPhotoUtils;
 import com.android.contactsbind.FeedbackHelper;
diff --git a/src/com/android/contacts/ContactsActivity.java b/src/com/android/contacts/ContactsActivity.java
index 82d1f98..73f07f7 100644
--- a/src/com/android/contacts/ContactsActivity.java
+++ b/src/com/android/contacts/ContactsActivity.java
@@ -26,7 +26,7 @@
 import android.view.View;
 
 import com.android.contacts.common.activity.TransactionSafeActivity;
-import com.android.contacts.common.testing.InjectedServices;
+import com.android.contacts.testing.InjectedServices;
 
 /**
  * A common superclass for Contacts activities that handles application-wide services.
diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java
index 6fa9df1..1507ace 100644
--- a/src/com/android/contacts/ContactsApplication.java
+++ b/src/com/android/contacts/ContactsApplication.java
@@ -29,8 +29,8 @@
 import android.provider.ContactsContract.Contacts;
 import android.util.Log;
 
-import com.android.contacts.common.testing.InjectedServices;
-import com.android.contacts.common.util.Constants;
+import com.android.contacts.testing.InjectedServices;
+import com.android.contacts.util.Constants;
 import com.android.contactsbind.analytics.AnalyticsUtil;
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/src/com/android/contacts/ContactsDrawerActivity.java b/src/com/android/contacts/ContactsDrawerActivity.java
index b6dbe9d..87812aa 100644
--- a/src/com/android/contacts/ContactsDrawerActivity.java
+++ b/src/com/android/contacts/ContactsDrawerActivity.java
@@ -48,20 +48,20 @@
 
 import com.android.contacts.activities.ActionBarAdapter;
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.list.AccountFilterActivity;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.ContactListFilterController;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.ContactsPreferenceActivity;
-import com.android.contacts.common.util.AccountFilterUtil;
-import com.android.contacts.common.util.AccountsListAdapter.AccountListFilter;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.util.MaterialColorMapUtils;
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.list.AccountFilterActivity;
+import com.android.contacts.list.ContactListFilter;
+import com.android.contacts.list.ContactListFilterController;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.ContactsPreferenceActivity;
+import com.android.contacts.util.AccountFilterUtil;
+import com.android.contacts.util.AccountsListAdapter.AccountListFilter;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.util.MaterialColorMapUtils;
+import com.android.contacts.util.ViewUtil;
 import com.android.contacts.editor.ContactEditorFragment;
 import com.android.contacts.editor.SelectAccountDialogFragment;
 import com.android.contacts.group.GroupListItem;
diff --git a/src/com/android/contacts/DynamicShortcuts.java b/src/com/android/contacts/DynamicShortcuts.java
index 49cc722..b860310 100644
--- a/src/com/android/contacts/DynamicShortcuts.java
+++ b/src/com/android/contacts/DynamicShortcuts.java
@@ -50,10 +50,10 @@
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.Experiments;
 import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.util.BitmapUtil;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.util.PermissionsUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.util.BitmapUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.util.PermissionsUtil;
 import com.android.contactsbind.experiments.Flags;
 
 import java.io.IOException;
diff --git a/src/com/android/contacts/NonPhoneActivity.java b/src/com/android/contacts/NonPhoneActivity.java
index 05c556b..875ac53 100644
--- a/src/com/android/contacts/NonPhoneActivity.java
+++ b/src/com/android/contacts/NonPhoneActivity.java
@@ -17,7 +17,7 @@
 package com.android.contacts;
 
 import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/src/com/android/contacts/SimImportFragment.java b/src/com/android/contacts/SimImportFragment.java
index dc4cabf..05f74c4 100644
--- a/src/com/android/contacts/SimImportFragment.java
+++ b/src/com/android/contacts/SimImportFragment.java
@@ -39,13 +39,13 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.database.SimContactDao;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.SimCard;
-import com.android.contacts.common.model.SimContact;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.database.SimContactDao;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.SimCard;
+import com.android.contacts.model.SimContact;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.ContactsPreferences;
 import com.android.contacts.editor.AccountHeaderPresenter;
 
 import java.util.ArrayList;
diff --git a/src/com/android/contacts/SimImportService.java b/src/com/android/contacts/SimImportService.java
index 4fa3695..70e1d43 100644
--- a/src/com/android/contacts/SimImportService.java
+++ b/src/com/android/contacts/SimImportService.java
@@ -31,11 +31,10 @@
 import android.util.TimingLogger;
 
 import com.android.contacts.activities.PeopleActivity;
-import com.android.contacts.common.database.SimContactDao;
-import com.android.contacts.common.database.SimContactDaoImpl;
-import com.android.contacts.common.model.SimCard;
-import com.android.contacts.common.model.SimContact;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.database.SimContactDao;
+import com.android.contacts.model.SimCard;
+import com.android.contacts.model.SimContact;
+import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contactsbind.FeedbackHelper;
 
 import java.util.ArrayList;
diff --git a/src/com/android/contacts/SplitAggregateView.java b/src/com/android/contacts/SplitAggregateView.java
index 2281ec6..5c822ba 100644
--- a/src/com/android/contacts/SplitAggregateView.java
+++ b/src/com/android/contacts/SplitAggregateView.java
@@ -35,8 +35,8 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/contacts/TypePrecedence.java b/src/com/android/contacts/TypePrecedence.java
index 0a193b5..53b8343 100644
--- a/src/com/android/contacts/TypePrecedence.java
+++ b/src/com/android/contacts/TypePrecedence.java
@@ -23,7 +23,7 @@
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
 
-import com.android.contacts.common.model.RawContactModifier;
+import com.android.contacts.model.RawContactModifier;
 
 /**
  * This class contains utility functions for determining the precedence of
diff --git a/src/com/android/contacts/ViewNotificationService.java b/src/com/android/contacts/ViewNotificationService.java
index 0f2922a..3bc5ed2 100644
--- a/src/com/android/contacts/ViewNotificationService.java
+++ b/src/com/android/contacts/ViewNotificationService.java
@@ -23,8 +23,8 @@
 import android.os.IBinder;
 import android.util.Log;
 
-import com.android.contacts.common.model.Contact;
-import com.android.contacts.common.model.ContactLoader;
+import com.android.contacts.model.Contact;
+import com.android.contacts.model.ContactLoader;
 
 
 /**
diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index c91f608..fac6813 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -46,8 +46,8 @@
 import com.android.contacts.ContactsDrawerActivity;
 import com.android.contacts.R;
 import com.android.contacts.activities.ActionBarAdapter.Listener.Action;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.util.MaterialColorMapUtils;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.util.MaterialColorMapUtils;
 import com.android.contacts.list.ContactsRequest;
 
 import java.util.ArrayList;
diff --git a/src/com/android/contacts/activities/AttachPhotoActivity.java b/src/com/android/contacts/activities/AttachPhotoActivity.java
index 096349c..049c277 100644
--- a/src/com/android/contacts/activities/AttachPhotoActivity.java
+++ b/src/com/android/contacts/activities/AttachPhotoActivity.java
@@ -41,15 +41,15 @@
 import com.android.contacts.ContactsActivity;
 import com.android.contacts.R;
 import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.model.Contact;
-import com.android.contacts.common.model.ContactLoader;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.model.RawContactModifier;
+import com.android.contacts.model.Contact;
+import com.android.contacts.model.ContactLoader;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.model.RawContactModifier;
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contacts.editor.ContactEditorUtils;
 import com.android.contacts.util.ContactPhotoUtils;
 
diff --git a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
index 3027707..50e11f3 100644
--- a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
@@ -32,11 +32,11 @@
 
 import com.android.contacts.R;
 import com.android.contacts.editor.ContactEditorUtils;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountsListAdapter;
-import com.android.contacts.common.util.AccountsListAdapter.AccountListFilter;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountsListAdapter;
+import com.android.contacts.util.AccountsListAdapter.AccountListFilter;
+import com.android.contacts.util.ImplicitIntentsUtil;
 
 import java.util.List;
 
diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java
index 4298d7c..c58189a 100644
--- a/src/com/android/contacts/activities/ContactEditorActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorActivity.java
@@ -33,8 +33,8 @@
 import com.android.contacts.DynamicShortcuts;
 import com.android.contacts.R;
 import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.util.ImplicitIntentsUtil;
 import com.android.contacts.detail.PhotoSelectionHandler;
 import com.android.contacts.editor.ContactEditorFragment;
 import com.android.contacts.editor.EditorIntents;
diff --git a/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java b/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java
index 0c60203..ac2c257 100644
--- a/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java
@@ -17,11 +17,11 @@
 import com.android.contacts.ContactSaveService;
 import com.android.contacts.R;
 import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.logging.EditorEvent;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette;
+import com.android.contacts.logging.EditorEvent;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.util.MaterialColorMapUtils.MaterialPalette;
 import com.android.contacts.editor.ContactEditorFragment;
 import com.android.contacts.editor.EditorIntents;
 import com.android.contacts.editor.PickRawContactDialogFragment;
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index cbf6a69..252b616 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -37,13 +37,13 @@
 import com.android.contacts.AppCompatContactsActivity;
 import com.android.contacts.R;
 import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.list.ContactEntryListFragment;
-import com.android.contacts.common.list.DirectoryListLoader;
-import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
-import com.android.contacts.common.list.PhoneNumberPickerFragment;
-import com.android.contacts.common.logging.ListEvent;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.list.ContactEntryListFragment;
+import com.android.contacts.list.DirectoryListLoader;
+import com.android.contacts.list.OnPhoneNumberPickerActionListener;
+import com.android.contacts.list.PhoneNumberPickerFragment;
+import com.android.contacts.logging.ListEvent;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.util.ViewUtil;
 import com.android.contacts.editor.EditorIntents;
 import com.android.contacts.list.ContactPickerFragment;
 import com.android.contacts.list.ContactsIntentResolver;
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index c3308b5..11a3823 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -53,21 +53,20 @@
 import com.android.contacts.ContactSaveService;
 import com.android.contacts.ContactsDrawerActivity;
 import com.android.contacts.R;
-import com.android.contacts.common.Experiments;
 import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.ContactListFilterController.ContactListFilterListener;
-import com.android.contacts.common.list.ProviderStatusWatcher;
-import com.android.contacts.common.list.ProviderStatusWatcher.ProviderStatusListener;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.logging.ScreenEvent.ScreenType;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountFilterUtil;
-import com.android.contacts.common.util.Constants;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.widget.FloatingActionButtonController;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.list.ContactListFilter;
+import com.android.contacts.list.ContactListFilterController.ContactListFilterListener;
+import com.android.contacts.list.ProviderStatusWatcher;
+import com.android.contacts.list.ProviderStatusWatcher.ProviderStatusListener;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.logging.ScreenEvent.ScreenType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountFilterUtil;
+import com.android.contacts.util.Constants;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.widget.FloatingActionButtonController;
 import com.android.contacts.group.GroupMembersFragment;
 import com.android.contacts.group.GroupMetaData;
 import com.android.contacts.group.GroupUtil;
@@ -78,7 +77,6 @@
 import com.android.contacts.util.SyncUtil;
 import com.android.contactsbind.FeatureHighlightHelper;
 import com.android.contactsbind.ObjectFactory;
-import com.android.contactsbind.experiments.Flags;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/src/com/android/contacts/activities/ShowOrCreateActivity.java b/src/com/android/contacts/activities/ShowOrCreateActivity.java
index 6a516ad..b21db28 100755
--- a/src/com/android/contacts/activities/ShowOrCreateActivity.java
+++ b/src/com/android/contacts/activities/ShowOrCreateActivity.java
@@ -38,7 +38,7 @@
 import com.android.contacts.ContactsActivity;
 import com.android.contacts.R;
 import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
 import com.android.contacts.util.NotifyingAsyncQueryHandler;
 
 /**
diff --git a/src/com/android/contacts/activities/SimImportActivity.java b/src/com/android/contacts/activities/SimImportActivity.java
index 391cd8b..2dff45b 100644
--- a/src/com/android/contacts/activities/SimImportActivity.java
+++ b/src/com/android/contacts/activities/SimImportActivity.java
@@ -22,7 +22,7 @@
 import com.android.contacts.AppCompatContactsActivity;
 import com.android.contacts.R;
 import com.android.contacts.SimImportFragment;
-import com.android.contacts.common.model.SimCard;
+import com.android.contacts.model.SimCard;
 
 /**
  * Host activity for SimImportFragment
diff --git a/src/com/android/contacts/common/CallUtil.java b/src/com/android/contacts/common/CallUtil.java
index acfad52..e2041b1 100644
--- a/src/com/android/contacts/common/CallUtil.java
+++ b/src/com/android/contacts/common/CallUtil.java
@@ -16,10 +16,10 @@
 
 package com.android.contacts.common;
 
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.PhoneAccountSdkCompat;
-import com.android.contacts.common.util.PermissionsUtil;
-import com.android.contacts.common.util.PhoneNumberHelper;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.compat.PhoneAccountSdkCompat;
+import com.android.contacts.util.PermissionsUtil;
+import com.android.contacts.util.PhoneNumberHelper;
 import com.android.contactsbind.FeedbackHelper;
 import com.android.phone.common.PhoneConstants;
 
diff --git a/src/com/android/contacts/common/ContactPhotoManager.java b/src/com/android/contacts/common/ContactPhotoManager.java
index b9b4bcc..29f0b3d 100644
--- a/src/com/android/contacts/common/ContactPhotoManager.java
+++ b/src/com/android/contacts/common/ContactPhotoManager.java
@@ -55,11 +55,11 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
-import com.android.contacts.common.lettertiles.LetterTileDrawable;
-import com.android.contacts.common.util.BitmapUtil;
-import com.android.contacts.common.util.PermissionsUtil;
-import com.android.contacts.common.util.TrafficStatsTags;
-import com.android.contacts.common.util.UriUtils;
+import com.android.contacts.lettertiles.LetterTileDrawable;
+import com.android.contacts.util.BitmapUtil;
+import com.android.contacts.util.PermissionsUtil;
+import com.android.contacts.util.TrafficStatsTags;
+import com.android.contacts.util.UriUtils;
 import com.android.contactsbind.util.UserAgentGenerator;
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/src/com/android/contacts/common/ContactsUtils.java b/src/com/android/contacts/common/ContactsUtils.java
index 0f8031c..feb86a2 100644
--- a/src/com/android/contacts/common/ContactsUtils.java
+++ b/src/com/android/contacts/common/ContactsUtils.java
@@ -27,11 +27,11 @@
 import android.text.TextUtils;
 import android.util.Pair;
 
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.dataitem.ImDataItem;
-import com.android.contacts.common.compat.ContactsCompat;
-import com.android.contacts.common.compat.DirectoryCompat;
-import com.android.contacts.common.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.dataitem.ImDataItem;
+import com.android.contacts.compat.ContactsCompat;
+import com.android.contacts.compat.DirectoryCompat;
+import com.android.contacts.model.AccountTypeManager;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/com/android/contacts/common/GeoUtil.java b/src/com/android/contacts/common/GeoUtil.java
index cd0139b..7809e79 100644
--- a/src/com/android/contacts/common/GeoUtil.java
+++ b/src/com/android/contacts/common/GeoUtil.java
@@ -19,7 +19,7 @@
 import android.app.Application;
 import android.content.Context;
 
-import com.android.contacts.common.location.CountryDetector;
+import com.android.contacts.location.CountryDetector;
 
 import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;
 import com.google.i18n.phonenumbers.NumberParseException;
diff --git a/src/com/android/contacts/common/MoreContactUtils.java b/src/com/android/contacts/common/MoreContactUtils.java
index 9b9f800..45c454d 100644
--- a/src/com/android/contacts/common/MoreContactUtils.java
+++ b/src/com/android/contacts/common/MoreContactUtils.java
@@ -29,7 +29,7 @@
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.contacts.common.model.account.AccountType;
+import com.android.contacts.model.account.AccountType;
 
 /**
  * Shared static contact utility methods.
diff --git a/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java b/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java
index ef591a5..cfe7a0b 100644
--- a/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java
+++ b/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java
@@ -16,8 +16,8 @@
 
 package com.android.contacts.common.activity;
 
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.util.PermissionsUtil;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.util.PermissionsUtil;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/src/com/android/contacts/common/util/SchedulingUtils.java b/src/com/android/contacts/common/util/SchedulingUtils.java
deleted file mode 100644
index 1dfa153..0000000
--- a/src/com/android/contacts/common/util/SchedulingUtils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.util;
-
-import android.view.View;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.view.ViewTreeObserver.OnPreDrawListener;
-
-/** Static methods that are useful for scheduling actions to occur at a later time. */
-public class SchedulingUtils {
-
-
-    /** Runs a piece of code after the next layout run */
-    public static void doAfterLayout(final View view, final Runnable runnable) {
-        final OnGlobalLayoutListener listener = new OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                // Layout pass done, unregister for further events
-                view.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                runnable.run();
-            }
-        };
-        view.getViewTreeObserver().addOnGlobalLayoutListener(listener);
-    }
-
-    /** Runs a piece of code just before the next draw, after layout and measurement */
-    public static void doOnPreDraw(final View view, final boolean drawNextFrame,
-            final Runnable runnable) {
-        final OnPreDrawListener listener = new OnPreDrawListener() {
-            @Override
-            public boolean onPreDraw() {
-                view.getViewTreeObserver().removeOnPreDrawListener(this);
-                runnable.run();
-                return drawNextFrame;
-            }
-        };
-        view.getViewTreeObserver().addOnPreDrawListener(listener);
-    }
-}
diff --git a/src/com/android/contacts/common/compat/CallSdkCompat.java b/src/com/android/contacts/compat/CallSdkCompat.java
similarity index 97%
rename from src/com/android/contacts/common/compat/CallSdkCompat.java
rename to src/com/android/contacts/compat/CallSdkCompat.java
index fd06d85..d8fbc9a 100644
--- a/src/com/android/contacts/common/compat/CallSdkCompat.java
+++ b/src/com/android/contacts/compat/CallSdkCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.telecom.Call;
 
diff --git a/src/com/android/contacts/common/compat/CallableCompat.java b/src/com/android/contacts/compat/CallableCompat.java
similarity index 96%
rename from src/com/android/contacts/common/compat/CallableCompat.java
rename to src/com/android/contacts/compat/CallableCompat.java
index d25d4be..2529aed 100644
--- a/src/com/android/contacts/common/compat/CallableCompat.java
+++ b/src/com/android/contacts/compat/CallableCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.net.Uri;
 import android.provider.ContactsContract.CommonDataKinds.Callable;
diff --git a/src/com/android/contacts/common/compat/CompatUtils.java b/src/com/android/contacts/compat/CompatUtils.java
similarity index 98%
rename from src/com/android/contacts/common/compat/CompatUtils.java
rename to src/com/android/contacts/compat/CompatUtils.java
index a394093..30ad9b8 100644
--- a/src/com/android/contacts/common/compat/CompatUtils.java
+++ b/src/com/android/contacts/compat/CompatUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.os.Build;
 import android.os.Build.VERSION;
@@ -21,7 +21,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.contacts.common.model.CPOWrapper;
+import com.android.contacts.model.CPOWrapper;
 
 import java.lang.reflect.InvocationTargetException;
 
diff --git a/src/com/android/contacts/common/compat/ContactsCompat.java b/src/com/android/contacts/compat/ContactsCompat.java
similarity index 97%
rename from src/com/android/contacts/common/compat/ContactsCompat.java
rename to src/com/android/contacts/compat/ContactsCompat.java
index 5a5e46a..9db152d 100644
--- a/src/com/android/contacts/common/compat/ContactsCompat.java
+++ b/src/com/android/contacts/compat/ContactsCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.net.Uri;
 import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/compat/DirectoryCompat.java b/src/com/android/contacts/compat/DirectoryCompat.java
similarity index 95%
rename from src/com/android/contacts/common/compat/DirectoryCompat.java
rename to src/com/android/contacts/compat/DirectoryCompat.java
index 682e14c..afb32da 100644
--- a/src/com/android/contacts/common/compat/DirectoryCompat.java
+++ b/src/com/android/contacts/compat/DirectoryCompat.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.net.Uri;
-import android.provider.ContactsContract;
 import android.provider.ContactsContract.Directory;
 
 import com.android.contacts.common.ContactsUtils;
diff --git a/src/com/android/contacts/common/compat/DirectorySdkCompat.java b/src/com/android/contacts/compat/DirectorySdkCompat.java
similarity index 96%
rename from src/com/android/contacts/common/compat/DirectorySdkCompat.java
rename to src/com/android/contacts/compat/DirectorySdkCompat.java
index b919466..32b918c 100644
--- a/src/com/android/contacts/common/compat/DirectorySdkCompat.java
+++ b/src/com/android/contacts/compat/DirectorySdkCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.net.Uri;
 import android.provider.ContactsContract.Directory;
diff --git a/src/com/android/contacts/compat/EdgeEffectCompat.java b/src/com/android/contacts/compat/EdgeEffectCompat.java
index 92999a0..b93ff90 100644
--- a/src/com/android/contacts/compat/EdgeEffectCompat.java
+++ b/src/com/android/contacts/compat/EdgeEffectCompat.java
@@ -17,7 +17,6 @@
 package com.android.contacts.compat;
 
 import android.widget.EdgeEffect;
-import com.android.contacts.common.compat.CompatUtils;
 
 /**
  * Compatibility class for {@link android.widget.EdgeEffect}
diff --git a/src/com/android/contacts/common/compat/EventCompat.java b/src/com/android/contacts/compat/EventCompat.java
similarity index 97%
rename from src/com/android/contacts/common/compat/EventCompat.java
rename to src/com/android/contacts/compat/EventCompat.java
index f37aeff..2ce8148 100644
--- a/src/com/android/contacts/common/compat/EventCompat.java
+++ b/src/com/android/contacts/compat/EventCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.content.res.Resources;
 import android.provider.ContactsContract.CommonDataKinds.BaseTypes;
diff --git a/src/com/android/contacts/common/compat/MultiWindowCompat.java b/src/com/android/contacts/compat/MultiWindowCompat.java
similarity index 95%
rename from src/com/android/contacts/common/compat/MultiWindowCompat.java
rename to src/com/android/contacts/compat/MultiWindowCompat.java
index 6641279..61af516 100644
--- a/src/com/android/contacts/common/compat/MultiWindowCompat.java
+++ b/src/com/android/contacts/compat/MultiWindowCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.app.Activity;
 
diff --git a/src/com/android/contacts/common/compat/PhoneAccountCompat.java b/src/com/android/contacts/compat/PhoneAccountCompat.java
similarity index 98%
rename from src/com/android/contacts/common/compat/PhoneAccountCompat.java
rename to src/com/android/contacts/compat/PhoneAccountCompat.java
index 00f4211..5c396f5 100644
--- a/src/com/android/contacts/common/compat/PhoneAccountCompat.java
+++ b/src/com/android/contacts/compat/PhoneAccountCompat.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/contacts/common/compat/PhoneAccountSdkCompat.java b/src/com/android/contacts/compat/PhoneAccountSdkCompat.java
similarity index 96%
rename from src/com/android/contacts/common/compat/PhoneAccountSdkCompat.java
rename to src/com/android/contacts/compat/PhoneAccountSdkCompat.java
index 5cbf617..cb150c0 100644
--- a/src/com/android/contacts/common/compat/PhoneAccountSdkCompat.java
+++ b/src/com/android/contacts/compat/PhoneAccountSdkCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.os.Bundle;
 import android.telecom.PhoneAccount;
diff --git a/src/com/android/contacts/common/compat/PhoneCompat.java b/src/com/android/contacts/compat/PhoneCompat.java
similarity index 96%
rename from src/com/android/contacts/common/compat/PhoneCompat.java
rename to src/com/android/contacts/compat/PhoneCompat.java
index 5277761..a23e8b3 100644
--- a/src/com/android/contacts/common/compat/PhoneCompat.java
+++ b/src/com/android/contacts/compat/PhoneCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.net.Uri;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
diff --git a/src/com/android/contacts/common/compat/PhoneLookupSdkCompat.java b/src/com/android/contacts/compat/PhoneLookupSdkCompat.java
similarity index 94%
rename from src/com/android/contacts/common/compat/PhoneLookupSdkCompat.java
rename to src/com/android/contacts/compat/PhoneLookupSdkCompat.java
index 0c0a898..770216f 100644
--- a/src/com/android/contacts/common/compat/PhoneLookupSdkCompat.java
+++ b/src/com/android/contacts/compat/PhoneLookupSdkCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.provider.ContactsContract;
 
diff --git a/src/com/android/contacts/common/compat/PhoneNumberFormattingTextWatcherCompat.java b/src/com/android/contacts/compat/PhoneNumberFormattingTextWatcherCompat.java
similarity index 95%
rename from src/com/android/contacts/common/compat/PhoneNumberFormattingTextWatcherCompat.java
rename to src/com/android/contacts/compat/PhoneNumberFormattingTextWatcherCompat.java
index 42b604e..46d727e 100644
--- a/src/com/android/contacts/common/compat/PhoneNumberFormattingTextWatcherCompat.java
+++ b/src/com/android/contacts/compat/PhoneNumberFormattingTextWatcherCompat.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.telephony.PhoneNumberFormattingTextWatcher;
 
diff --git a/src/com/android/contacts/common/compat/PhoneNumberUtilsCompat.java b/src/com/android/contacts/compat/PhoneNumberUtilsCompat.java
similarity index 99%
rename from src/com/android/contacts/common/compat/PhoneNumberUtilsCompat.java
rename to src/com/android/contacts/compat/PhoneNumberUtilsCompat.java
index 9a8fa41..8d5d0db 100644
--- a/src/com/android/contacts/common/compat/PhoneNumberUtilsCompat.java
+++ b/src/com/android/contacts/compat/PhoneNumberUtilsCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
diff --git a/src/com/android/contacts/compat/PinnedPositionsCompat.java b/src/com/android/contacts/compat/PinnedPositionsCompat.java
index 044ef20..59a48e3 100644
--- a/src/com/android/contacts/compat/PinnedPositionsCompat.java
+++ b/src/com/android/contacts/compat/PinnedPositionsCompat.java
@@ -20,8 +20,6 @@
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.PinnedPositions;
 
-import com.android.contacts.common.compat.CompatUtils;
-
 /**
  * Compatibility class for {@link android.provider.ContactsContract.PinnedPositions}
  */
diff --git a/src/com/android/contacts/common/compat/ProviderStatusCompat.java b/src/com/android/contacts/compat/ProviderStatusCompat.java
similarity index 92%
rename from src/com/android/contacts/common/compat/ProviderStatusCompat.java
rename to src/com/android/contacts/compat/ProviderStatusCompat.java
index 84338de..35d514e 100644
--- a/src/com/android/contacts/common/compat/ProviderStatusCompat.java
+++ b/src/com/android/contacts/compat/ProviderStatusCompat.java
@@ -15,14 +15,10 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
-import android.os.Build;
 import android.provider.ContactsContract.ProviderStatus;
 
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.SdkVersionOverride;
-
 /**
  * This class contains constants from the pre-M version of ContactsContract.ProviderStatus class
  * and also the mappings between pre-M constants and M constants for compatibility purpose,
diff --git a/src/com/android/contacts/common/compat/SdkVersionOverride.java b/src/com/android/contacts/compat/SdkVersionOverride.java
similarity index 96%
rename from src/com/android/contacts/common/compat/SdkVersionOverride.java
rename to src/com/android/contacts/compat/SdkVersionOverride.java
index ebde623..5f50fef 100644
--- a/src/com/android/contacts/common/compat/SdkVersionOverride.java
+++ b/src/com/android/contacts/compat/SdkVersionOverride.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.os.Build.VERSION;
 
diff --git a/src/com/android/contacts/common/compat/TelecomManagerUtil.java b/src/com/android/contacts/compat/TelecomManagerUtil.java
similarity index 95%
rename from src/com/android/contacts/common/compat/TelecomManagerUtil.java
rename to src/com/android/contacts/compat/TelecomManagerUtil.java
index 30c541c..b6a030a 100644
--- a/src/com/android/contacts/common/compat/TelecomManagerUtil.java
+++ b/src/com/android/contacts/compat/TelecomManagerUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.content.Intent;
 import android.telecom.TelecomManager;
diff --git a/src/com/android/contacts/common/compat/TelephonyManagerCompat.java b/src/com/android/contacts/compat/TelephonyManagerCompat.java
similarity index 98%
rename from src/com/android/contacts/common/compat/TelephonyManagerCompat.java
rename to src/com/android/contacts/compat/TelephonyManagerCompat.java
index ec7907f..07523b1 100644
--- a/src/com/android/contacts/common/compat/TelephonyManagerCompat.java
+++ b/src/com/android/contacts/compat/TelephonyManagerCompat.java
@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.net.Uri;
 import android.support.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
 
-import com.android.contacts.common.ContactsUtils;
-
 public class TelephonyManagerCompat {
     public static final String TELEPHONY_MANAGER_CLASS = "android.telephony.TelephonyManager";
 
diff --git a/src/com/android/contacts/common/compat/TelephonyManagerSdkCompat.java b/src/com/android/contacts/compat/TelephonyManagerSdkCompat.java
similarity index 96%
rename from src/com/android/contacts/common/compat/TelephonyManagerSdkCompat.java
rename to src/com/android/contacts/compat/TelephonyManagerSdkCompat.java
index acabfdf..dec486b 100644
--- a/src/com/android/contacts/common/compat/TelephonyManagerSdkCompat.java
+++ b/src/com/android/contacts/compat/TelephonyManagerSdkCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.net.Uri;
 import android.telecom.PhoneAccountHandle;
diff --git a/src/com/android/contacts/common/compat/TelephonyThreadsCompat.java b/src/com/android/contacts/compat/TelephonyThreadsCompat.java
similarity index 98%
rename from src/com/android/contacts/common/compat/TelephonyThreadsCompat.java
rename to src/com/android/contacts/compat/TelephonyThreadsCompat.java
index d9642c7..545e185 100644
--- a/src/com/android/contacts/common/compat/TelephonyThreadsCompat.java
+++ b/src/com/android/contacts/compat/TelephonyThreadsCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
 
 import android.content.ContentResolver;
 import android.content.Context;
diff --git a/src/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java b/src/com/android/contacts/compat/telecom/TelecomManagerCompat.java
similarity index 98%
rename from src/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java
rename to src/com/android/contacts/compat/telecom/TelecomManagerCompat.java
index 6292b7f..fbbc589 100644
--- a/src/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java
+++ b/src/com/android/contacts/compat/telecom/TelecomManagerCompat.java
@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.compat.telecom;
+package com.android.contacts.compat.telecom;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.content.Context;
 import android.net.Uri;
 import android.support.annotation.Nullable;
 import android.telecom.PhoneAccount;
@@ -27,9 +26,8 @@
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
-import com.android.contacts.common.compat.CompatUtils;
+import com.android.contacts.compat.CompatUtils;
 
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/com/android/contacts/common/database/ContactUpdateUtils.java b/src/com/android/contacts/database/ContactUpdateUtils.java
similarity index 96%
rename from src/com/android/contacts/common/database/ContactUpdateUtils.java
rename to src/com/android/contacts/database/ContactUpdateUtils.java
index 1bd08aa..2333688 100644
--- a/src/com/android/contacts/common/database/ContactUpdateUtils.java
+++ b/src/com/android/contacts/database/ContactUpdateUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.database;
+package com.android.contacts.database;
 
 import android.content.ContentUris;
 import android.content.ContentValues;
diff --git a/src/com/android/contacts/common/database/EmptyCursor.java b/src/com/android/contacts/database/EmptyCursor.java
similarity index 97%
rename from src/com/android/contacts/common/database/EmptyCursor.java
rename to src/com/android/contacts/database/EmptyCursor.java
index ad00eff..a6c1760 100644
--- a/src/com/android/contacts/common/database/EmptyCursor.java
+++ b/src/com/android/contacts/database/EmptyCursor.java
@@ -14,7 +14,7 @@
 * limitations under the License
 */
 
-package com.android.contacts.common.database;
+package com.android.contacts.database;
 
 import android.database.AbstractCursor;
 import android.database.CursorIndexOutOfBoundsException;
diff --git a/src/com/android/contacts/common/database/NoNullCursorAsyncQueryHandler.java b/src/com/android/contacts/database/NoNullCursorAsyncQueryHandler.java
similarity index 97%
rename from src/com/android/contacts/common/database/NoNullCursorAsyncQueryHandler.java
rename to src/com/android/contacts/database/NoNullCursorAsyncQueryHandler.java
index aefc0fd..a7ff261 100644
--- a/src/com/android/contacts/common/database/NoNullCursorAsyncQueryHandler.java
+++ b/src/com/android/contacts/database/NoNullCursorAsyncQueryHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.database;
+package com.android.contacts.database;
 
 import android.content.AsyncQueryHandler;
 import android.content.ContentResolver;
diff --git a/src/com/android/contacts/common/database/SimContactDao.java b/src/com/android/contacts/database/SimContactDao.java
similarity index 91%
rename from src/com/android/contacts/common/database/SimContactDao.java
rename to src/com/android/contacts/database/SimContactDao.java
index b7b3ae4..3c4fcc4 100644
--- a/src/com/android/contacts/common/database/SimContactDao.java
+++ b/src/com/android/contacts/database/SimContactDao.java
@@ -13,18 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.database;
+package com.android.contacts.database;
 
 import android.content.ContentProviderResult;
 import android.content.Context;
 import android.content.OperationApplicationException;
 import android.os.RemoteException;
-import android.util.SparseArray;
 
-import com.android.contacts.common.model.SimCard;
-import com.android.contacts.common.model.SimContact;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.util.SharedPreferenceUtil;
+import com.android.contacts.model.SimCard;
+import com.android.contacts.model.SimContact;
+import com.android.contacts.model.account.AccountWithDataSet;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/contacts/common/database/SimContactDaoImpl.java b/src/com/android/contacts/database/SimContactDaoImpl.java
similarity index 97%
rename from src/com/android/contacts/common/database/SimContactDaoImpl.java
rename to src/com/android/contacts/database/SimContactDaoImpl.java
index 6ddf663..1a0b2ea 100644
--- a/src/com/android/contacts/common/database/SimContactDaoImpl.java
+++ b/src/com/android/contacts/database/SimContactDaoImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.database;
+package com.android.contacts.database;
 
 import android.annotation.TargetApi;
 import android.content.ContentProviderOperation;
@@ -42,11 +42,11 @@
 import android.util.SparseArray;
 
 import com.android.contacts.R;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.model.SimCard;
-import com.android.contacts.common.model.SimContact;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.PermissionsUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.model.SimCard;
+import com.android.contacts.model.SimContact;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.PermissionsUtil;
 import com.android.contacts.util.SharedPreferenceUtil;
 import com.google.common.base.Joiner;
 
@@ -54,7 +54,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
diff --git a/src/com/android/contacts/datepicker/DatePickerDialog.java b/src/com/android/contacts/datepicker/DatePickerDialog.java
index 1ae1e61..ea66da1 100644
--- a/src/com/android/contacts/datepicker/DatePickerDialog.java
+++ b/src/com/android/contacts/datepicker/DatePickerDialog.java
@@ -28,7 +28,7 @@
 import android.view.View;
 
 import com.android.contacts.R;
-import com.android.contacts.common.util.DateUtils;
+import com.android.contacts.util.DateUtils;
 import com.android.contacts.datepicker.DatePicker.OnDateChangedListener;
 
 import java.text.DateFormat;
diff --git a/src/com/android/contacts/detail/ContactDisplayUtils.java b/src/com/android/contacts/detail/ContactDisplayUtils.java
index 85e6026..2d04555 100644
--- a/src/com/android/contacts/detail/ContactDisplayUtils.java
+++ b/src/com/android/contacts/detail/ContactDisplayUtils.java
@@ -19,11 +19,11 @@
 import com.google.common.collect.Iterables;
 
 import com.android.contacts.R;
-import com.android.contacts.common.model.Contact;
-import com.android.contacts.common.model.RawContact;
-import com.android.contacts.common.model.dataitem.DataItem;
-import com.android.contacts.common.model.dataitem.OrganizationDataItem;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.model.Contact;
+import com.android.contacts.model.RawContact;
+import com.android.contacts.model.dataitem.DataItem;
+import com.android.contacts.model.dataitem.OrganizationDataItem;
+import com.android.contacts.preference.ContactsPreferences;
 import com.android.contacts.util.MoreMath;
 
 import android.content.Context;
diff --git a/src/com/android/contacts/detail/PhotoSelectionHandler.java b/src/com/android/contacts/detail/PhotoSelectionHandler.java
index d2e5763..0d6e2c5 100644
--- a/src/com/android/contacts/detail/PhotoSelectionHandler.java
+++ b/src/com/android/contacts/detail/PhotoSelectionHandler.java
@@ -38,12 +38,12 @@
 
 import com.android.contacts.R;
 import com.android.contacts.editor.PhotoActionPopup;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.RawContactDeltaList;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.RawContactDeltaList;
 import com.android.contacts.util.ContactPhotoUtils;
 import com.android.contacts.util.UiClosables;
 
diff --git a/src/com/android/contacts/common/dialog/CallSubjectDialog.java b/src/com/android/contacts/dialog/CallSubjectDialog.java
similarity index 98%
rename from src/com/android/contacts/common/dialog/CallSubjectDialog.java
rename to src/com/android/contacts/dialog/CallSubjectDialog.java
index a17c4fc..b1a77de 100644
--- a/src/com/android/contacts/common/dialog/CallSubjectDialog.java
+++ b/src/com/android/contacts/dialog/CallSubjectDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.dialog;
+package com.android.contacts.dialog;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -47,10 +47,10 @@
 import com.android.contacts.common.CallUtil;
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.R;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.PhoneAccountSdkCompat;
-import com.android.contacts.common.compat.telecom.TelecomManagerCompat;
-import com.android.contacts.common.util.UriUtils;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.compat.PhoneAccountSdkCompat;
+import com.android.contacts.compat.telecom.TelecomManagerCompat;
+import com.android.contacts.util.UriUtils;
 import com.android.phone.common.animation.AnimUtils;
 
 import java.nio.charset.Charset;
diff --git a/src/com/android/contacts/common/dialog/ClearFrequentsDialog.java b/src/com/android/contacts/dialog/ClearFrequentsDialog.java
similarity index 96%
rename from src/com/android/contacts/common/dialog/ClearFrequentsDialog.java
rename to src/com/android/contacts/dialog/ClearFrequentsDialog.java
index 2fab3e1..70d766a 100644
--- a/src/com/android/contacts/common/dialog/ClearFrequentsDialog.java
+++ b/src/com/android/contacts/dialog/ClearFrequentsDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.dialog;
+package com.android.contacts.dialog;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -29,7 +29,7 @@
 import android.provider.ContactsContract;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.util.PermissionsUtil;
+import com.android.contacts.util.PermissionsUtil;
 
 /**
  * Dialog that clears the frequently contacted list after confirming with the user.
diff --git a/src/com/android/contacts/common/dialog/IndeterminateProgressDialog.java b/src/com/android/contacts/dialog/IndeterminateProgressDialog.java
similarity index 99%
rename from src/com/android/contacts/common/dialog/IndeterminateProgressDialog.java
rename to src/com/android/contacts/dialog/IndeterminateProgressDialog.java
index 2fe059f..21cd4bb 100644
--- a/src/com/android/contacts/common/dialog/IndeterminateProgressDialog.java
+++ b/src/com/android/contacts/dialog/IndeterminateProgressDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.dialog;
+package com.android.contacts.dialog;
 
 import android.app.Dialog;
 import android.app.DialogFragment;
diff --git a/src/com/android/contacts/editor/AccountHeaderPresenter.java b/src/com/android/contacts/editor/AccountHeaderPresenter.java
index 61a440f..c94dcd4 100644
--- a/src/com/android/contacts/editor/AccountHeaderPresenter.java
+++ b/src/com/android/contacts/editor/AccountHeaderPresenter.java
@@ -26,11 +26,11 @@
 import android.widget.TextView;
 
 import com.android.contacts.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountsListAdapter;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountsListAdapter;
 import com.android.contacts.util.UiClosables;
 
 import java.util.List;
diff --git a/src/com/android/contacts/editor/AggregationSuggestionEngine.java b/src/com/android/contacts/editor/AggregationSuggestionEngine.java
index 42776ff..aafcc96 100644
--- a/src/com/android/contacts/editor/AggregationSuggestionEngine.java
+++ b/src/com/android/contacts/editor/AggregationSuggestionEngine.java
@@ -38,8 +38,8 @@
 import android.provider.ContactsContract.RawContacts;
 import android.text.TextUtils;
 
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contacts.compat.AggregationSuggestionsCompat;
 
 import com.google.common.base.MoreObjects;
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 1a1295b..c01f815 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -64,21 +64,21 @@
 import com.android.contacts.activities.ContactEditorActivity.ContactEditor;
 import com.android.contacts.activities.ContactSelectionActivity;
 import com.android.contacts.common.Experiments;
-import com.android.contacts.common.logging.ScreenEvent.ScreenType;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.Contact;
-import com.android.contacts.common.model.ContactLoader;
-import com.android.contacts.common.model.RawContact;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.util.MaterialColorMapUtils;
+import com.android.contacts.logging.ScreenEvent.ScreenType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.Contact;
+import com.android.contacts.model.ContactLoader;
+import com.android.contacts.model.RawContact;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.ContactsPreferences;
+import com.android.contacts.util.ContactDisplayUtils;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.util.MaterialColorMapUtils;
 import com.android.contacts.editor.AggregationSuggestionEngine.Suggestion;
 import com.android.contacts.group.GroupUtil;
 import com.android.contacts.list.UiIntentActions;
diff --git a/src/com/android/contacts/editor/ContactEditorUtils.java b/src/com/android/contacts/editor/ContactEditorUtils.java
index 5b80b04..41e4cac 100644
--- a/src/com/android/contacts/editor/ContactEditorUtils.java
+++ b/src/com/android/contacts/editor/ContactEditorUtils.java
@@ -26,10 +26,10 @@
 import android.provider.ContactsContract;
 import android.text.TextUtils;
 
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.ContactsPreferences;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Sets;
 
diff --git a/src/com/android/contacts/editor/Editor.java b/src/com/android/contacts/editor/Editor.java
index d5c8589..711fbc0 100644
--- a/src/com/android/contacts/editor/Editor.java
+++ b/src/com/android/contacts/editor/Editor.java
@@ -18,9 +18,9 @@
 
 import android.provider.ContactsContract.Data;
 
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.dataitem.DataKind;
 
 /**
  * Generic definition of something that edits a {@link Data} row through an
diff --git a/src/com/android/contacts/editor/EditorIntents.java b/src/com/android/contacts/editor/EditorIntents.java
index b867b31..91648d0 100644
--- a/src/com/android/contacts/editor/EditorIntents.java
+++ b/src/com/android/contacts/editor/EditorIntents.java
@@ -25,8 +25,8 @@
 
 import com.android.contacts.activities.ContactEditorActivity;
 import com.android.contacts.activities.ContactEditorSpringBoardActivity;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.util.MaterialColorMapUtils.MaterialPalette;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/contacts/editor/EditorUiUtils.java b/src/com/android/contacts/editor/EditorUiUtils.java
index 83c59df..f7a4f36 100644
--- a/src/com/android/contacts/editor/EditorUiUtils.java
+++ b/src/com/android/contacts/editor/EditorUiUtils.java
@@ -43,10 +43,10 @@
 import com.android.contacts.common.ContactPhotoManager.DefaultImageProvider;
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.MaterialColorMapUtils.MaterialPalette;
+import com.android.contacts.model.account.AccountDisplayInfo;
 import com.android.contacts.util.ContactPhotoUtils;
 import com.android.contacts.widget.QuickContactImageView;
 import com.google.common.collect.Maps;
@@ -56,7 +56,7 @@
 
 import static android.provider.ContactsContract.CommonDataKinds.GroupMembership;
 import static android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import static com.android.contacts.common.util.MaterialColorMapUtils.getDefaultPrimaryAndSecondaryColors;
+import static com.android.contacts.util.MaterialColorMapUtils.getDefaultPrimaryAndSecondaryColors;
 
 /**
  * Utility methods for creating contact editor.
diff --git a/src/com/android/contacts/editor/EventFieldEditorView.java b/src/com/android/contacts/editor/EventFieldEditorView.java
index 8afcc0a..4c29330 100644
--- a/src/com/android/contacts/editor/EventFieldEditorView.java
+++ b/src/com/android/contacts/editor/EventFieldEditorView.java
@@ -20,7 +20,6 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Event;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -31,13 +30,13 @@
 import com.android.contacts.datepicker.DatePicker;
 import com.android.contacts.datepicker.DatePickerDialog;
 import com.android.contacts.datepicker.DatePickerDialog.OnDateSetListener;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType.EditField;
-import com.android.contacts.common.model.account.AccountType.EventEditType;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.CommonDateUtils;
-import com.android.contacts.common.util.DateUtils;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType.EditField;
+import com.android.contacts.model.account.AccountType.EventEditType;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.CommonDateUtils;
+import com.android.contacts.util.DateUtils;
 
 import java.text.ParsePosition;
 import java.util.Calendar;
diff --git a/src/com/android/contacts/editor/GroupMembershipView.java b/src/com/android/contacts/editor/GroupMembershipView.java
index a2bd2e9..cf51a05 100644
--- a/src/com/android/contacts/editor/GroupMembershipView.java
+++ b/src/com/android/contacts/editor/GroupMembershipView.java
@@ -39,12 +39,12 @@
 
 import com.android.contacts.GroupMetaDataLoader;
 import com.android.contacts.R;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.dataitem.DataKind;
 import com.android.contacts.group.GroupNameEditDialogFragment;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.RawContactModifier;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.RawContactModifier;
 import com.android.contacts.util.UiClosables;
 import com.google.common.base.Objects;
 
diff --git a/src/com/android/contacts/editor/KindSectionData.java b/src/com/android/contacts/editor/KindSectionData.java
index 03aa667..8ebae0a 100644
--- a/src/com/android/contacts/editor/KindSectionData.java
+++ b/src/com/android/contacts/editor/KindSectionData.java
@@ -18,11 +18,11 @@
 
 import android.text.TextUtils;
 
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountType.EditField;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountType.EditField;
+import com.android.contacts.model.dataitem.DataKind;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/contacts/editor/KindSectionView.java b/src/com/android/contacts/editor/KindSectionView.java
index 125a307..02eae11 100644
--- a/src/com/android/contacts/editor/KindSectionView.java
+++ b/src/com/android/contacts/editor/KindSectionView.java
@@ -31,11 +31,11 @@
 import android.widget.TextView;
 
 import com.android.contacts.R;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.dataitem.DataKind;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java
index 8b29b7e..9612874 100644
--- a/src/com/android/contacts/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -46,11 +46,11 @@
 
 import com.android.contacts.R;
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType.EditType;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType.EditType;
+import com.android.contacts.model.dataitem.DataKind;
 import com.android.contacts.util.DialogManager;
 import com.android.contacts.util.DialogManager.DialogShowingView;
 
diff --git a/src/com/android/contacts/editor/PhoneticNameEditorView.java b/src/com/android/contacts/editor/PhoneticNameEditorView.java
index 1c6f6a1..c96548c 100644
--- a/src/com/android/contacts/editor/PhoneticNameEditorView.java
+++ b/src/com/android/contacts/editor/PhoneticNameEditorView.java
@@ -22,11 +22,11 @@
 import android.util.AttributeSet;
 
 import com.android.contacts.R;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.model.dataitem.StructuredNameDataItem;
-import com.android.contacts.common.util.NameConverter;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.StructuredNameDataItem;
+import com.android.contacts.util.NameConverter;
 
 /**
  * A dedicated editor for phonetic name. It is similar to {@link StructuredNameEditorView}.
diff --git a/src/com/android/contacts/editor/PhotoEditorView.java b/src/com/android/contacts/editor/PhotoEditorView.java
index 1e727df..b4042a5 100644
--- a/src/com/android/contacts/editor/PhotoEditorView.java
+++ b/src/com/android/contacts/editor/PhotoEditorView.java
@@ -31,8 +31,8 @@
 
 import com.android.contacts.R;
 import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.util.MaterialColorMapUtils.MaterialPalette;
 import com.android.contacts.util.SchedulingUtils;
 import com.android.contacts.widget.QuickContactImageView;
 
diff --git a/src/com/android/contacts/editor/PickRawContactDialogFragment.java b/src/com/android/contacts/editor/PickRawContactDialogFragment.java
index 6d6d4d6..6da7202 100644
--- a/src/com/android/contacts/editor/PickRawContactDialogFragment.java
+++ b/src/com/android/contacts/editor/PickRawContactDialogFragment.java
@@ -19,15 +19,15 @@
 import com.android.contacts.R;
 import com.android.contacts.activities.ContactSelectionActivity;
 import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.logging.EditorEvent;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.account.GoogleAccountType;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.logging.EditorEvent;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.GoogleAccountType;
+import com.android.contacts.preference.ContactsPreferences;
 import com.android.contacts.editor.PickRawContactLoader.RawContact;
 import com.android.contacts.editor.PickRawContactLoader.RawContactsMetadata;
 import com.android.contacts.list.UiIntentActions;
diff --git a/src/com/android/contacts/editor/PickRawContactLoader.java b/src/com/android/contacts/editor/PickRawContactLoader.java
index 08bd02f..bc4fd87 100644
--- a/src/com/android/contacts/editor/PickRawContactLoader.java
+++ b/src/com/android/contacts/editor/PickRawContactLoader.java
@@ -13,8 +13,8 @@
 import android.provider.ContactsContract.Profile;
 import android.provider.ContactsContract.RawContacts;
 
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/com/android/contacts/editor/RawContactDeltaComparator.java b/src/com/android/contacts/editor/RawContactDeltaComparator.java
index 1a00c9d..b65f9da 100644
--- a/src/com/android/contacts/editor/RawContactDeltaComparator.java
+++ b/src/com/android/contacts/editor/RawContactDeltaComparator.java
@@ -16,10 +16,10 @@
 
 package com.android.contacts.editor;
 
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.GoogleAccountType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.GoogleAccountType;
 
 import android.content.Context;
 import android.provider.ContactsContract.RawContacts;
diff --git a/src/com/android/contacts/editor/RawContactEditorView.java b/src/com/android/contacts/editor/RawContactEditorView.java
index 3c142d6..43b7755 100644
--- a/src/com/android/contacts/editor/RawContactEditorView.java
+++ b/src/com/android/contacts/editor/RawContactEditorView.java
@@ -52,20 +52,20 @@
 
 import com.android.contacts.R;
 import com.android.contacts.common.GeoUtil;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.dataitem.CustomDataItem;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.AccountsListAdapter;
-import com.android.contacts.common.util.MaterialColorMapUtils;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.dataitem.CustomDataItem;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.AccountsListAdapter;
+import com.android.contacts.util.MaterialColorMapUtils;
 import com.android.contacts.util.UiClosables;
 
 import java.io.FileNotFoundException;
diff --git a/src/com/android/contacts/editor/SelectAccountDialogFragment.java b/src/com/android/contacts/editor/SelectAccountDialogFragment.java
index 4335239..2067f9f 100644
--- a/src/com/android/contacts/editor/SelectAccountDialogFragment.java
+++ b/src/com/android/contacts/editor/SelectAccountDialogFragment.java
@@ -27,9 +27,9 @@
 import android.widget.TextView;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountsListAdapter;
-import com.android.contacts.common.util.AccountsListAdapter.AccountListFilter;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountsListAdapter;
+import com.android.contacts.util.AccountsListAdapter.AccountListFilter;
 
 /**
  * Shows a dialog asking the user which account to chose.
diff --git a/src/com/android/contacts/editor/StructuredNameEditorView.java b/src/com/android/contacts/editor/StructuredNameEditorView.java
index 5aca809..0ede939 100644
--- a/src/com/android/contacts/editor/StructuredNameEditorView.java
+++ b/src/com/android/contacts/editor/StructuredNameEditorView.java
@@ -24,12 +24,12 @@
 import android.util.AttributeSet;
 
 import com.android.contacts.R;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.dataitem.DataItem;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.model.dataitem.StructuredNameDataItem;
-import com.android.contacts.common.util.NameConverter;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.dataitem.DataItem;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.StructuredNameDataItem;
+import com.android.contacts.util.NameConverter;
 
 /**
  * A dedicated editor for structured name.
diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java
index 6fd03bf..e3a7d3d 100644
--- a/src/com/android/contacts/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/editor/TextFieldsEditorView.java
@@ -41,12 +41,12 @@
 
 import com.android.contacts.R;
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType.EditField;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.PhoneNumberFormatter;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType.EditField;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.PhoneNumberFormatter;
 
 /**
  * Simple editor that handles labels and any {@link EditField} defined for the
diff --git a/src/com/android/contacts/editor/ViewIdGenerator.java b/src/com/android/contacts/editor/ViewIdGenerator.java
index ad99bf8..c4ba31c 100644
--- a/src/com/android/contacts/editor/ViewIdGenerator.java
+++ b/src/com/android/contacts/editor/ViewIdGenerator.java
@@ -20,9 +20,9 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.dataitem.DataKind;
 
 /**
  * A class that provides unique view ids for {@link ContentEditorView},
diff --git a/src/com/android/contacts/common/extensions/ExtendedPhoneDirectoriesManager.java b/src/com/android/contacts/extensions/ExtendedPhoneDirectoriesManager.java
similarity index 73%
rename from src/com/android/contacts/common/extensions/ExtendedPhoneDirectoriesManager.java
rename to src/com/android/contacts/extensions/ExtendedPhoneDirectoriesManager.java
index eb25934..2ee0eae 100644
--- a/src/com/android/contacts/common/extensions/ExtendedPhoneDirectoriesManager.java
+++ b/src/com/android/contacts/extensions/ExtendedPhoneDirectoriesManager.java
@@ -1,20 +1,20 @@
 // Copyright 2013 Google Inc. All Rights Reserved.
 
-package com.android.contacts.common.extensions;
+package com.android.contacts.extensions;
 
 import android.content.Context;
 
-import com.android.contacts.common.list.DirectoryPartition;
+import com.android.contacts.list.DirectoryPartition;
 
 import java.util.List;
 
 /**
  * An interface for adding extended phone directories to
- * {@link com.android.contacts.common.list.PhoneNumberListAdapter}.
+ * {@link com.android.contacts.list.PhoneNumberListAdapter}.
  * An app that wishes to add custom phone directories should implement this class and advertise it
  * in assets/contacts_extensions.properties. {@link ExtensionsFactory} will load the implementation
  * and the extended directories will be added by
- * {@link com.android.contacts.common.list.PhoneNumberListAdapter}.
+ * {@link com.android.contacts.list.PhoneNumberListAdapter}.
  */
 public interface ExtendedPhoneDirectoriesManager {
 
diff --git a/src/com/android/contacts/common/extensions/ExtensionsFactory.java b/src/com/android/contacts/extensions/ExtensionsFactory.java
similarity index 98%
rename from src/com/android/contacts/common/extensions/ExtensionsFactory.java
rename to src/com/android/contacts/extensions/ExtensionsFactory.java
index d52429e..33f9510 100644
--- a/src/com/android/contacts/common/extensions/ExtensionsFactory.java
+++ b/src/com/android/contacts/extensions/ExtensionsFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.extensions;
+package com.android.contacts.extensions;
 
 import android.content.Context;
 import android.util.Log;
diff --git a/src/com/android/contacts/common/format/FormatUtils.java b/src/com/android/contacts/format/FormatUtils.java
similarity index 98%
rename from src/com/android/contacts/common/format/FormatUtils.java
rename to src/com/android/contacts/format/FormatUtils.java
index 376ff13..c82e0d7 100644
--- a/src/com/android/contacts/common/format/FormatUtils.java
+++ b/src/com/android/contacts/format/FormatUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.format;
+package com.android.contacts.format;
 
 import android.database.CharArrayBuffer;
 import android.graphics.Typeface;
diff --git a/src/com/android/contacts/common/format/TextHighlighter.java b/src/com/android/contacts/format/TextHighlighter.java
similarity index 94%
rename from src/com/android/contacts/common/format/TextHighlighter.java
rename to src/com/android/contacts/format/TextHighlighter.java
index 496dcda..38c5c2d 100644
--- a/src/com/android/contacts/common/format/TextHighlighter.java
+++ b/src/com/android/contacts/format/TextHighlighter.java
@@ -14,17 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.format;
+package com.android.contacts.format;
 
-import android.graphics.Typeface;
 import android.text.SpannableString;
 import android.text.style.CharacterStyle;
-import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.widget.TextView;
 
-import com.google.common.base.Preconditions;
-
 /**
  * Highlights the text in a text field.
  */
diff --git a/src/com/android/contacts/group/GroupMembersAdapter.java b/src/com/android/contacts/group/GroupMembersAdapter.java
index c501984..bd50842 100644
--- a/src/com/android/contacts/group/GroupMembersAdapter.java
+++ b/src/com/android/contacts/group/GroupMembersAdapter.java
@@ -27,11 +27,10 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.R;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.list.MultiSelectEntryContactListAdapter;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.list.ContactListItemView;
+import com.android.contacts.list.MultiSelectEntryContactListAdapter;
+import com.android.contacts.preference.ContactsPreferences;
 
 /** Group members cursor adapter. */
 public class GroupMembersAdapter extends MultiSelectEntryContactListAdapter {
diff --git a/src/com/android/contacts/group/GroupMembersFragment.java b/src/com/android/contacts/group/GroupMembersFragment.java
index 44bda74..18c086f 100644
--- a/src/com/android/contacts/group/GroupMembersFragment.java
+++ b/src/com/android/contacts/group/GroupMembersFragment.java
@@ -50,14 +50,14 @@
 import com.android.contacts.R;
 import com.android.contacts.activities.ActionBarAdapter;
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.list.ContactsSectionIndexer;
-import com.android.contacts.common.list.MultiSelectEntryContactListAdapter.DeleteContactListener;
-import com.android.contacts.common.logging.ListEvent;
-import com.android.contacts.common.logging.ListEvent.ListType;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.logging.ScreenEvent;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.list.ContactsSectionIndexer;
+import com.android.contacts.list.MultiSelectEntryContactListAdapter.DeleteContactListener;
+import com.android.contacts.logging.ListEvent;
+import com.android.contacts.logging.ListEvent.ListType;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.logging.ScreenEvent;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.ImplicitIntentsUtil;
 import com.android.contacts.group.GroupMembersAdapter.GroupMembersQuery;
 import com.android.contacts.interactions.GroupDeletionDialogFragment;
 import com.android.contacts.list.ContactsRequest;
diff --git a/src/com/android/contacts/group/GroupMetaData.java b/src/com/android/contacts/group/GroupMetaData.java
index d9c0c27..4a8cb0f 100644
--- a/src/com/android/contacts/group/GroupMetaData.java
+++ b/src/com/android/contacts/group/GroupMetaData.java
@@ -25,8 +25,8 @@
 import android.text.TextUtils;
 
 import com.android.contacts.GroupMetaDataLoader;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
 
 import com.google.common.base.MoreObjects;
 
diff --git a/src/com/android/contacts/group/GroupNameEditDialogFragment.java b/src/com/android/contacts/group/GroupNameEditDialogFragment.java
index da76c68..a1eed97 100644
--- a/src/com/android/contacts/group/GroupNameEditDialogFragment.java
+++ b/src/com/android/contacts/group/GroupNameEditDialogFragment.java
@@ -41,7 +41,7 @@
 
 import com.android.contacts.ContactSaveService;
 import com.android.contacts.R;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
 import com.google.common.base.Strings;
 
 import java.util.Collections;
diff --git a/src/com/android/contacts/group/GroupUtil.java b/src/com/android/contacts/group/GroupUtil.java
index 3b79546..f577eab 100644
--- a/src/com/android/contacts/group/GroupUtil.java
+++ b/src/com/android/contacts/group/GroupUtil.java
@@ -31,8 +31,8 @@
 import com.android.contacts.GroupListLoader;
 import com.android.contacts.activities.ContactSelectionActivity;
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.list.ContactsSectionIndexer;
-import com.android.contacts.common.model.account.GoogleAccountType;
+import com.android.contacts.list.ContactsSectionIndexer;
+import com.android.contacts.model.account.GoogleAccountType;
 import com.android.contacts.list.UiIntentActions;
 
 import java.util.ArrayList;
diff --git a/src/com/android/contacts/interactions/AccountFiltersFragment.java b/src/com/android/contacts/interactions/AccountFiltersFragment.java
index 8d92327..e1d882e 100644
--- a/src/com/android/contacts/interactions/AccountFiltersFragment.java
+++ b/src/com/android/contacts/interactions/AccountFiltersFragment.java
@@ -21,8 +21,8 @@
 import android.content.Loader;
 import android.os.Bundle;
 
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.util.AccountFilterUtil;
+import com.android.contacts.list.ContactListFilter;
+import com.android.contacts.util.AccountFilterUtil;
 
 import java.util.List;
 
diff --git a/src/com/android/contacts/interactions/CalendarInteractionsLoader.java b/src/com/android/contacts/interactions/CalendarInteractionsLoader.java
index 4813866..977e869 100644
--- a/src/com/android/contacts/interactions/CalendarInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/CalendarInteractionsLoader.java
@@ -2,7 +2,7 @@
 
 import com.google.common.base.Preconditions;
 
-import com.android.contacts.common.util.PermissionsUtil;
+import com.android.contacts.util.PermissionsUtil;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/contacts/interactions/CallLogInteraction.java b/src/com/android/contacts/interactions/CallLogInteraction.java
index e207b29..40bd78e 100644
--- a/src/com/android/contacts/interactions/CallLogInteraction.java
+++ b/src/com/android/contacts/interactions/CallLogInteraction.java
@@ -17,9 +17,9 @@
 
 import com.android.contacts.R;
 import com.android.contacts.common.GeoUtil;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.util.BitmapUtil;
-import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.util.BitmapUtil;
+import com.android.contacts.util.ContactDisplayUtils;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
index 020d581..9c87a8e 100644
--- a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
@@ -28,8 +28,8 @@
 
 import com.google.common.annotations.VisibleForTesting;
 
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.util.PermissionsUtil;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.util.PermissionsUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
index 9b3d0f8..91ad93f 100644
--- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
@@ -38,10 +38,10 @@
 
 import com.android.contacts.ContactSaveService;
 import com.android.contacts.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.preference.ContactsPreferences;
+import com.android.contacts.util.ContactDisplayUtils;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Sets;
 
diff --git a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
index a649f2b..3d55619 100644
--- a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
@@ -16,14 +16,14 @@
 
 package com.android.contacts.interactions;
 
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.contacts.preference.ContactsPreferences;
+import com.android.contacts.util.ContactDisplayUtils;
 import com.google.common.collect.Sets;
 
 import com.android.contacts.ContactSaveService;
 import com.android.contacts.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/src/com/android/contacts/common/interactions/ExportDialogFragment.java b/src/com/android/contacts/interactions/ExportDialogFragment.java
similarity index 96%
rename from src/com/android/contacts/common/interactions/ExportDialogFragment.java
rename to src/com/android/contacts/interactions/ExportDialogFragment.java
index 3925833..772bc21 100644
--- a/src/com/android/contacts/common/interactions/ExportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ExportDialogFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.interactions;
+package com.android.contacts.interactions;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -39,10 +39,10 @@
 import android.widget.Toast;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.vcard.ExportVCardActivity;
-import com.android.contacts.common.vcard.ShareVCardActivity;
-import com.android.contacts.common.vcard.VCardCommonArguments;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.vcard.ExportVCardActivity;
+import com.android.contacts.vcard.ShareVCardActivity;
+import com.android.contacts.vcard.VCardCommonArguments;
 
 /**
  * An dialog invoked to import/export contacts.
diff --git a/src/com/android/contacts/common/interactions/ImportDialogFragment.java b/src/com/android/contacts/interactions/ImportDialogFragment.java
similarity index 94%
rename from src/com/android/contacts/common/interactions/ImportDialogFragment.java
rename to src/com/android/contacts/interactions/ImportDialogFragment.java
index 1b2c98d..ff9300a 100644
--- a/src/com/android/contacts/common/interactions/ImportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ImportDialogFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.interactions;
+package com.android.contacts.interactions;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -34,18 +34,17 @@
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import com.android.contacts.SimImportFragment;
 import com.android.contacts.activities.SimImportActivity;
 import com.android.contacts.common.R;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.database.SimContactDao;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.SimCard;
-import com.android.contacts.common.model.SimContact;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountSelectionUtil;
-import com.android.contacts.common.util.AccountsListAdapter.AccountListFilter;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.database.SimContactDao;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.SimCard;
+import com.android.contacts.model.SimContact;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountSelectionUtil;
+import com.android.contacts.util.AccountsListAdapter.AccountListFilter;
 import com.android.contacts.editor.SelectAccountDialogFragment;
 
 import java.util.List;
diff --git a/src/com/android/contacts/interactions/SmsInteraction.java b/src/com/android/contacts/interactions/SmsInteraction.java
index ba0070c..a18c6f1 100644
--- a/src/com/android/contacts/interactions/SmsInteraction.java
+++ b/src/com/android/contacts/interactions/SmsInteraction.java
@@ -16,7 +16,7 @@
 package com.android.contacts.interactions;
 
 import com.android.contacts.R;
-import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.contacts.util.ContactDisplayUtils;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/com/android/contacts/interactions/SmsInteractionsLoader.java b/src/com/android/contacts/interactions/SmsInteractionsLoader.java
index 5c7d5e3..1de7ca3 100644
--- a/src/com/android/contacts/interactions/SmsInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/SmsInteractionsLoader.java
@@ -24,7 +24,7 @@
 import android.provider.Telephony;
 import android.util.Log;
 
-import com.android.contacts.common.compat.TelephonyThreadsCompat;
+import com.android.contacts.compat.TelephonyThreadsCompat;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/contacts/common/interactions/TouchPointManager.java b/src/com/android/contacts/interactions/TouchPointManager.java
similarity index 95%
rename from src/com/android/contacts/common/interactions/TouchPointManager.java
rename to src/com/android/contacts/interactions/TouchPointManager.java
index 4c38e22..67387e5 100644
--- a/src/com/android/contacts/common/interactions/TouchPointManager.java
+++ b/src/com/android/contacts/interactions/TouchPointManager.java
@@ -1,4 +1,4 @@
-package com.android.contacts.common.interactions;
+package com.android.contacts.interactions;
 
 import android.graphics.Point;
 
diff --git a/src/com/android/contacts/common/lettertiles/LetterTileDrawable.java b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
similarity index 99%
rename from src/com/android/contacts/common/lettertiles/LetterTileDrawable.java
rename to src/com/android/contacts/lettertiles/LetterTileDrawable.java
index d1f1811..8f47d63 100644
--- a/src/com/android/contacts/common/lettertiles/LetterTileDrawable.java
+++ b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.lettertiles;
+package com.android.contacts.lettertiles;
 
 import android.content.res.Resources;
 import android.content.res.TypedArray;
diff --git a/src/com/android/contacts/common/list/AccountFilterActivity.java b/src/com/android/contacts/list/AccountFilterActivity.java
similarity index 98%
rename from src/com/android/contacts/common/list/AccountFilterActivity.java
rename to src/com/android/contacts/list/AccountFilterActivity.java
index 3908d18..1d42968 100644
--- a/src/com/android/contacts/common/list/AccountFilterActivity.java
+++ b/src/com/android/contacts/list/AccountFilterActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -30,7 +30,7 @@
 import android.widget.ListView;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.AccountTypeManager;
+import com.android.contacts.model.AccountTypeManager;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/contacts/common/list/AutoScrollListView.java b/src/com/android/contacts/list/AutoScrollListView.java
similarity index 98%
rename from src/com/android/contacts/common/list/AutoScrollListView.java
rename to src/com/android/contacts/list/AutoScrollListView.java
index d0070b5..f3bc7a2 100644
--- a/src/com/android/contacts/common/list/AutoScrollListView.java
+++ b/src/com/android/contacts/list/AutoScrollListView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Context;
 import android.os.Build;
diff --git a/src/com/android/contacts/list/ContactBrowseListFragment.java b/src/com/android/contacts/list/ContactBrowseListFragment.java
index bf4f891..8a6e081 100644
--- a/src/com/android/contacts/list/ContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/ContactBrowseListFragment.java
@@ -35,12 +35,7 @@
 import android.util.Log;
 
 import com.android.common.widget.CompositeCursorAdapter.Partition;
-import com.android.contacts.common.list.AutoScrollListView;
-import com.android.contacts.common.list.ContactListAdapter;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.DirectoryPartition;
-import com.android.contacts.common.logging.ListEvent.ListType;
-import com.android.contacts.common.util.ContactLoaderUtils;
+import com.android.contacts.util.ContactLoaderUtils;
 
 import java.util.List;
 
diff --git a/src/com/android/contacts/common/list/ContactEntry.java b/src/com/android/contacts/list/ContactEntry.java
similarity index 94%
rename from src/com/android/contacts/common/list/ContactEntry.java
rename to src/com/android/contacts/list/ContactEntry.java
index a29a8d8..18a44ca 100644
--- a/src/com/android/contacts/common/list/ContactEntry.java
+++ b/src/com/android/contacts/list/ContactEntry.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.provider.ContactsContract.PinnedPositions;
 import android.text.TextUtils;
 
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.preference.ContactsPreferences;
 
 /**
  * Class to hold contact information
diff --git a/src/com/android/contacts/common/list/ContactEntryListAdapter.java b/src/com/android/contacts/list/ContactEntryListAdapter.java
similarity index 98%
rename from src/com/android/contacts/common/list/ContactEntryListAdapter.java
rename to src/com/android/contacts/list/ContactEntryListAdapter.java
index 0d20d6e..6615d3a 100644
--- a/src/com/android/contacts/common/list/ContactEntryListAdapter.java
+++ b/src/com/android/contacts/list/ContactEntryListAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Context;
 import android.content.CursorLoader;
@@ -38,9 +38,9 @@
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.R;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.DirectoryCompat;
-import com.android.contacts.common.util.SearchUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.compat.DirectoryCompat;
+import com.android.contacts.util.SearchUtil;
 
 import java.util.HashSet;
 
diff --git a/src/com/android/contacts/common/list/ContactEntryListFragment.java b/src/com/android/contacts/list/ContactEntryListFragment.java
similarity index 99%
rename from src/com/android/contacts/common/list/ContactEntryListFragment.java
rename to src/com/android/contacts/list/ContactEntryListFragment.java
index 387b303..0b12be6 100644
--- a/src/com/android/contacts/common/list/ContactEntryListFragment.java
+++ b/src/com/android/contacts/list/ContactEntryListFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -48,9 +48,9 @@
 
 import com.android.common.widget.CompositeCursorAdapter.Partition;
 import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.logging.ListEvent.ActionType;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.logging.ListEvent.ActionType;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.preference.ContactsPreferences;
 
 import java.util.Locale;
 
diff --git a/src/com/android/contacts/common/list/ContactListAdapter.java b/src/com/android/contacts/list/ContactListAdapter.java
similarity index 98%
rename from src/com/android/contacts/common/list/ContactListAdapter.java
rename to src/com/android/contacts/list/ContactListAdapter.java
index 6294f47..f6a5c70 100644
--- a/src/com/android/contacts/common/list/ContactListAdapter.java
+++ b/src/com/android/contacts/list/ContactListAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -29,8 +29,8 @@
 
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.R;
-import com.android.contacts.common.compat.ContactsCompat;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.compat.ContactsCompat;
+import com.android.contacts.preference.ContactsPreferences;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/com/android/contacts/common/list/ContactListFilter.java b/src/com/android/contacts/list/ContactListFilter.java
similarity index 98%
rename from src/com/android/contacts/common/list/ContactListFilter.java
rename to src/com/android/contacts/list/ContactListFilter.java
index 5b7472d..850683c 100644
--- a/src/com/android/contacts/common/list/ContactListFilter.java
+++ b/src/com/android/contacts/list/ContactListFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.accounts.Account;
 import android.content.SharedPreferences;
@@ -25,9 +25,9 @@
 import android.provider.ContactsContract.RawContacts;
 import android.text.TextUtils;
 
-import com.android.contacts.common.logging.ListEvent;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.account.GoogleAccountType;
+import com.android.contacts.logging.ListEvent;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.GoogleAccountType;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/contacts/common/list/ContactListFilterController.java b/src/com/android/contacts/list/ContactListFilterController.java
similarity index 96%
rename from src/com/android/contacts/common/list/ContactListFilterController.java
rename to src/com/android/contacts/list/ContactListFilterController.java
index 4d3d6ad..3a4596d 100644
--- a/src/com/android/contacts/common/list/ContactListFilterController.java
+++ b/src/com/android/contacts/list/ContactListFilterController.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
-import com.android.contacts.common.logging.ListEvent;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.logging.ListEvent;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/contacts/common/list/ContactListFilterView.java b/src/com/android/contacts/list/ContactListFilterView.java
similarity index 96%
rename from src/com/android/contacts/common/list/ContactListFilterView.java
rename to src/com/android/contacts/list/ContactListFilterView.java
index 76e43aa..2378d2f 100644
--- a/src/com/android/contacts/common/list/ContactListFilterView.java
+++ b/src/com/android/contacts/list/ContactListFilterView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -27,8 +27,8 @@
 import android.widget.TextView;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
 
 /**
  * Contact list filter parameters.
diff --git a/src/com/android/contacts/common/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
similarity index 99%
rename from src/com/android/contacts/common/list/ContactListItemView.java
rename to src/com/android/contacts/list/ContactListItemView.java
index d20c6e8..e2834c2 100644
--- a/src/com/android/contacts/common/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -54,12 +54,12 @@
 import com.android.contacts.common.ContactPresenceIconUtil;
 import com.android.contacts.common.ContactStatusUtil;
 import com.android.contacts.common.R;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.format.TextHighlighter;
-import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.contacts.common.util.SearchUtil;
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.format.TextHighlighter;
+import com.android.contacts.util.ContactDisplayUtils;
+import com.android.contacts.util.SearchUtil;
+import com.android.contacts.util.ViewUtil;
 
 import com.google.common.collect.Lists;
 
diff --git a/src/com/android/contacts/common/list/ContactListPinnedHeaderView.java b/src/com/android/contacts/list/ContactListPinnedHeaderView.java
similarity index 98%
rename from src/com/android/contacts/common/list/ContactListPinnedHeaderView.java
rename to src/com/android/contacts/list/ContactListPinnedHeaderView.java
index c208bef..25aa1d6 100644
--- a/src/com/android/contacts/common/list/ContactListPinnedHeaderView.java
+++ b/src/com/android/contacts/list/ContactListPinnedHeaderView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/src/com/android/contacts/list/ContactPickerFragment.java b/src/com/android/contacts/list/ContactPickerFragment.java
index 4e81389..064e5b3 100644
--- a/src/com/android/contacts/list/ContactPickerFragment.java
+++ b/src/com/android/contacts/list/ContactPickerFragment.java
@@ -24,13 +24,7 @@
 import android.widget.AdapterView;
 
 import com.android.contacts.R;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactEntryListFragment;
-import com.android.contacts.common.list.ContactListAdapter;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.DirectoryListLoader;
-import com.android.contacts.common.list.ShortcutIntentBuilder;
-import com.android.contacts.common.list.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
+import com.android.contacts.list.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
 
 /**
  * Fragment for the contact list used for browsing contacts (as compared to
diff --git a/src/com/android/contacts/common/list/ContactTileAdapter.java b/src/com/android/contacts/list/ContactTileAdapter.java
similarity index 99%
rename from src/com/android/contacts/common/list/ContactTileAdapter.java
rename to src/com/android/contacts/list/ContactTileAdapter.java
index 6ce4efb..ebf62d1 100644
--- a/src/com/android/contacts/common/list/ContactTileAdapter.java
+++ b/src/com/android/contacts/list/ContactTileAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.ContentUris;
 import android.content.Context;
@@ -34,7 +34,7 @@
 import com.android.contacts.common.ContactTileLoaderFactory;
 import com.android.contacts.common.MoreContactUtils;
 import com.android.contacts.common.R;
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.util.ViewUtil;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/contacts/common/list/ContactTileFrequentView.java b/src/com/android/contacts/list/ContactTileFrequentView.java
similarity index 83%
rename from src/com/android/contacts/common/list/ContactTileFrequentView.java
rename to src/com/android/contacts/list/ContactTileFrequentView.java
index 7dcd0a1..41a972f 100644
--- a/src/com/android/contacts/common/list/ContactTileFrequentView.java
+++ b/src/com/android/contacts/list/ContactTileFrequentView.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Context;
 import android.util.AttributeSet;
 
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.util.ViewUtil;
 
 /**
- * A {@link com.android.contacts.common.list.ContactTileView} that is used for most frequently contacted in the People app
+ * A {@link com.android.contacts.list.ContactTileView} that is used for most frequently contacted in the People app
  */
 public class ContactTileFrequentView extends ContactTileView {
     public ContactTileFrequentView(Context context, AttributeSet attrs) {
diff --git a/src/com/android/contacts/common/list/ContactTilePhoneFrequentView.java b/src/com/android/contacts/list/ContactTilePhoneFrequentView.java
similarity index 93%
rename from src/com/android/contacts/common/list/ContactTilePhoneFrequentView.java
rename to src/com/android/contacts/list/ContactTilePhoneFrequentView.java
index aec93ab..a88cf99 100644
--- a/src/com/android/contacts/common/list/ContactTilePhoneFrequentView.java
+++ b/src/com/android/contacts/list/ContactTilePhoneFrequentView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -21,10 +21,10 @@
 import android.view.View;
 
 import com.android.contacts.common.MoreContactUtils;
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.util.ViewUtil;
 
 /**
- * A dark version of the {@link com.android.contacts.common.list.ContactTileView} that is used in Dialtacts
+ * A dark version of the {@link com.android.contacts.list.ContactTileView} that is used in Dialtacts
  * for frequently called contacts. Slightly different behavior from superclass...
  * when you tap it, you want to call the frequently-called number for the
  * contact, even if that is not the default number for that contact.
diff --git a/src/com/android/contacts/common/list/ContactTileStarredView.java b/src/com/android/contacts/list/ContactTileStarredView.java
similarity index 93%
rename from src/com/android/contacts/common/list/ContactTileStarredView.java
rename to src/com/android/contacts/list/ContactTileStarredView.java
index 59ef81e..2ee3460 100644
--- a/src/com/android/contacts/common/list/ContactTileStarredView.java
+++ b/src/com/android/contacts/list/ContactTileStarredView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
@@ -24,7 +24,7 @@
 /**
  * A {@link ContactTileStarredView} displays the contact's picture overlayed with their name
  * in a square. The actual dimensions are set by
- * {@link com.android.contacts.common.list.ContactTileAdapter.ContactTileRow}.
+ * {@link com.android.contacts.list.ContactTileAdapter.ContactTileRow}.
  */
 public class ContactTileStarredView extends ContactTileView {
 
diff --git a/src/com/android/contacts/common/list/ContactTileView.java b/src/com/android/contacts/list/ContactTileView.java
similarity index 98%
rename from src/com/android/contacts/common/list/ContactTileView.java
rename to src/com/android/contacts/list/ContactTileView.java
index 172d720..770d38e 100644
--- a/src/com/android/contacts/common/list/ContactTileView.java
+++ b/src/com/android/contacts/list/ContactTileView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -89,7 +89,7 @@
 
     /**
      * Populates the data members to be displayed from the
-     * fields in {@link com.android.contacts.common.list.ContactEntry}
+     * fields in {@link com.android.contacts.list.ContactEntry}
      */
     public void loadFromContact(ContactEntry entry) {
 
diff --git a/src/com/android/contacts/list/ContactsIntentResolver.java b/src/com/android/contacts/list/ContactsIntentResolver.java
index b110605..6c40f94 100644
--- a/src/com/android/contacts/list/ContactsIntentResolver.java
+++ b/src/com/android/contacts/list/ContactsIntentResolver.java
@@ -34,7 +34,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contacts.group.GroupUtil;
 
 /**
diff --git a/src/com/android/contacts/list/ContactsRequest.java b/src/com/android/contacts/list/ContactsRequest.java
index 70ce80d..f581b0a 100644
--- a/src/com/android/contacts/list/ContactsRequest.java
+++ b/src/com/android/contacts/list/ContactsRequest.java
@@ -18,7 +18,7 @@
 
 import android.net.Uri;
 
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/contacts/common/list/ContactsSectionIndexer.java b/src/com/android/contacts/list/ContactsSectionIndexer.java
similarity index 98%
rename from src/com/android/contacts/common/list/ContactsSectionIndexer.java
rename to src/com/android/contacts/list/ContactsSectionIndexer.java
index 031380d..9d20bfe 100644
--- a/src/com/android/contacts/common/list/ContactsSectionIndexer.java
+++ b/src/com/android/contacts/list/ContactsSectionIndexer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.text.TextUtils;
 import android.widget.SectionIndexer;
diff --git a/src/com/android/contacts/list/ContactsUnavailableFragment.java b/src/com/android/contacts/list/ContactsUnavailableFragment.java
index dd9cbab..76f3935 100644
--- a/src/com/android/contacts/list/ContactsUnavailableFragment.java
+++ b/src/com/android/contacts/list/ContactsUnavailableFragment.java
@@ -21,7 +21,6 @@
 import android.content.res.Configuration;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.provider.ContactsContract.ProviderStatus;
 import android.support.v4.content.ContextCompat;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -35,9 +34,9 @@
 import android.widget.TextView;
 
 import com.android.contacts.R;
-import com.android.contacts.common.compat.ProviderStatusCompat;
-import com.android.contacts.common.interactions.ImportDialogFragment;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.compat.ProviderStatusCompat;
+import com.android.contacts.interactions.ImportDialogFragment;
+import com.android.contacts.util.ImplicitIntentsUtil;
 
 /**
  * Fragment shown when contacts are unavailable. It contains provider status
diff --git a/src/com/android/contacts/common/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
similarity index 98%
rename from src/com/android/contacts/common/list/CustomContactListFilterActivity.java
rename to src/com/android/contacts/list/CustomContactListFilterActivity.java
index 157d0a8..67c664d 100644
--- a/src/com/android/contacts/common/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -56,17 +56,17 @@
 import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
 import android.widget.TextView;
 
-import com.android.contacts.common.model.account.AccountDisplayInfo;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.account.GoogleAccountType;
-import com.android.contacts.common.util.EmptyService;
-import com.android.contacts.common.util.LocalizedNameResolver;
-import com.android.contacts.common.util.WeakAsyncTask;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.GoogleAccountType;
+import com.android.contacts.util.EmptyService;
+import com.android.contacts.util.LocalizedNameResolver;
+import com.android.contacts.util.WeakAsyncTask;
 import com.google.common.collect.Lists;
 
 import java.util.ArrayList;
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index f7ae30d..c3d19fb 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -59,22 +59,14 @@
 import com.android.contacts.activities.ActionBarAdapter;
 import com.android.contacts.activities.PeopleActivity;
 import com.android.contacts.common.Experiments;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.list.ContactEntryListFragment;
-import com.android.contacts.common.list.ContactListAdapter;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.ContactListFilterController;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.list.DefaultContactListAdapter;
-import com.android.contacts.common.list.DirectoryListLoader;
-import com.android.contacts.common.list.FavoritesAndContactsLoader;
-import com.android.contacts.common.logging.ListEvent;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.logging.ScreenEvent;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountFilterUtil;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.logging.ListEvent;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.logging.ScreenEvent;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountFilterUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
 import com.android.contacts.interactions.ContactDeletionInteraction;
 import com.android.contacts.interactions.ContactMultiDeletionInteraction;
 import com.android.contacts.interactions.ContactMultiDeletionInteraction.MultiContactDeleteListener;
diff --git a/src/com/android/contacts/common/list/DefaultContactListAdapter.java b/src/com/android/contacts/list/DefaultContactListAdapter.java
similarity index 97%
rename from src/com/android/contacts/common/list/DefaultContactListAdapter.java
rename to src/com/android/contacts/list/DefaultContactListAdapter.java
index 5827930..bc76331 100644
--- a/src/com/android/contacts/common/list/DefaultContactListAdapter.java
+++ b/src/com/android/contacts/list/DefaultContactListAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.ContentUris;
 import android.content.Context;
@@ -31,11 +31,9 @@
 import android.text.TextUtils;
 import android.view.View;
 
-import com.android.contacts.common.Experiments;
-import com.android.contacts.common.compat.ContactsCompat;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contactsbind.experiments.Flags;
+import com.android.contacts.compat.ContactsCompat;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.ContactsPreferences;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/contacts/common/list/DirectoryListLoader.java b/src/com/android/contacts/list/DirectoryListLoader.java
similarity index 97%
rename from src/com/android/contacts/common/list/DirectoryListLoader.java
rename to src/com/android/contacts/list/DirectoryListLoader.java
index 13d0f92..d8ab256 100644
--- a/src/com/android/contacts/common/list/DirectoryListLoader.java
+++ b/src/com/android/contacts/list/DirectoryListLoader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.AsyncTaskLoader;
 import android.content.Context;
@@ -23,14 +23,12 @@
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.os.Handler;
-import android.provider.ContactsContract;
 import android.provider.ContactsContract.Directory;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.R;
-import com.android.contacts.common.compat.DirectoryCompat;
+import com.android.contacts.compat.DirectoryCompat;
 
 /**
  * A specialized loader for the list of directories, see {@link Directory}.
diff --git a/src/com/android/contacts/common/list/DirectoryPartition.java b/src/com/android/contacts/list/DirectoryPartition.java
similarity index 97%
rename from src/com/android/contacts/common/list/DirectoryPartition.java
rename to src/com/android/contacts/list/DirectoryPartition.java
index ca0dc11..bf0456b 100644
--- a/src/com/android/contacts/common/list/DirectoryPartition.java
+++ b/src/com/android/contacts/list/DirectoryPartition.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.provider.ContactsContract.Directory;
 
@@ -117,7 +117,7 @@
     /**
      * Max number of results for this directory. Defaults to {@link #RESULT_LIMIT_DEFAULT} which
      * implies using the adapter's
-     * {@link com.android.contacts.common.list.ContactListAdapter#getDirectoryResultLimit()}
+     * {@link com.android.contacts.list.ContactListAdapter#getDirectoryResultLimit()}
      */
     public int getResultLimit() {
         return mResultLimit;
diff --git a/src/com/android/contacts/list/EmailAddressListAdapter.java b/src/com/android/contacts/list/EmailAddressListAdapter.java
index d19f960..65505ba 100644
--- a/src/com/android/contacts/list/EmailAddressListAdapter.java
+++ b/src/com/android/contacts/list/EmailAddressListAdapter.java
@@ -29,9 +29,7 @@
 import android.view.ViewGroup;
 
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.preference.ContactsPreferences;
 
 /**
  * A cursor adapter for the {@link Email#CONTENT_TYPE} content type.
diff --git a/src/com/android/contacts/list/EmailAddressPickerFragment.java b/src/com/android/contacts/list/EmailAddressPickerFragment.java
index f89f743..7dcc766 100644
--- a/src/com/android/contacts/list/EmailAddressPickerFragment.java
+++ b/src/com/android/contacts/list/EmailAddressPickerFragment.java
@@ -21,9 +21,6 @@
 import android.view.ViewGroup;
 
 import com.android.contacts.R;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactEntryListFragment;
-import com.android.contacts.common.list.DirectoryListLoader;
 
 /**
  * Fragment containing an email list for picking.
diff --git a/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java b/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java
index 46df4ae..08822d1 100644
--- a/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java
+++ b/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java
@@ -23,7 +23,6 @@
 import android.os.Bundle;
 
 import com.android.contacts.R;
-import com.android.contacts.common.list.ContactListFilter;
 
 /**
  * Confirmation dialog for turning global auto-sync setting on.
diff --git a/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java b/src/com/android/contacts/list/FavoritesAndContactsLoader.java
similarity index 98%
rename from src/com/android/contacts/common/list/FavoritesAndContactsLoader.java
rename to src/com/android/contacts/list/FavoritesAndContactsLoader.java
index 25dd711..54e5f3f 100644
--- a/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java
+++ b/src/com/android/contacts/list/FavoritesAndContactsLoader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Context;
 import android.content.CursorLoader;
diff --git a/src/com/android/contacts/list/GroupMemberPickerFragment.java b/src/com/android/contacts/list/GroupMemberPickerFragment.java
index a7e37d7..83184ec 100644
--- a/src/com/android/contacts/list/GroupMemberPickerFragment.java
+++ b/src/com/android/contacts/list/GroupMemberPickerFragment.java
@@ -31,11 +31,8 @@
 
 import com.android.contacts.activities.ContactSelectionActivity;
 import com.android.contacts.common.R;
-import com.android.contacts.common.list.ContactListAdapter.ContactQuery;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.ContactsSectionIndexer;
-import com.android.contacts.common.list.DefaultContactListAdapter;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.list.ContactListAdapter.ContactQuery;
+import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contacts.group.GroupUtil;
 
 import java.util.ArrayList;
diff --git a/src/com/android/contacts/list/HeaderEntryContactListAdapter.java b/src/com/android/contacts/list/HeaderEntryContactListAdapter.java
index 9822b79..1ecba14 100644
--- a/src/com/android/contacts/list/HeaderEntryContactListAdapter.java
+++ b/src/com/android/contacts/list/HeaderEntryContactListAdapter.java
@@ -16,8 +16,6 @@
 package com.android.contacts.list;
 
 import com.android.contacts.R;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.list.DefaultContactListAdapter;
 
 import android.content.Context;
 import android.database.Cursor;
diff --git a/src/com/android/contacts/common/list/IndexerListAdapter.java b/src/com/android/contacts/list/IndexerListAdapter.java
similarity index 99%
rename from src/com/android/contacts/common/list/IndexerListAdapter.java
rename to src/com/android/contacts/list/IndexerListAdapter.java
index 032bb53..b4ac2b4 100644
--- a/src/com/android/contacts/common/list/IndexerListAdapter.java
+++ b/src/com/android/contacts/list/IndexerListAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Context;
 import android.view.View;
diff --git a/src/com/android/contacts/list/JoinContactListAdapter.java b/src/com/android/contacts/list/JoinContactListAdapter.java
index f08fcbb..82da6f7 100644
--- a/src/com/android/contacts/list/JoinContactListAdapter.java
+++ b/src/com/android/contacts/list/JoinContactListAdapter.java
@@ -31,10 +31,7 @@
 import android.widget.TextView;
 
 import com.android.contacts.R;
-import com.android.contacts.common.list.ContactListAdapter;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.list.DirectoryListLoader;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.preference.ContactsPreferences;
 
 public class JoinContactListAdapter extends ContactListAdapter {
 
diff --git a/src/com/android/contacts/list/JoinContactListFragment.java b/src/com/android/contacts/list/JoinContactListFragment.java
index d827eb5..853323b 100644
--- a/src/com/android/contacts/list/JoinContactListFragment.java
+++ b/src/com/android/contacts/list/JoinContactListFragment.java
@@ -32,9 +32,7 @@
 import android.widget.TextView;
 
 import com.android.contacts.R;
-import com.android.contacts.common.list.ContactEntryListFragment;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.logging.ListEvent;
+import com.android.contacts.logging.ListEvent;
 import com.android.contacts.list.JoinContactLoader.JoinContactLoaderResult;
 
 /**
diff --git a/src/com/android/contacts/list/LegacyContactListAdapter.java b/src/com/android/contacts/list/LegacyContactListAdapter.java
index 837991b..a2f98de 100644
--- a/src/com/android/contacts/list/LegacyContactListAdapter.java
+++ b/src/com/android/contacts/list/LegacyContactListAdapter.java
@@ -24,9 +24,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactListItemView;
-
 /**
  * A cursor adapter for the People.CONTENT_TYPE content type.
  */
diff --git a/src/com/android/contacts/list/LegacyPhoneNumberListAdapter.java b/src/com/android/contacts/list/LegacyPhoneNumberListAdapter.java
index b5c96df..63df215 100644
--- a/src/com/android/contacts/list/LegacyPhoneNumberListAdapter.java
+++ b/src/com/android/contacts/list/LegacyPhoneNumberListAdapter.java
@@ -26,9 +26,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactListItemView;
-
 /**
  * A cursor adapter for the Phones.CONTENT_TYPE content type.
  */
diff --git a/src/com/android/contacts/list/LegacyPhoneNumberPickerFragment.java b/src/com/android/contacts/list/LegacyPhoneNumberPickerFragment.java
index 5b6e11f..10d189c 100644
--- a/src/com/android/contacts/list/LegacyPhoneNumberPickerFragment.java
+++ b/src/com/android/contacts/list/LegacyPhoneNumberPickerFragment.java
@@ -19,10 +19,6 @@
 import android.net.Uri;
 import android.util.Log;
 
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.list.PhoneNumberPickerFragment;
-
 /**
  * Version of PhoneNumberPickerFragment used specifically for legacy support.
  */
diff --git a/src/com/android/contacts/list/LegacyPostalAddressListAdapter.java b/src/com/android/contacts/list/LegacyPostalAddressListAdapter.java
index 4c598cd..c3fa57d 100644
--- a/src/com/android/contacts/list/LegacyPostalAddressListAdapter.java
+++ b/src/com/android/contacts/list/LegacyPostalAddressListAdapter.java
@@ -26,9 +26,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactListItemView;
-
 /**
  * A cursor adapter for the ContactMethods.CONTENT_TYPE content type.
  */
diff --git a/src/com/android/contacts/list/MultiSelectContactsListFragment.java b/src/com/android/contacts/list/MultiSelectContactsListFragment.java
index 7a6a64a..265ee2a 100644
--- a/src/com/android/contacts/list/MultiSelectContactsListFragment.java
+++ b/src/com/android/contacts/list/MultiSelectContactsListFragment.java
@@ -35,16 +35,14 @@
 
 import com.android.contacts.R;
 import com.android.contacts.activities.ActionBarAdapter;
-import com.android.contacts.common.list.ContactEntryListFragment;
-import com.android.contacts.common.list.MultiSelectEntryContactListAdapter;
-import com.android.contacts.common.list.MultiSelectEntryContactListAdapter.SelectedContactsListener;
-import com.android.contacts.common.logging.ListEvent.ActionType;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.logging.SearchState;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.account.GoogleAccountType;
+import com.android.contacts.list.MultiSelectEntryContactListAdapter.SelectedContactsListener;
+import com.android.contacts.logging.ListEvent.ActionType;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.logging.SearchState;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.GoogleAccountType;
 import com.android.contacts.group.GroupMembersFragment;
 
 import java.util.ArrayList;
diff --git a/src/com/android/contacts/list/MultiSelectEmailAddressesListAdapter.java b/src/com/android/contacts/list/MultiSelectEmailAddressesListAdapter.java
index 7f4bb4b..cbea3bc 100644
--- a/src/com/android/contacts/list/MultiSelectEmailAddressesListAdapter.java
+++ b/src/com/android/contacts/list/MultiSelectEmailAddressesListAdapter.java
@@ -29,10 +29,7 @@
 
 import android.provider.ContactsContract.CommonDataKinds.Email;
 
-import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.list.MultiSelectEntryContactListAdapter;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.preference.ContactsPreferences;
 import com.android.contacts.group.GroupUtil;
 
 /** Email addresses multi-select cursor adapter. */
diff --git a/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java b/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java
index 64489a0..7651f3a 100644
--- a/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java
+++ b/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java
@@ -26,7 +26,7 @@
 import android.view.ViewGroup;
 
 import com.android.contacts.R;
-import com.android.contacts.common.logging.ListEvent;
+import com.android.contacts.logging.ListEvent;
 import com.android.contacts.group.GroupUtil;
 
 import java.util.List;
diff --git a/src/com/android/contacts/common/list/MultiSelectEntryContactListAdapter.java b/src/com/android/contacts/list/MultiSelectEntryContactListAdapter.java
similarity index 99%
rename from src/com/android/contacts/common/list/MultiSelectEntryContactListAdapter.java
rename to src/com/android/contacts/list/MultiSelectEntryContactListAdapter.java
index efba9ca..fe493b6 100644
--- a/src/com/android/contacts/common/list/MultiSelectEntryContactListAdapter.java
+++ b/src/com/android/contacts/list/MultiSelectEntryContactListAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Context;
 import android.database.Cursor;
diff --git a/src/com/android/contacts/list/MultiSelectPhoneNumbersListAdapter.java b/src/com/android/contacts/list/MultiSelectPhoneNumbersListAdapter.java
index 6bf6d5e..2df2e73 100644
--- a/src/com/android/contacts/list/MultiSelectPhoneNumbersListAdapter.java
+++ b/src/com/android/contacts/list/MultiSelectPhoneNumbersListAdapter.java
@@ -29,10 +29,7 @@
 
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 
-import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.list.MultiSelectEntryContactListAdapter;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.preference.ContactsPreferences;
 import com.android.contacts.group.GroupUtil;
 
 /** Phone Numbers multi-select cursor adapter. */
diff --git a/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java b/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java
index 96a1de6..4484303 100644
--- a/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java
+++ b/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java
@@ -26,7 +26,7 @@
 import android.view.ViewGroup;
 
 import com.android.contacts.R;
-import com.android.contacts.common.logging.ListEvent;
+import com.android.contacts.logging.ListEvent;
 import com.android.contacts.group.GroupUtil;
 
 import java.util.List;
diff --git a/src/com/android/contacts/common/list/OnPhoneNumberPickerActionListener.java b/src/com/android/contacts/list/OnPhoneNumberPickerActionListener.java
similarity index 97%
rename from src/com/android/contacts/common/list/OnPhoneNumberPickerActionListener.java
rename to src/com/android/contacts/list/OnPhoneNumberPickerActionListener.java
index fe23054..616562c 100644
--- a/src/com/android/contacts/common/list/OnPhoneNumberPickerActionListener.java
+++ b/src/com/android/contacts/list/OnPhoneNumberPickerActionListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.app.ActionBar;
 import android.content.Intent;
diff --git a/src/com/android/contacts/common/list/PhoneNumberListAdapter.java b/src/com/android/contacts/list/PhoneNumberListAdapter.java
similarity index 97%
rename from src/com/android/contacts/common/list/PhoneNumberListAdapter.java
rename to src/com/android/contacts/list/PhoneNumberListAdapter.java
index 348cac2..0f46f92 100644
--- a/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
+++ b/src/com/android/contacts/list/PhoneNumberListAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.ContentUris;
 import android.content.Context;
@@ -38,14 +38,14 @@
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.GeoUtil;
 import com.android.contacts.common.R;
-import com.android.contacts.common.compat.CallableCompat;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.DirectoryCompat;
-import com.android.contacts.common.compat.PhoneCompat;
-import com.android.contacts.common.extensions.ExtendedPhoneDirectoriesManager;
-import com.android.contacts.common.extensions.ExtensionsFactory;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.Constants;
+import com.android.contacts.compat.CallableCompat;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.compat.DirectoryCompat;
+import com.android.contacts.compat.PhoneCompat;
+import com.android.contacts.extensions.ExtendedPhoneDirectoriesManager;
+import com.android.contacts.extensions.ExtensionsFactory;
+import com.android.contacts.preference.ContactsPreferences;
+import com.android.contacts.util.Constants;
 
 import com.google.common.collect.Lists;
 
diff --git a/src/com/android/contacts/common/list/PhoneNumberPickerFragment.java b/src/com/android/contacts/list/PhoneNumberPickerFragment.java
similarity index 98%
rename from src/com/android/contacts/common/list/PhoneNumberPickerFragment.java
rename to src/com/android/contacts/list/PhoneNumberPickerFragment.java
index bbbd794..e0d9e22 100644
--- a/src/com/android/contacts/common/list/PhoneNumberPickerFragment.java
+++ b/src/com/android/contacts/list/PhoneNumberPickerFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Intent;
 import android.content.Loader;
@@ -28,7 +28,7 @@
 import android.view.ViewGroup;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.list.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
+import com.android.contacts.list.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
 
 /**
  * Fragment containing a phone number list for picking.
diff --git a/src/com/android/contacts/common/list/PinnedHeaderListAdapter.java b/src/com/android/contacts/list/PinnedHeaderListAdapter.java
similarity index 98%
rename from src/com/android/contacts/common/list/PinnedHeaderListAdapter.java
rename to src/com/android/contacts/list/PinnedHeaderListAdapter.java
index 72f3f19..6a76421 100644
--- a/src/com/android/contacts/common/list/PinnedHeaderListAdapter.java
+++ b/src/com/android/contacts/list/PinnedHeaderListAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Context;
 import android.view.View;
diff --git a/src/com/android/contacts/common/list/PinnedHeaderListView.java b/src/com/android/contacts/list/PinnedHeaderListView.java
similarity index 99%
rename from src/com/android/contacts/common/list/PinnedHeaderListView.java
rename to src/com/android/contacts/list/PinnedHeaderListView.java
index b68ff1f..01895c7 100644
--- a/src/com/android/contacts/common/list/PinnedHeaderListView.java
+++ b/src/com/android/contacts/list/PinnedHeaderListView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -30,7 +30,7 @@
 import android.widget.ListAdapter;
 import android.widget.TextView;
 
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.util.ViewUtil;
 
 /**
  * A ListView that maintains a header pinned at the top of the list. The
diff --git a/src/com/android/contacts/list/PostalAddressListAdapter.java b/src/com/android/contacts/list/PostalAddressListAdapter.java
index 951a933..387369b 100644
--- a/src/com/android/contacts/list/PostalAddressListAdapter.java
+++ b/src/com/android/contacts/list/PostalAddressListAdapter.java
@@ -28,9 +28,7 @@
 import android.view.ViewGroup;
 
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.preference.ContactsPreferences;
 
 /**
  * A cursor adapter for the {@link StructuredPostal#CONTENT_TYPE} content type.
diff --git a/src/com/android/contacts/list/PostalAddressPickerFragment.java b/src/com/android/contacts/list/PostalAddressPickerFragment.java
index c64e173..c2aacee 100644
--- a/src/com/android/contacts/list/PostalAddressPickerFragment.java
+++ b/src/com/android/contacts/list/PostalAddressPickerFragment.java
@@ -21,9 +21,6 @@
 import android.view.ViewGroup;
 
 import com.android.contacts.R;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactEntryListFragment;
-import com.android.contacts.common.list.DirectoryListLoader;
 
 /**
  * Fragment containing a postal address list for picking.
diff --git a/src/com/android/contacts/common/list/ProviderStatusWatcher.java b/src/com/android/contacts/list/ProviderStatusWatcher.java
similarity index 98%
rename from src/com/android/contacts/common/list/ProviderStatusWatcher.java
rename to src/com/android/contacts/list/ProviderStatusWatcher.java
index af36db3..86afb44 100644
--- a/src/com/android/contacts/common/list/ProviderStatusWatcher.java
+++ b/src/com/android/contacts/list/ProviderStatusWatcher.java
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
-import android.content.ContentValues;
 import android.content.Context;
 import android.database.ContentObserver;
 import android.database.Cursor;
@@ -25,7 +24,7 @@
 import android.provider.ContactsContract.ProviderStatus;
 import android.util.Log;
 
-import com.android.contacts.common.compat.ProviderStatusCompat;
+import com.android.contacts.compat.ProviderStatusCompat;
 
 import com.android.contactsbind.FeedbackHelper;
 
diff --git a/src/com/android/contacts/common/list/ShortcutIntentBuilder.java b/src/com/android/contacts/list/ShortcutIntentBuilder.java
similarity index 98%
rename from src/com/android/contacts/common/list/ShortcutIntentBuilder.java
rename to src/com/android/contacts/list/ShortcutIntentBuilder.java
index e230996..57f6228 100644
--- a/src/com/android/contacts/common/list/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/list/ShortcutIntentBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.list;
+package com.android.contacts.list;
 
 import android.app.ActivityManager;
 import android.content.ContentResolver;
@@ -31,7 +31,6 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.CommonDataKinds.Photo;
 import android.provider.ContactsContract.Contacts;
@@ -47,7 +46,7 @@
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.R;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
 
 /**
  * Constructs shortcut intents.
diff --git a/src/com/android/contacts/common/location/CountryDetector.java b/src/com/android/contacts/location/CountryDetector.java
similarity index 98%
rename from src/com/android/contacts/common/location/CountryDetector.java
rename to src/com/android/contacts/location/CountryDetector.java
index bceadc4..9d08fc0 100644
--- a/src/com/android/contacts/common/location/CountryDetector.java
+++ b/src/com/android/contacts/location/CountryDetector.java
@@ -1,9 +1,8 @@
-package com.android.contacts.common.location;
+package com.android.contacts.location;
 
 import android.content.Context;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
-import android.util.Log;
 
 import java.util.Locale;
 
diff --git a/src/com/android/contacts/common/logging/EditorEvent.java b/src/com/android/contacts/logging/EditorEvent.java
similarity index 96%
rename from src/com/android/contacts/common/logging/EditorEvent.java
rename to src/com/android/contacts/logging/EditorEvent.java
index e5b42f8..48308ac 100644
--- a/src/com/android/contacts/common/logging/EditorEvent.java
+++ b/src/com/android/contacts/logging/EditorEvent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.logging;
+package com.android.contacts.logging;
 
 import com.google.common.base.MoreObjects;
 
diff --git a/src/com/android/contacts/common/logging/ListEvent.java b/src/com/android/contacts/logging/ListEvent.java
similarity index 98%
rename from src/com/android/contacts/common/logging/ListEvent.java
rename to src/com/android/contacts/logging/ListEvent.java
index 47979bf..50da98f 100644
--- a/src/com/android/contacts/common/logging/ListEvent.java
+++ b/src/com/android/contacts/logging/ListEvent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.logging;
+package com.android.contacts.logging;
 
 import com.google.common.base.MoreObjects;
 
diff --git a/src/com/android/contacts/common/logging/Logger.java b/src/com/android/contacts/logging/Logger.java
similarity index 97%
rename from src/com/android/contacts/common/logging/Logger.java
rename to src/com/android/contacts/logging/Logger.java
index cb75ca9..366c19b 100644
--- a/src/com/android/contacts/common/logging/Logger.java
+++ b/src/com/android/contacts/logging/Logger.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.logging;
+package com.android.contacts.logging;
 
 import android.app.Activity;
 
-import com.android.contacts.common.logging.ScreenEvent.ScreenType;
+import com.android.contacts.logging.ScreenEvent.ScreenType;
 import com.android.contactsbind.ObjectFactory;
 
 /**
diff --git a/src/com/android/contacts/common/logging/QuickContactEvent.java b/src/com/android/contacts/logging/QuickContactEvent.java
similarity index 98%
rename from src/com/android/contacts/common/logging/QuickContactEvent.java
rename to src/com/android/contacts/logging/QuickContactEvent.java
index f19646f..05d7308 100644
--- a/src/com/android/contacts/common/logging/QuickContactEvent.java
+++ b/src/com/android/contacts/logging/QuickContactEvent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.logging;
+package com.android.contacts.logging;
 
 import com.google.common.base.MoreObjects;
 
diff --git a/src/com/android/contacts/common/logging/ScreenEvent.java b/src/com/android/contacts/logging/ScreenEvent.java
similarity index 96%
rename from src/com/android/contacts/common/logging/ScreenEvent.java
rename to src/com/android/contacts/logging/ScreenEvent.java
index 6af020b..9edcbc7 100644
--- a/src/com/android/contacts/common/logging/ScreenEvent.java
+++ b/src/com/android/contacts/logging/ScreenEvent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.logging;
+package com.android.contacts.logging;
 
 /**
  * Stores constants identifying individual screens/dialogs/fragments in the application, and also
diff --git a/src/com/android/contacts/common/logging/SearchState.java b/src/com/android/contacts/logging/SearchState.java
similarity index 98%
rename from src/com/android/contacts/common/logging/SearchState.java
rename to src/com/android/contacts/logging/SearchState.java
index d1224b4..8b1872d 100644
--- a/src/com/android/contacts/common/logging/SearchState.java
+++ b/src/com/android/contacts/logging/SearchState.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.logging;
+package com.android.contacts.logging;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/src/com/android/contacts/common/model/AccountTypeManager.java b/src/com/android/contacts/model/AccountTypeManager.java
similarity index 97%
rename from src/com/android/contacts/common/model/AccountTypeManager.java
rename to src/com/android/contacts/model/AccountTypeManager.java
index f4cb428..3687752 100644
--- a/src/com/android/contacts/common/model/AccountTypeManager.java
+++ b/src/com/android/contacts/model/AccountTypeManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model;
+package com.android.contacts.model;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -47,18 +47,18 @@
 import com.android.contacts.R;
 import com.android.contacts.common.Experiments;
 import com.android.contacts.common.MoreContactUtils;
-import com.android.contacts.common.list.ContactListFilterController;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountTypeWithDataSet;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.account.ExchangeAccountType;
-import com.android.contacts.common.model.account.ExternalAccountType;
-import com.android.contacts.common.model.account.FallbackAccountType;
-import com.android.contacts.common.model.account.GoogleAccountType;
-import com.android.contacts.common.model.account.SamsungAccountType;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.Constants;
-import com.android.contacts.common.util.DeviceLocalAccountTypeFactory;
+import com.android.contacts.list.ContactListFilterController;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountTypeWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.ExchangeAccountType;
+import com.android.contacts.model.account.ExternalAccountType;
+import com.android.contacts.model.account.FallbackAccountType;
+import com.android.contacts.model.account.GoogleAccountType;
+import com.android.contacts.model.account.SamsungAccountType;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.Constants;
+import com.android.contacts.util.DeviceLocalAccountTypeFactory;
 import com.android.contactsbind.ObjectFactory;
 import com.android.contactsbind.experiments.Flags;
 import com.google.common.annotations.VisibleForTesting;
@@ -82,7 +82,7 @@
 
 import javax.annotation.Nullable;
 
-import static com.android.contacts.common.util.DeviceLocalAccountTypeFactory.Util.isLocalAccountType;
+import static com.android.contacts.util.DeviceLocalAccountTypeFactory.Util.isLocalAccountType;
 
 /**
  * Singleton holder for all parsed {@link AccountType} available on the
diff --git a/src/com/android/contacts/common/model/BuilderWrapper.java b/src/com/android/contacts/model/BuilderWrapper.java
similarity index 97%
rename from src/com/android/contacts/common/model/BuilderWrapper.java
rename to src/com/android/contacts/model/BuilderWrapper.java
index 325c3df..4a96c36 100644
--- a/src/com/android/contacts/common/model/BuilderWrapper.java
+++ b/src/com/android/contacts/model/BuilderWrapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model;
+package com.android.contacts.model;
 
 import android.content.ContentProviderOperation.Builder;
 
diff --git a/src/com/android/contacts/common/model/CPOWrapper.java b/src/com/android/contacts/model/CPOWrapper.java
similarity index 96%
rename from src/com/android/contacts/common/model/CPOWrapper.java
rename to src/com/android/contacts/model/CPOWrapper.java
index 4124df8..12e00dd 100644
--- a/src/com/android/contacts/common/model/CPOWrapper.java
+++ b/src/com/android/contacts/model/CPOWrapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model;
+package com.android.contacts.model;
 
 import android.content.ContentProviderOperation;
 
diff --git a/src/com/android/contacts/common/model/Contact.java b/src/com/android/contacts/model/Contact.java
similarity index 98%
rename from src/com/android/contacts/common/model/Contact.java
rename to src/com/android/contacts/model/Contact.java
index 586f80a..e1805e1 100644
--- a/src/com/android/contacts/common/model/Contact.java
+++ b/src/com/android/contacts/model/Contact.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model;
+package com.android.contacts.model;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -24,9 +24,9 @@
 import android.provider.ContactsContract.Directory;
 import android.provider.ContactsContract.DisplayNameSources;
 
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.SimAccountType;
-import com.android.contacts.common.util.DataStatus;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.SimAccountType;
+import com.android.contacts.util.DataStatus;
 import com.android.contacts.group.GroupMetaData;
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/src/com/android/contacts/common/model/ContactLoader.java b/src/com/android/contacts/model/ContactLoader.java
similarity index 98%
rename from src/com/android/contacts/common/model/ContactLoader.java
rename to src/com/android/contacts/model/ContactLoader.java
index 2cafc1f..e4695e6 100644
--- a/src/com/android/contacts/common/model/ContactLoader.java
+++ b/src/com/android/contacts/model/ContactLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.model;
+package com.android.contacts.model;
 
 import android.content.AsyncTaskLoader;
 import android.content.ContentResolver;
@@ -40,16 +40,16 @@
 
 import com.android.contacts.GroupMetaDataLoader;
 import com.android.contacts.common.GeoUtil;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountTypeWithDataSet;
-import com.android.contacts.common.util.Constants;
-import com.android.contacts.common.util.ContactLoaderUtils;
-import com.android.contacts.common.util.DataStatus;
-import com.android.contacts.common.util.UriUtils;
-import com.android.contacts.common.model.dataitem.DataItem;
-import com.android.contacts.common.model.dataitem.PhoneDataItem;
-import com.android.contacts.common.model.dataitem.PhotoDataItem;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountTypeWithDataSet;
+import com.android.contacts.util.Constants;
+import com.android.contacts.util.ContactLoaderUtils;
+import com.android.contacts.util.DataStatus;
+import com.android.contacts.util.UriUtils;
+import com.android.contacts.model.dataitem.DataItem;
+import com.android.contacts.model.dataitem.PhoneDataItem;
+import com.android.contacts.model.dataitem.PhotoDataItem;
 import com.android.contacts.group.GroupMetaData;
 
 import com.google.common.collect.ImmutableList;
diff --git a/src/com/android/contacts/common/model/Cp2DeviceLocalAccountLocator.java b/src/com/android/contacts/model/Cp2DeviceLocalAccountLocator.java
similarity index 96%
rename from src/com/android/contacts/common/model/Cp2DeviceLocalAccountLocator.java
rename to src/com/android/contacts/model/Cp2DeviceLocalAccountLocator.java
index 64f7c03..afd7917 100644
--- a/src/com/android/contacts/common/model/Cp2DeviceLocalAccountLocator.java
+++ b/src/com/android/contacts/model/Cp2DeviceLocalAccountLocator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.model;
+package com.android.contacts.model;
 
 import android.accounts.AccountManager;
 import android.content.ContentResolver;
@@ -22,8 +22,8 @@
 import android.provider.ContactsContract;
 import android.support.annotation.VisibleForTesting;
 
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.DeviceLocalAccountTypeFactory;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.DeviceLocalAccountTypeFactory;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/com/android/contacts/common/model/DeviceLocalAccountLocator.java b/src/com/android/contacts/model/DeviceLocalAccountLocator.java
similarity index 94%
rename from src/com/android/contacts/common/model/DeviceLocalAccountLocator.java
rename to src/com/android/contacts/model/DeviceLocalAccountLocator.java
index 17f5f5e..03da03b 100644
--- a/src/com/android/contacts/common/model/DeviceLocalAccountLocator.java
+++ b/src/com/android/contacts/model/DeviceLocalAccountLocator.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.model;
+package com.android.contacts.model;
 
 import android.content.Context;
 
 import com.android.contacts.common.Experiments;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contactsbind.ObjectFactory;
 import com.android.contactsbind.experiments.Flags;
 
diff --git a/src/com/android/contacts/common/model/RawContact.java b/src/com/android/contacts/model/RawContact.java
similarity index 97%
rename from src/com/android/contacts/common/model/RawContact.java
rename to src/com/android/contacts/model/RawContact.java
index 3d8db85..6192093 100644
--- a/src/com/android/contacts/common/model/RawContact.java
+++ b/src/com/android/contacts/model/RawContact.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model;
+package com.android.contacts.model;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -26,10 +26,9 @@
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.RawContacts;
 
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.dataitem.DataItem;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.dataitem.DataItem;
 import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
 
diff --git a/src/com/android/contacts/common/model/RawContactDelta.java b/src/com/android/contacts/model/RawContactDelta.java
similarity index 98%
rename from src/com/android/contacts/common/model/RawContactDelta.java
rename to src/com/android/contacts/model/RawContactDelta.java
index afa4a13..b7d0665 100644
--- a/src/com/android/contacts/common/model/RawContactDelta.java
+++ b/src/com/android/contacts/model/RawContactDelta.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model;
+package com.android.contacts.model;
 
 import android.content.ContentProviderOperation;
 import android.content.ContentProviderOperation.Builder;
@@ -29,9 +29,9 @@
 import android.provider.ContactsContract.RawContacts;
 import android.util.Log;
 
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
diff --git a/src/com/android/contacts/common/model/RawContactDeltaList.java b/src/com/android/contacts/model/RawContactDeltaList.java
similarity index 99%
rename from src/com/android/contacts/common/model/RawContactDeltaList.java
rename to src/com/android/contacts/model/RawContactDeltaList.java
index 2f281ef..de007d2 100644
--- a/src/com/android/contacts/common/model/RawContactDeltaList.java
+++ b/src/com/android/contacts/model/RawContactDeltaList.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model;
+package com.android.contacts.model;
 
 import android.content.ContentProviderOperation;
 import android.content.ContentProviderOperation.Builder;
@@ -30,7 +30,7 @@
 import android.provider.ContactsContract.RawContacts;
 import android.util.Log;
 
-import com.android.contacts.common.compat.CompatUtils;
+import com.android.contacts.compat.CompatUtils;
 
 import com.google.common.collect.Lists;
 
diff --git a/src/com/android/contacts/common/model/RawContactModifier.java b/src/com/android/contacts/model/RawContactModifier.java
similarity index 98%
rename from src/com/android/contacts/common/model/RawContactModifier.java
rename to src/com/android/contacts/model/RawContactModifier.java
index b24f877..a67b018 100644
--- a/src/com/android/contacts/common/model/RawContactModifier.java
+++ b/src/com/android/contacts/model/RawContactModifier.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model;
+package com.android.contacts.model;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -47,17 +47,17 @@
 import android.util.SparseIntArray;
 
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountType.EditField;
-import com.android.contacts.common.model.account.AccountType.EditType;
-import com.android.contacts.common.model.account.AccountType.EventEditType;
-import com.android.contacts.common.model.account.GoogleAccountType;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.model.dataitem.PhoneDataItem;
-import com.android.contacts.common.model.dataitem.StructuredNameDataItem;
-import com.android.contacts.common.util.CommonDateUtils;
-import com.android.contacts.common.util.DateUtils;
-import com.android.contacts.common.util.NameConverter;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountType.EditField;
+import com.android.contacts.model.account.AccountType.EditType;
+import com.android.contacts.model.account.AccountType.EventEditType;
+import com.android.contacts.model.account.GoogleAccountType;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.PhoneDataItem;
+import com.android.contacts.model.dataitem.StructuredNameDataItem;
+import com.android.contacts.util.CommonDateUtils;
+import com.android.contacts.util.DateUtils;
+import com.android.contacts.util.NameConverter;
 
 import java.text.ParsePosition;
 import java.util.ArrayList;
diff --git a/src/com/android/contacts/common/model/SimCard.java b/src/com/android/contacts/model/SimCard.java
similarity index 99%
rename from src/com/android/contacts/common/model/SimCard.java
rename to src/com/android/contacts/model/SimCard.java
index 3e826dd..2105ac7 100644
--- a/src/com/android/contacts/common/model/SimCard.java
+++ b/src/com/android/contacts/model/SimCard.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.model;
+package com.android.contacts.model;
 
 import android.os.Build;
 import android.support.annotation.RequiresApi;
diff --git a/src/com/android/contacts/common/model/SimContact.java b/src/com/android/contacts/model/SimContact.java
similarity index 98%
rename from src/com/android/contacts/common/model/SimContact.java
rename to src/com/android/contacts/model/SimContact.java
index 7442805..56c696f 100644
--- a/src/com/android/contacts/common/model/SimContact.java
+++ b/src/com/android/contacts/model/SimContact.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.model;
+package com.android.contacts.model;
 
 import android.content.ContentProviderOperation;
 import android.database.MatrixCursor;
@@ -26,7 +26,7 @@
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.text.TextUtils;
 
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
 import com.google.common.collect.ComparisonChain;
 import com.google.common.collect.Ordering;
 
diff --git a/src/com/android/contacts/common/model/ValuesDelta.java b/src/com/android/contacts/model/ValuesDelta.java
similarity index 98%
rename from src/com/android/contacts/common/model/ValuesDelta.java
rename to src/com/android/contacts/model/ValuesDelta.java
index d6e08a8..120c205 100644
--- a/src/com/android/contacts/common/model/ValuesDelta.java
+++ b/src/com/android/contacts/model/ValuesDelta.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model;
+package com.android.contacts.model;
 
 import android.content.ContentProviderOperation;
 import android.content.ContentValues;
@@ -23,10 +23,8 @@
 import android.os.Parcelable;
 import android.provider.BaseColumns;
 import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import android.text.TextUtils;
 
-import com.android.contacts.common.compat.CompatUtils;
+import com.android.contacts.compat.CompatUtils;
 
 import com.google.common.collect.Sets;
 
diff --git a/src/com/android/contacts/common/model/account/AccountDisplayInfo.java b/src/com/android/contacts/model/account/AccountDisplayInfo.java
similarity index 98%
rename from src/com/android/contacts/common/model/account/AccountDisplayInfo.java
rename to src/com/android/contacts/model/account/AccountDisplayInfo.java
index f68fdd5..fe0c570 100644
--- a/src/com/android/contacts/common/model/account/AccountDisplayInfo.java
+++ b/src/com/android/contacts/model/account/AccountDisplayInfo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/contacts/common/model/account/AccountDisplayInfoFactory.java b/src/com/android/contacts/model/account/AccountDisplayInfoFactory.java
similarity index 94%
rename from src/com/android/contacts/common/model/account/AccountDisplayInfoFactory.java
rename to src/com/android/contacts/model/account/AccountDisplayInfoFactory.java
index aad1689..759eede 100644
--- a/src/com/android/contacts/common/model/account/AccountDisplayInfoFactory.java
+++ b/src/com/android/contacts/model/account/AccountDisplayInfoFactory.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
 
 import android.content.Context;
 
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.util.DeviceLocalAccountTypeFactory;
+import com.android.contacts.list.ContactListFilter;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.util.DeviceLocalAccountTypeFactory;
 import com.android.contactsbind.ObjectFactory;
 
 import java.util.ArrayList;
diff --git a/src/com/android/contacts/common/model/account/AccountType.java b/src/com/android/contacts/model/account/AccountType.java
similarity index 99%
rename from src/com/android/contacts/common/model/account/AccountType.java
rename to src/com/android/contacts/model/account/AccountType.java
index 80fb4aa..d727e0c 100644
--- a/src/com/android/contacts/common/model/account/AccountType.java
+++ b/src/com/android/contacts/model/account/AccountType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
 
 import android.accounts.AuthenticatorDescription;
 import android.content.ContentValues;
@@ -29,7 +29,7 @@
 import android.widget.EditText;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.DataKind;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
diff --git a/src/com/android/contacts/common/model/account/AccountTypeWithDataSet.java b/src/com/android/contacts/model/account/AccountTypeWithDataSet.java
similarity index 98%
rename from src/com/android/contacts/common/model/account/AccountTypeWithDataSet.java
rename to src/com/android/contacts/model/account/AccountTypeWithDataSet.java
index f6bcf24..ab0a891 100644
--- a/src/com/android/contacts/common/model/account/AccountTypeWithDataSet.java
+++ b/src/com/android/contacts/model/account/AccountTypeWithDataSet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
 
 import android.content.Context;
 import android.database.Cursor;
diff --git a/src/com/android/contacts/common/model/account/AccountWithDataSet.java b/src/com/android/contacts/model/account/AccountWithDataSet.java
similarity index 97%
rename from src/com/android/contacts/common/model/account/AccountWithDataSet.java
rename to src/com/android/contacts/model/account/AccountWithDataSet.java
index 304dca7..24a91be 100644
--- a/src/com/android/contacts/common/model/account/AccountWithDataSet.java
+++ b/src/com/android/contacts/model/account/AccountWithDataSet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
 
 import android.accounts.Account;
 import android.content.ContentProviderOperation;
@@ -28,8 +28,8 @@
 import android.provider.ContactsContract.RawContacts;
 import android.text.TextUtils;
 
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.preference.ContactsPreferences;
 import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
 
diff --git a/src/com/android/contacts/common/model/account/BaseAccountType.java b/src/com/android/contacts/model/account/BaseAccountType.java
similarity index 99%
rename from src/com/android/contacts/common/model/account/BaseAccountType.java
rename to src/com/android/contacts/model/account/BaseAccountType.java
index 400b0e9..0e7469e 100644
--- a/src/com/android/contacts/common/model/account/BaseAccountType.java
+++ b/src/com/android/contacts/model/account/BaseAccountType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -40,10 +40,10 @@
 import android.view.inputmethod.EditorInfo;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.CustomDataItem;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.CommonDateUtils;
-import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.contacts.model.dataitem.CustomDataItem;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.CommonDateUtils;
+import com.android.contacts.util.ContactDisplayUtils;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
diff --git a/src/com/android/contacts/common/model/account/DeviceLocalAccountType.java b/src/com/android/contacts/model/account/DeviceLocalAccountType.java
similarity index 95%
rename from src/com/android/contacts/common/model/account/DeviceLocalAccountType.java
rename to src/com/android/contacts/model/account/DeviceLocalAccountType.java
index 31452e6..3941cf7 100644
--- a/src/com/android/contacts/common/model/account/DeviceLocalAccountType.java
+++ b/src/com/android/contacts/model/account/DeviceLocalAccountType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
 
 import android.content.Context;
 
diff --git a/src/com/android/contacts/common/model/account/ExchangeAccountType.java b/src/com/android/contacts/model/account/ExchangeAccountType.java
similarity index 98%
rename from src/com/android/contacts/common/model/account/ExchangeAccountType.java
rename to src/com/android/contacts/model/account/ExchangeAccountType.java
index 4106c6d..91a9d7d 100644
--- a/src/com/android/contacts/common/model/account/ExchangeAccountType.java
+++ b/src/com/android/contacts/model/account/ExchangeAccountType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -29,11 +29,10 @@
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
 import android.provider.ContactsContract.CommonDataKinds.Website;
-import android.util.Log;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.CommonDateUtils;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.CommonDateUtils;
 import com.android.contactsbind.FeedbackHelper;
 
 import com.google.common.collect.Lists;
diff --git a/src/com/android/contacts/common/model/account/ExternalAccountType.java b/src/com/android/contacts/model/account/ExternalAccountType.java
similarity index 99%
rename from src/com/android/contacts/common/model/account/ExternalAccountType.java
rename to src/com/android/contacts/model/account/ExternalAccountType.java
index 5c5a26a..c385d44 100644
--- a/src/com/android/contacts/common/model/account/ExternalAccountType.java
+++ b/src/com/android/contacts/model/account/ExternalAccountType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
 
 import android.content.Context;
 import android.content.Intent;
@@ -34,7 +34,7 @@
 import android.util.Xml;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.DataKind;
 import com.android.contactsbind.FeedbackHelper;
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/src/com/android/contacts/common/model/account/FallbackAccountType.java b/src/com/android/contacts/model/account/FallbackAccountType.java
similarity index 95%
rename from src/com/android/contacts/common/model/account/FallbackAccountType.java
rename to src/com/android/contacts/model/account/FallbackAccountType.java
index 39f767d..c3f25de 100644
--- a/src/com/android/contacts/common/model/account/FallbackAccountType.java
+++ b/src/com/android/contacts/model/account/FallbackAccountType.java
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
 
 import android.accounts.AuthenticatorDescription;
 import android.content.Context;
-import android.util.Log;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.DataKind;
 import com.android.contactsbind.FeedbackHelper;
 
 public class FallbackAccountType extends BaseAccountType {
diff --git a/src/com/android/contacts/common/model/account/GoogleAccountType.java b/src/com/android/contacts/model/account/GoogleAccountType.java
similarity index 97%
rename from src/com/android/contacts/common/model/account/GoogleAccountType.java
rename to src/com/android/contacts/model/account/GoogleAccountType.java
index 9e089f7..2bc02e7 100644
--- a/src/com/android/contacts/common/model/account/GoogleAccountType.java
+++ b/src/com/android/contacts/model/account/GoogleAccountType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -22,11 +22,10 @@
 import android.provider.ContactsContract.CommonDataKinds.Event;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.CommonDataKinds.Relation;
-import android.util.Log;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.CommonDateUtils;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.CommonDateUtils;
 import com.android.contactsbind.FeedbackHelper;
 
 import com.google.common.collect.Lists;
diff --git a/src/com/android/contacts/common/model/account/SamsungAccountType.java b/src/com/android/contacts/model/account/SamsungAccountType.java
similarity index 97%
rename from src/com/android/contacts/common/model/account/SamsungAccountType.java
rename to src/com/android/contacts/model/account/SamsungAccountType.java
index efb4400..c5f9c86 100644
--- a/src/com/android/contacts/common/model/account/SamsungAccountType.java
+++ b/src/com/android/contacts/model/account/SamsungAccountType.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
 
 import com.google.common.collect.Lists;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.CommonDateUtils;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.CommonDateUtils;
 import com.android.contactsbind.FeedbackHelper;
 
 import android.content.ContentValues;
@@ -30,7 +30,6 @@
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.CommonDataKinds.Relation;
 import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
-import android.util.Log;
 
 import java.util.Locale;
 
diff --git a/src/com/android/contacts/common/model/account/SimAccountType.java b/src/com/android/contacts/model/account/SimAccountType.java
similarity index 97%
rename from src/com/android/contacts/common/model/account/SimAccountType.java
rename to src/com/android/contacts/model/account/SimAccountType.java
index cecc9c7..afcccd5 100644
--- a/src/com/android/contacts/common/model/account/SimAccountType.java
+++ b/src/com/android/contacts/model/account/SimAccountType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
 
 import android.accounts.AuthenticatorDescription;
 import android.content.Context;
@@ -21,7 +21,7 @@
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.DataKind;
 
 import com.google.common.collect.Lists;
 
diff --git a/src/com/android/contacts/common/model/dataitem/CustomDataItem.java b/src/com/android/contacts/model/dataitem/CustomDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/CustomDataItem.java
rename to src/com/android/contacts/model/dataitem/CustomDataItem.java
index 589d88e..5be812b 100644
--- a/src/com/android/contacts/common/model/dataitem/CustomDataItem.java
+++ b/src/com/android/contacts/model/dataitem/CustomDataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.provider.ContactsContract.Data;
diff --git a/src/com/android/contacts/common/model/dataitem/DataItem.java b/src/com/android/contacts/model/dataitem/DataItem.java
similarity index 98%
rename from src/com/android/contacts/common/model/dataitem/DataItem.java
rename to src/com/android/contacts/model/dataitem/DataItem.java
index 44ceeda..782b54e 100644
--- a/src/com/android/contacts/common/model/dataitem/DataItem.java
+++ b/src/com/android/contacts/model/dataitem/DataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -38,7 +38,7 @@
 
 import com.android.contacts.common.Collapser;
 import com.android.contacts.common.MoreContactUtils;
-import com.android.contacts.common.model.RawContactModifier;
+import com.android.contacts.model.RawContactModifier;
 
 /**
  * This is the base class for data items, which represents a row from the Data table.
diff --git a/src/com/android/contacts/common/model/dataitem/DataKind.java b/src/com/android/contacts/model/dataitem/DataKind.java
similarity index 94%
rename from src/com/android/contacts/common/model/dataitem/DataKind.java
rename to src/com/android/contacts/model/dataitem/DataKind.java
index 98ad40a..a13539a 100644
--- a/src/com/android/contacts/common/model/dataitem/DataKind.java
+++ b/src/com/android/contacts/model/dataitem/DataKind.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.provider.ContactsContract.Data;
 
-import com.android.contacts.common.model.account.AccountType.EditField;
-import com.android.contacts.common.model.account.AccountType.EditType;
-import com.android.contacts.common.model.account.AccountType.StringInflater;
+import com.android.contacts.model.account.AccountType.EditField;
+import com.android.contacts.model.account.AccountType.EditType;
+import com.android.contacts.model.account.AccountType.StringInflater;
 import com.google.common.collect.Iterators;
 
 import java.text.SimpleDateFormat;
diff --git a/src/com/android/contacts/common/model/dataitem/EmailDataItem.java b/src/com/android/contacts/model/dataitem/EmailDataItem.java
similarity index 96%
rename from src/com/android/contacts/common/model/dataitem/EmailDataItem.java
rename to src/com/android/contacts/model/dataitem/EmailDataItem.java
index 23efb01..77ad126 100644
--- a/src/com/android/contacts/common/model/dataitem/EmailDataItem.java
+++ b/src/com/android/contacts/model/dataitem/EmailDataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/EventDataItem.java b/src/com/android/contacts/model/dataitem/EventDataItem.java
similarity index 97%
rename from src/com/android/contacts/common/model/dataitem/EventDataItem.java
rename to src/com/android/contacts/model/dataitem/EventDataItem.java
index 5096fea..ad61dae 100644
--- a/src/com/android/contacts/common/model/dataitem/EventDataItem.java
+++ b/src/com/android/contacts/model/dataitem/EventDataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/com/android/contacts/common/model/dataitem/GroupMembershipDataItem.java b/src/com/android/contacts/model/dataitem/GroupMembershipDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/GroupMembershipDataItem.java
rename to src/com/android/contacts/model/dataitem/GroupMembershipDataItem.java
index 41f19e6..00558d0 100644
--- a/src/com/android/contacts/common/model/dataitem/GroupMembershipDataItem.java
+++ b/src/com/android/contacts/model/dataitem/GroupMembershipDataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/IdentityDataItem.java b/src/com/android/contacts/model/dataitem/IdentityDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/IdentityDataItem.java
rename to src/com/android/contacts/model/dataitem/IdentityDataItem.java
index 29e9a40..045867a 100644
--- a/src/com/android/contacts/common/model/dataitem/IdentityDataItem.java
+++ b/src/com/android/contacts/model/dataitem/IdentityDataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/ImDataItem.java b/src/com/android/contacts/model/dataitem/ImDataItem.java
similarity index 98%
rename from src/com/android/contacts/common/model/dataitem/ImDataItem.java
rename to src/com/android/contacts/model/dataitem/ImDataItem.java
index f89e5c6..a0e087c 100644
--- a/src/com/android/contacts/common/model/dataitem/ImDataItem.java
+++ b/src/com/android/contacts/model/dataitem/ImDataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/com/android/contacts/common/model/dataitem/NicknameDataItem.java b/src/com/android/contacts/model/dataitem/NicknameDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/NicknameDataItem.java
rename to src/com/android/contacts/model/dataitem/NicknameDataItem.java
index e7f9d4a..2d44751 100644
--- a/src/com/android/contacts/common/model/dataitem/NicknameDataItem.java
+++ b/src/com/android/contacts/model/dataitem/NicknameDataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/NoteDataItem.java b/src/com/android/contacts/model/dataitem/NoteDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/NoteDataItem.java
rename to src/com/android/contacts/model/dataitem/NoteDataItem.java
index 3d71167..9a572cb 100644
--- a/src/com/android/contacts/common/model/dataitem/NoteDataItem.java
+++ b/src/com/android/contacts/model/dataitem/NoteDataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/OrganizationDataItem.java b/src/com/android/contacts/model/dataitem/OrganizationDataItem.java
similarity index 97%
rename from src/com/android/contacts/common/model/dataitem/OrganizationDataItem.java
rename to src/com/android/contacts/model/dataitem/OrganizationDataItem.java
index 37cd852..8c2a0c8 100644
--- a/src/com/android/contacts/common/model/dataitem/OrganizationDataItem.java
+++ b/src/com/android/contacts/model/dataitem/OrganizationDataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/PhoneDataItem.java b/src/com/android/contacts/model/dataitem/PhoneDataItem.java
similarity index 93%
rename from src/com/android/contacts/common/model/dataitem/PhoneDataItem.java
rename to src/com/android/contacts/model/dataitem/PhoneDataItem.java
index d6aa2a9..8d6cf8e 100644
--- a/src/com/android/contacts/common/model/dataitem/PhoneDataItem.java
+++ b/src/com/android/contacts/model/dataitem/PhoneDataItem.java
@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
 
 /**
  * Represents a phone data item, wrapping the columns in
diff --git a/src/com/android/contacts/common/model/dataitem/PhotoDataItem.java b/src/com/android/contacts/model/dataitem/PhotoDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/PhotoDataItem.java
rename to src/com/android/contacts/model/dataitem/PhotoDataItem.java
index a61218b..2ba13fb 100644
--- a/src/com/android/contacts/common/model/dataitem/PhotoDataItem.java
+++ b/src/com/android/contacts/model/dataitem/PhotoDataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/RelationDataItem.java b/src/com/android/contacts/model/dataitem/RelationDataItem.java
similarity index 97%
rename from src/com/android/contacts/common/model/dataitem/RelationDataItem.java
rename to src/com/android/contacts/model/dataitem/RelationDataItem.java
index 9e883fe..e08ba4e 100644
--- a/src/com/android/contacts/common/model/dataitem/RelationDataItem.java
+++ b/src/com/android/contacts/model/dataitem/RelationDataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/com/android/contacts/common/model/dataitem/SipAddressDataItem.java b/src/com/android/contacts/model/dataitem/SipAddressDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/SipAddressDataItem.java
rename to src/com/android/contacts/model/dataitem/SipAddressDataItem.java
index ec704fc..45ebeee 100644
--- a/src/com/android/contacts/common/model/dataitem/SipAddressDataItem.java
+++ b/src/com/android/contacts/model/dataitem/SipAddressDataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/StructuredNameDataItem.java b/src/com/android/contacts/model/dataitem/StructuredNameDataItem.java
similarity index 98%
rename from src/com/android/contacts/common/model/dataitem/StructuredNameDataItem.java
rename to src/com/android/contacts/model/dataitem/StructuredNameDataItem.java
index 4d463da..4b69163 100644
--- a/src/com/android/contacts/common/model/dataitem/StructuredNameDataItem.java
+++ b/src/com/android/contacts/model/dataitem/StructuredNameDataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/StructuredPostalDataItem.java b/src/com/android/contacts/model/dataitem/StructuredPostalDataItem.java
similarity index 97%
rename from src/com/android/contacts/common/model/dataitem/StructuredPostalDataItem.java
rename to src/com/android/contacts/model/dataitem/StructuredPostalDataItem.java
index 6cfc0c1..cf46c07 100644
--- a/src/com/android/contacts/common/model/dataitem/StructuredPostalDataItem.java
+++ b/src/com/android/contacts/model/dataitem/StructuredPostalDataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/WebsiteDataItem.java b/src/com/android/contacts/model/dataitem/WebsiteDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/WebsiteDataItem.java
rename to src/com/android/contacts/model/dataitem/WebsiteDataItem.java
index 0939421..4439be7 100644
--- a/src/com/android/contacts/common/model/dataitem/WebsiteDataItem.java
+++ b/src/com/android/contacts/model/dataitem/WebsiteDataItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
 
 import android.content.ContentValues;
 import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/preference/AboutPreferenceFragment.java b/src/com/android/contacts/preference/AboutPreferenceFragment.java
similarity index 98%
rename from src/com/android/contacts/common/preference/AboutPreferenceFragment.java
rename to src/com/android/contacts/preference/AboutPreferenceFragment.java
index d8426ba..9ba026e 100644
--- a/src/com/android/contacts/common/preference/AboutPreferenceFragment.java
+++ b/src/com/android/contacts/preference/AboutPreferenceFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.preference;
+package com.android.contacts.preference;
 
 import android.content.ActivityNotFoundException;
 import android.content.Context;
diff --git a/src/com/android/contacts/common/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
similarity index 93%
rename from src/com/android/contacts/common/preference/ContactsPreferenceActivity.java
rename to src/com/android/contacts/preference/ContactsPreferenceActivity.java
index 4bdb12f..4d412be 100644
--- a/src/com/android/contacts/common/preference/ContactsPreferenceActivity.java
+++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.preference;
+package com.android.contacts.preference;
 
 import android.content.res.Configuration;
 import android.database.Cursor;
@@ -34,12 +34,12 @@
 import android.view.ViewGroup;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.interactions.ImportDialogFragment;
-import com.android.contacts.common.list.ProviderStatusWatcher;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.DisplayOptionsPreferenceFragment.ProfileListener;
-import com.android.contacts.common.preference.DisplayOptionsPreferenceFragment.ProfileQuery;
-import com.android.contacts.common.util.AccountSelectionUtil;
+import com.android.contacts.interactions.ImportDialogFragment;
+import com.android.contacts.list.ProviderStatusWatcher;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.DisplayOptionsPreferenceFragment.ProfileListener;
+import com.android.contacts.preference.DisplayOptionsPreferenceFragment.ProfileQuery;
+import com.android.contacts.util.AccountSelectionUtil;
 import com.android.contacts.editor.SelectAccountDialogFragment;
 
 /**
diff --git a/src/com/android/contacts/common/preference/ContactsPreferences.java b/src/com/android/contacts/preference/ContactsPreferences.java
similarity index 98%
rename from src/com/android/contacts/common/preference/ContactsPreferences.java
rename to src/com/android/contacts/preference/ContactsPreferences.java
index ac7b0e0..f18aedf 100644
--- a/src/com/android/contacts/common/preference/ContactsPreferences.java
+++ b/src/com/android/contacts/preference/ContactsPreferences.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.preference;
+package com.android.contacts.preference;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -30,7 +30,7 @@
 import android.text.TextUtils;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
 
 import java.util.List;
 
diff --git a/src/com/android/contacts/common/preference/DefaultAccountPreference.java b/src/com/android/contacts/preference/DefaultAccountPreference.java
similarity index 91%
rename from src/com/android/contacts/common/preference/DefaultAccountPreference.java
rename to src/com/android/contacts/preference/DefaultAccountPreference.java
index 0fcc8cb..fc23e13 100644
--- a/src/com/android/contacts/common/preference/DefaultAccountPreference.java
+++ b/src/com/android/contacts/preference/DefaultAccountPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.preference;
+package com.android.contacts.preference;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -23,10 +23,10 @@
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountsListAdapter;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountsListAdapter;
 
 public class DefaultAccountPreference extends DialogPreference {
     private ContactsPreferences mPreferences;
diff --git a/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
similarity index 95%
rename from src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java
rename to src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
index 08846a8..37bb8dd 100644
--- a/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java
+++ b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.preference;
+package com.android.contacts.preference;
 
 import android.app.Activity;
 import android.app.LoaderManager;
@@ -46,17 +46,17 @@
 import com.android.contacts.R;
 import com.android.contacts.SimImportService;
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.compat.TelecomManagerUtil;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
-import com.android.contacts.common.interactions.ExportDialogFragment;
-import com.android.contacts.common.interactions.ImportDialogFragment;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.ContactListFilterController;
-import com.android.contacts.common.logging.ScreenEvent.ScreenType;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountFilterUtil;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.compat.TelecomManagerUtil;
+import com.android.contacts.compat.TelephonyManagerCompat;
+import com.android.contacts.interactions.ExportDialogFragment;
+import com.android.contacts.interactions.ImportDialogFragment;
+import com.android.contacts.list.ContactListFilter;
+import com.android.contacts.list.ContactListFilterController;
+import com.android.contacts.logging.ScreenEvent.ScreenType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountFilterUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
 import com.android.contactsbind.HelpUtils;
 
 import java.util.List;
diff --git a/src/com/android/contacts/common/preference/DisplayOrderPreference.java b/src/com/android/contacts/preference/DisplayOrderPreference.java
similarity index 94%
rename from src/com/android/contacts/common/preference/DisplayOrderPreference.java
rename to src/com/android/contacts/preference/DisplayOrderPreference.java
index 6a182c5..f8a70ab 100644
--- a/src/com/android/contacts/common/preference/DisplayOrderPreference.java
+++ b/src/com/android/contacts/preference/DisplayOrderPreference.java
@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.preference;
+package com.android.contacts.preference;
 
 import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.preference.ListPreference;
-import android.provider.ContactsContract;
 import android.util.AttributeSet;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.preference.ContactsPreferences;
 
 /**
  * Custom preference: view-name-as (first name first or last name first).
diff --git a/src/com/android/contacts/common/preference/SortOrderPreference.java b/src/com/android/contacts/preference/SortOrderPreference.java
similarity index 95%
rename from src/com/android/contacts/common/preference/SortOrderPreference.java
rename to src/com/android/contacts/preference/SortOrderPreference.java
index dfd9550..c38eee3 100644
--- a/src/com/android/contacts/common/preference/SortOrderPreference.java
+++ b/src/com/android/contacts/preference/SortOrderPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.preference;
+package com.android.contacts.preference;
 
 import android.app.AlertDialog.Builder;
 import android.content.Context;
@@ -22,7 +22,6 @@
 import android.util.AttributeSet;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.preference.ContactsPreferences;
 
 /**
  * Custom preference: sort-by.
diff --git a/src/com/android/contacts/quickcontact/DataAction.java b/src/com/android/contacts/quickcontact/DataAction.java
index 5a49c77..3f95e08 100644
--- a/src/com/android/contacts/quickcontact/DataAction.java
+++ b/src/com/android/contacts/quickcontact/DataAction.java
@@ -33,15 +33,15 @@
 import com.android.contacts.common.CallUtil;
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.MoreContactUtils;
-import com.android.contacts.common.model.account.AccountType.EditType;
-import com.android.contacts.common.model.dataitem.DataItem;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.model.dataitem.EmailDataItem;
-import com.android.contacts.common.model.dataitem.ImDataItem;
-import com.android.contacts.common.model.dataitem.PhoneDataItem;
-import com.android.contacts.common.model.dataitem.SipAddressDataItem;
-import com.android.contacts.common.model.dataitem.StructuredPostalDataItem;
-import com.android.contacts.common.model.dataitem.WebsiteDataItem;
+import com.android.contacts.model.account.AccountType.EditType;
+import com.android.contacts.model.dataitem.DataItem;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.EmailDataItem;
+import com.android.contacts.model.dataitem.ImDataItem;
+import com.android.contacts.model.dataitem.PhoneDataItem;
+import com.android.contacts.model.dataitem.SipAddressDataItem;
+import com.android.contacts.model.dataitem.StructuredPostalDataItem;
+import com.android.contacts.model.dataitem.WebsiteDataItem;
 import com.android.contacts.quickcontact.WebAddress.ParseException;
 import com.android.contacts.util.PhoneCapabilityTester;
 import com.android.contacts.util.StructuredPostalUtils;
diff --git a/src/com/android/contacts/quickcontact/DirectoryContactUtil.java b/src/com/android/contacts/quickcontact/DirectoryContactUtil.java
index c4969cc..117ef1f 100644
--- a/src/com/android/contacts/quickcontact/DirectoryContactUtil.java
+++ b/src/com/android/contacts/quickcontact/DirectoryContactUtil.java
@@ -18,8 +18,8 @@
 
 import com.android.contacts.ContactSaveService;
 import com.android.contacts.R;
-import com.android.contacts.common.model.Contact;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.Contact;
+import com.android.contacts.model.account.AccountWithDataSet;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
index d7efaf4..49da4c8 100644
--- a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
+++ b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
@@ -47,12 +47,11 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.LinearLayout.LayoutParams;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.android.contacts.R;
-import com.android.contacts.common.dialog.CallSubjectDialog;
+import com.android.contacts.dialog.CallSubjectDialog;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/contacts/quickcontact/InvisibleContactUtil.java b/src/com/android/contacts/quickcontact/InvisibleContactUtil.java
index b31c07b..d10e1fe 100644
--- a/src/com/android/contacts/quickcontact/InvisibleContactUtil.java
+++ b/src/com/android/contacts/quickcontact/InvisibleContactUtil.java
@@ -6,17 +6,17 @@
 import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
 
 import com.android.contacts.ContactSaveService;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.Contact;
-import com.android.contacts.common.model.RawContact;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.dataitem.DataItem;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.model.dataitem.GroupMembershipDataItem;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.Contact;
+import com.android.contacts.model.RawContact;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.dataitem.DataItem;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.GroupMembershipDataItem;
 import com.android.contacts.group.GroupMetaData;
 
 import com.google.common.collect.Iterables;
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index fcd0a50..b0c0493 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -109,46 +109,46 @@
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.activity.RequestDesiredPermissionsActivity;
 import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.EventCompat;
-import com.android.contacts.common.compat.MultiWindowCompat;
-import com.android.contacts.common.dialog.CallSubjectDialog;
-import com.android.contacts.common.interactions.TouchPointManager;
-import com.android.contacts.common.lettertiles.LetterTileDrawable;
-import com.android.contacts.common.list.ShortcutIntentBuilder;
-import com.android.contacts.common.list.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.logging.QuickContactEvent.ActionType;
-import com.android.contacts.common.logging.QuickContactEvent.CardType;
-import com.android.contacts.common.logging.QuickContactEvent.ContactType;
-import com.android.contacts.common.logging.ScreenEvent.ScreenType;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.Contact;
-import com.android.contacts.common.model.ContactLoader;
-import com.android.contacts.common.model.RawContact;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.dataitem.CustomDataItem;
-import com.android.contacts.common.model.dataitem.DataItem;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.model.dataitem.EmailDataItem;
-import com.android.contacts.common.model.dataitem.EventDataItem;
-import com.android.contacts.common.model.dataitem.ImDataItem;
-import com.android.contacts.common.model.dataitem.NicknameDataItem;
-import com.android.contacts.common.model.dataitem.NoteDataItem;
-import com.android.contacts.common.model.dataitem.OrganizationDataItem;
-import com.android.contacts.common.model.dataitem.PhoneDataItem;
-import com.android.contacts.common.model.dataitem.RelationDataItem;
-import com.android.contacts.common.model.dataitem.SipAddressDataItem;
-import com.android.contacts.common.model.dataitem.StructuredNameDataItem;
-import com.android.contacts.common.model.dataitem.StructuredPostalDataItem;
-import com.android.contacts.common.model.dataitem.WebsiteDataItem;
-import com.android.contacts.common.util.DateUtils;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.util.MaterialColorMapUtils;
-import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette;
-import com.android.contacts.common.util.PermissionsUtil;
-import com.android.contacts.common.util.UriUtils;
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.compat.EventCompat;
+import com.android.contacts.compat.MultiWindowCompat;
+import com.android.contacts.dialog.CallSubjectDialog;
+import com.android.contacts.interactions.TouchPointManager;
+import com.android.contacts.lettertiles.LetterTileDrawable;
+import com.android.contacts.list.ShortcutIntentBuilder;
+import com.android.contacts.list.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.logging.QuickContactEvent.ActionType;
+import com.android.contacts.logging.QuickContactEvent.CardType;
+import com.android.contacts.logging.QuickContactEvent.ContactType;
+import com.android.contacts.logging.ScreenEvent.ScreenType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.Contact;
+import com.android.contacts.model.ContactLoader;
+import com.android.contacts.model.RawContact;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.dataitem.CustomDataItem;
+import com.android.contacts.model.dataitem.DataItem;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.EmailDataItem;
+import com.android.contacts.model.dataitem.EventDataItem;
+import com.android.contacts.model.dataitem.ImDataItem;
+import com.android.contacts.model.dataitem.NicknameDataItem;
+import com.android.contacts.model.dataitem.NoteDataItem;
+import com.android.contacts.model.dataitem.OrganizationDataItem;
+import com.android.contacts.model.dataitem.PhoneDataItem;
+import com.android.contacts.model.dataitem.RelationDataItem;
+import com.android.contacts.model.dataitem.SipAddressDataItem;
+import com.android.contacts.model.dataitem.StructuredNameDataItem;
+import com.android.contacts.model.dataitem.StructuredPostalDataItem;
+import com.android.contacts.model.dataitem.WebsiteDataItem;
+import com.android.contacts.util.DateUtils;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.util.MaterialColorMapUtils;
+import com.android.contacts.util.MaterialColorMapUtils.MaterialPalette;
+import com.android.contacts.util.PermissionsUtil;
+import com.android.contacts.util.UriUtils;
+import com.android.contacts.util.ViewUtil;
 import com.android.contacts.detail.ContactDisplayUtils;
 import com.android.contacts.editor.ContactEditorFragment;
 import com.android.contacts.editor.EditorIntents;
@@ -1723,7 +1723,7 @@
                     }
                 }
                 primaryContentDescription.append(header);
-                phoneContentDescription = com.android.contacts.common.util.ContactDisplayUtils
+                phoneContentDescription = com.android.contacts.util.ContactDisplayUtils
                         .getTelephoneTtsSpannable(primaryContentDescription.toString(), header);
                 icon = res.getDrawable(R.drawable.ic_phone_24dp);
                 iconResourceId = R.drawable.ic_phone_24dp;
@@ -1737,7 +1737,7 @@
 
                 alternateIcon = res.getDrawable(R.drawable.ic_message_24dp_mirrored);
                 alternateContentDescription.append(res.getString(R.string.sms_custom, header));
-                smsContentDescription = com.android.contacts.common.util.ContactDisplayUtils
+                smsContentDescription = com.android.contacts.util.ContactDisplayUtils
                         .getTelephoneTtsSpannable(alternateContentDescription.toString(), header);
 
                 int videoCapability = CallUtil.getVideoCallingAvailability(context);
diff --git a/src/com/android/contacts/quickcontact/QuickContactBroadcastReceiver.java b/src/com/android/contacts/quickcontact/QuickContactBroadcastReceiver.java
index dae10af..b3cbc48 100644
--- a/src/com/android/contacts/quickcontact/QuickContactBroadcastReceiver.java
+++ b/src/com/android/contacts/quickcontact/QuickContactBroadcastReceiver.java
@@ -16,7 +16,7 @@
 
 package com.android.contacts.quickcontact;
 
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/contacts/common/testing/InjectedServices.java b/src/com/android/contacts/testing/InjectedServices.java
similarity index 94%
rename from src/com/android/contacts/common/testing/InjectedServices.java
rename to src/com/android/contacts/testing/InjectedServices.java
index 3b90676..3822dd6 100644
--- a/src/com/android/contacts/common/testing/InjectedServices.java
+++ b/src/com/android/contacts/testing/InjectedServices.java
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.testing;
+package com.android.contacts.testing;
 
 import android.content.ContentResolver;
 import android.content.SharedPreferences;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
 
 import java.util.HashMap;
diff --git a/src/com/android/contacts/common/util/AccountFilterUtil.java b/src/com/android/contacts/util/AccountFilterUtil.java
similarity index 93%
rename from src/com/android/contacts/common/util/AccountFilterUtil.java
rename to src/com/android/contacts/util/AccountFilterUtil.java
index 96c5113..0c36f5e 100644
--- a/src/com/android/contacts/common/util/AccountFilterUtil.java
+++ b/src/com/android/contacts/util/AccountFilterUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.accounts.Account;
 import android.app.Activity;
@@ -32,15 +32,15 @@
 
 import com.android.contacts.R;
 import com.android.contacts.activities.ContactEditorActivity;
-import com.android.contacts.common.list.AccountFilterActivity;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.ContactListFilterController;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.list.AccountFilterActivity;
+import com.android.contacts.list.ContactListFilter;
+import com.android.contacts.list.ContactListFilterController;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.ContactsPreferences;
 import com.android.contactsbind.ObjectFactory;
 
 import com.google.common.collect.Lists;
diff --git a/src/com/android/contacts/common/util/AccountSelectionUtil.java b/src/com/android/contacts/util/AccountSelectionUtil.java
similarity index 96%
rename from src/com/android/contacts/common/util/AccountSelectionUtil.java
rename to src/com/android/contacts/util/AccountSelectionUtil.java
index 9fca64d..5fefd86 100644
--- a/src/com/android/contacts/common/util/AccountSelectionUtil.java
+++ b/src/com/android/contacts/util/AccountSelectionUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -33,10 +33,10 @@
 import android.widget.TextView;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.vcard.ImportVCardActivity;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.vcard.ImportVCardActivity;
 
 import java.util.List;
 
diff --git a/src/com/android/contacts/common/util/AccountsListAdapter.java b/src/com/android/contacts/util/AccountsListAdapter.java
similarity index 93%
rename from src/com/android/contacts/common/util/AccountsListAdapter.java
rename to src/com/android/contacts/util/AccountsListAdapter.java
index a437929..cda4d4b 100644
--- a/src/com/android/contacts/common/util/AccountsListAdapter.java
+++ b/src/com/android/contacts/util/AccountsListAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -24,11 +24,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.contacts.common.model.account.AccountDisplayInfo;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/contacts/common/util/BitmapUtil.java b/src/com/android/contacts/util/BitmapUtil.java
similarity index 99%
rename from src/com/android/contacts/common/util/BitmapUtil.java
rename to src/com/android/contacts/util/BitmapUtil.java
index 5cd856e..a4e3096 100644
--- a/src/com/android/contacts/common/util/BitmapUtil.java
+++ b/src/com/android/contacts/util/BitmapUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
diff --git a/src/com/android/contacts/common/util/CommonDateUtils.java b/src/com/android/contacts/util/CommonDateUtils.java
similarity index 96%
rename from src/com/android/contacts/common/util/CommonDateUtils.java
rename to src/com/android/contacts/util/CommonDateUtils.java
index bba910a..6be6302 100644
--- a/src/com/android/contacts/common/util/CommonDateUtils.java
+++ b/src/com/android/contacts/util/CommonDateUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import java.text.SimpleDateFormat;
 import java.util.Locale;
diff --git a/src/com/android/contacts/common/util/Constants.java b/src/com/android/contacts/util/Constants.java
similarity index 95%
rename from src/com/android/contacts/common/util/Constants.java
rename to src/com/android/contacts/util/Constants.java
index c0d6755..e4ca027 100644
--- a/src/com/android/contacts/common/util/Constants.java
+++ b/src/com/android/contacts/util/Constants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 public class Constants {
 
diff --git a/src/com/android/contacts/common/util/ContactDisplayUtils.java b/src/com/android/contacts/util/ContactDisplayUtils.java
similarity index 98%
rename from src/com/android/contacts/common/util/ContactDisplayUtils.java
rename to src/com/android/contacts/util/ContactDisplayUtils.java
index 0a50748..f61a257 100644
--- a/src/com/android/contacts/common/util/ContactDisplayUtils.java
+++ b/src/com/android/contacts/util/ContactDisplayUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import static android.provider.ContactsContract.CommonDataKinds.Phone;
 
@@ -31,8 +31,8 @@
 import android.util.Patterns;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.preference.ContactsPreferences;
 
 /**
  * Methods for handling various contact data labels.
diff --git a/src/com/android/contacts/common/util/ContactLoaderUtils.java b/src/com/android/contacts/util/ContactLoaderUtils.java
similarity index 98%
rename from src/com/android/contacts/common/util/ContactLoaderUtils.java
rename to src/com/android/contacts/util/ContactLoaderUtils.java
index 0ec8887..91c683f 100644
--- a/src/com/android/contacts/common/util/ContactLoaderUtils.java
+++ b/src/com/android/contacts/util/ContactLoaderUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.content.ContentResolver;
 import android.content.ContentUris;
diff --git a/src/com/android/contacts/common/util/DataStatus.java b/src/com/android/contacts/util/DataStatus.java
similarity index 98%
rename from src/com/android/contacts/common/util/DataStatus.java
rename to src/com/android/contacts/util/DataStatus.java
index 76f11b6..ff3c7d3 100644
--- a/src/com/android/contacts/common/util/DataStatus.java
+++ b/src/com/android/contacts/util/DataStatus.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
diff --git a/src/com/android/contacts/common/util/DateUtils.java b/src/com/android/contacts/util/DateUtils.java
similarity index 99%
rename from src/com/android/contacts/common/util/DateUtils.java
rename to src/com/android/contacts/util/DateUtils.java
index 097230c..c460782 100644
--- a/src/com/android/contacts/common/util/DateUtils.java
+++ b/src/com/android/contacts/util/DateUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.content.Context;
 import android.text.format.DateFormat;
diff --git a/src/com/android/contacts/common/util/DeviceLocalAccountTypeFactory.java b/src/com/android/contacts/util/DeviceLocalAccountTypeFactory.java
similarity index 90%
rename from src/com/android/contacts/common/util/DeviceLocalAccountTypeFactory.java
rename to src/com/android/contacts/util/DeviceLocalAccountTypeFactory.java
index 040a6b4..59ee7e5 100644
--- a/src/com/android/contacts/common/util/DeviceLocalAccountTypeFactory.java
+++ b/src/com/android/contacts/util/DeviceLocalAccountTypeFactory.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.content.Context;
 import android.support.annotation.IntDef;
 
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.DeviceLocalAccountType;
-import com.android.contacts.common.model.account.FallbackAccountType;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.DeviceLocalAccountType;
 
 import java.lang.annotation.Retention;
 
diff --git a/src/com/android/contacts/common/util/EmptyService.java b/src/com/android/contacts/util/EmptyService.java
similarity index 95%
rename from src/com/android/contacts/common/util/EmptyService.java
rename to src/com/android/contacts/util/EmptyService.java
index c5c3608..2e6a159 100644
--- a/src/com/android/contacts/common/util/EmptyService.java
+++ b/src/com/android/contacts/util/EmptyService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/src/com/android/contacts/util/ImageViewDrawableSetter.java b/src/com/android/contacts/util/ImageViewDrawableSetter.java
index 6147c39..07b7a79 100644
--- a/src/com/android/contacts/util/ImageViewDrawableSetter.java
+++ b/src/com/android/contacts/util/ImageViewDrawableSetter.java
@@ -28,8 +28,8 @@
 
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
-import com.android.contacts.common.lettertiles.LetterTileDrawable;
-import com.android.contacts.common.model.Contact;
+import com.android.contacts.lettertiles.LetterTileDrawable;
+import com.android.contacts.model.Contact;
 
 import java.util.Arrays;
 
diff --git a/src/com/android/contacts/common/util/ImplicitIntentsUtil.java b/src/com/android/contacts/util/ImplicitIntentsUtil.java
similarity index 97%
rename from src/com/android/contacts/common/util/ImplicitIntentsUtil.java
rename to src/com/android/contacts/util/ImplicitIntentsUtil.java
index d30f495..171bbd6 100644
--- a/src/com/android/contacts/common/util/ImplicitIntentsUtil.java
+++ b/src/com/android/contacts/util/ImplicitIntentsUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.app.Activity;
 import android.content.Context;
@@ -29,15 +29,15 @@
 import android.text.TextUtils;
 
 import com.android.contacts.common.Experiments;
-import com.android.contacts.common.logging.ScreenEvent.ScreenType;
-import com.android.contacts.common.model.account.GoogleAccountType;
+import com.android.contacts.logging.ScreenEvent.ScreenType;
+import com.android.contacts.model.account.GoogleAccountType;
 import com.android.contacts.quickcontact.QuickContactActivity;
 import com.android.contactsbind.ObjectFactory;
 import com.android.contactsbind.experiments.Flags;
 
 import java.util.List;
 
-import static com.android.contacts.common.list.ShortcutIntentBuilder.INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION;
+import static com.android.contacts.list.ShortcutIntentBuilder.INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION;
 
 /**
  * Utility for forcing intents to be started inside the current app. This is useful for avoiding
diff --git a/src/com/android/contacts/common/util/LocalizedNameResolver.java b/src/com/android/contacts/util/LocalizedNameResolver.java
similarity index 97%
rename from src/com/android/contacts/common/util/LocalizedNameResolver.java
rename to src/com/android/contacts/util/LocalizedNameResolver.java
index 92104c4..73f07ad 100644
--- a/src/com/android/contacts/common/util/LocalizedNameResolver.java
+++ b/src/com/android/contacts/util/LocalizedNameResolver.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorDescription;
@@ -26,11 +26,10 @@
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.Xml;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.account.ExternalAccountType;
+import com.android.contacts.model.account.ExternalAccountType;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
diff --git a/src/com/android/contacts/common/util/MaterialColorMapUtils.java b/src/com/android/contacts/util/MaterialColorMapUtils.java
similarity index 99%
rename from src/com/android/contacts/common/util/MaterialColorMapUtils.java
rename to src/com/android/contacts/util/MaterialColorMapUtils.java
index 50d8f0f..f940885 100644
--- a/src/com/android/contacts/common/util/MaterialColorMapUtils.java
+++ b/src/com/android/contacts/util/MaterialColorMapUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import com.android.contacts.ContactsDrawerActivity;
 import com.android.contacts.R;
diff --git a/src/com/android/contacts/common/util/NameConverter.java b/src/com/android/contacts/util/NameConverter.java
similarity index 97%
rename from src/com/android/contacts/common/util/NameConverter.java
rename to src/com/android/contacts/util/NameConverter.java
index 227a0ec..2d9f6fd 100644
--- a/src/com/android/contacts/common/util/NameConverter.java
+++ b/src/com/android/contacts/util/NameConverter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 
 import android.content.ContentValues;
@@ -25,7 +25,7 @@
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.text.TextUtils;
 
-import com.android.contacts.common.model.dataitem.StructuredNameDataItem;
+import com.android.contacts.model.dataitem.StructuredNameDataItem;
 
 /**
  * Utility class for converting between a display name and structured name (and vice-versa), via
diff --git a/src/com/android/contacts/common/util/PermissionsUtil.java b/src/com/android/contacts/util/PermissionsUtil.java
similarity index 98%
rename from src/com/android/contacts/common/util/PermissionsUtil.java
rename to src/com/android/contacts/util/PermissionsUtil.java
index 37c1762..c56b13e 100644
--- a/src/com/android/contacts/common/util/PermissionsUtil.java
+++ b/src/com/android/contacts/util/PermissionsUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.Manifest.permission;
 import android.app.AppOpsManager;
diff --git a/src/com/android/contacts/util/PhoneCapabilityTester.java b/src/com/android/contacts/util/PhoneCapabilityTester.java
index d1373f4..5e628be 100644
--- a/src/com/android/contacts/util/PhoneCapabilityTester.java
+++ b/src/com/android/contacts/util/PhoneCapabilityTester.java
@@ -28,7 +28,7 @@
 import android.telephony.TelephonyManager;
 
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
+import com.android.contacts.compat.TelephonyManagerCompat;
 
 import java.util.List;
 
diff --git a/src/com/android/contacts/common/util/PhoneNumberFormatter.java b/src/com/android/contacts/util/PhoneNumberFormatter.java
similarity index 96%
rename from src/com/android/contacts/common/util/PhoneNumberFormatter.java
rename to src/com/android/contacts/util/PhoneNumberFormatter.java
index bbf9785..2a7058c 100644
--- a/src/com/android/contacts/common/util/PhoneNumberFormatter.java
+++ b/src/com/android/contacts/util/PhoneNumberFormatter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.content.Context;
 import android.os.AsyncTask;
@@ -22,7 +22,7 @@
 import android.widget.TextView;
 
 import com.android.contacts.common.GeoUtil;
-import com.android.contacts.common.compat.PhoneNumberFormattingTextWatcherCompat;
+import com.android.contacts.compat.PhoneNumberFormattingTextWatcherCompat;
 
 public final class PhoneNumberFormatter {
     private PhoneNumberFormatter() {}
diff --git a/src/com/android/contacts/common/util/PhoneNumberHelper.java b/src/com/android/contacts/util/PhoneNumberHelper.java
similarity index 96%
rename from src/com/android/contacts/common/util/PhoneNumberHelper.java
rename to src/com/android/contacts/util/PhoneNumberHelper.java
index 794b6dd..d05bcd6 100644
--- a/src/com/android/contacts/common/util/PhoneNumberHelper.java
+++ b/src/com/android/contacts/util/PhoneNumberHelper.java
@@ -13,11 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
-import android.content.Context;
 import android.telephony.PhoneNumberUtils;
-import android.text.TextUtils;
 import android.util.Log;
 
 import com.google.i18n.phonenumbers.NumberParseException;
@@ -25,8 +23,6 @@
 import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
 import com.google.i18n.phonenumbers.ShortNumberInfo;
 
-import java.util.Locale;
-
 /**
  * This class wraps several PhoneNumberUtil calls and TelephonyManager calls. Some of them are
  * the same as the ones in the framework's code base. We can remove those once they are part of
diff --git a/src/com/android/contacts/util/SchedulingUtils.java b/src/com/android/contacts/util/SchedulingUtils.java
index fbb2458..f851339 100644
--- a/src/com/android/contacts/util/SchedulingUtils.java
+++ b/src/com/android/contacts/util/SchedulingUtils.java
@@ -17,7 +17,6 @@
 package com.android.contacts.util;
 
 import android.view.View;
-import android.view.ViewTreeObserver.OnDrawListener;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.view.ViewTreeObserver.OnPreDrawListener;
 
diff --git a/src/com/android/contacts/common/util/SearchUtil.java b/src/com/android/contacts/util/SearchUtil.java
similarity index 99%
rename from src/com/android/contacts/common/util/SearchUtil.java
rename to src/com/android/contacts/util/SearchUtil.java
index ed41d6c..d80fc53 100644
--- a/src/com/android/contacts/common/util/SearchUtil.java
+++ b/src/com/android/contacts/util/SearchUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import com.google.common.annotations.VisibleForTesting;
 
diff --git a/src/com/android/contacts/util/SharedPreferenceUtil.java b/src/com/android/contacts/util/SharedPreferenceUtil.java
index 3d138fb..ada7a57 100644
--- a/src/com/android/contacts/util/SharedPreferenceUtil.java
+++ b/src/com/android/contacts/util/SharedPreferenceUtil.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.android.contacts.common.model.SimCard;
+import com.android.contacts.model.SimCard;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/com/android/contacts/common/util/StopWatch.java b/src/com/android/contacts/util/StopWatch.java
similarity index 98%
rename from src/com/android/contacts/common/util/StopWatch.java
rename to src/com/android/contacts/util/StopWatch.java
index 581d6ee..c53f346 100644
--- a/src/com/android/contacts/common/util/StopWatch.java
+++ b/src/com/android/contacts/util/StopWatch.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.util.Log;
 
diff --git a/src/com/android/contacts/util/SyncUtil.java b/src/com/android/contacts/util/SyncUtil.java
index 34e6e8c..0d6c494 100644
--- a/src/com/android/contacts/util/SyncUtil.java
+++ b/src/com/android/contacts/util/SyncUtil.java
@@ -22,9 +22,7 @@
 import android.net.NetworkInfo;
 import android.provider.ContactsContract;
 
-import com.android.contacts.common.model.account.GoogleAccountType;
-
-import java.util.List;
+import com.android.contacts.model.account.GoogleAccountType;
 
 /**
  * Utilities related to sync.
diff --git a/src/com/android/contacts/common/util/TelephonyManagerUtils.java b/src/com/android/contacts/util/TelephonyManagerUtils.java
similarity index 95%
rename from src/com/android/contacts/common/util/TelephonyManagerUtils.java
rename to src/com/android/contacts/util/TelephonyManagerUtils.java
index 7c322ca..ef1544c 100644
--- a/src/com/android/contacts/common/util/TelephonyManagerUtils.java
+++ b/src/com/android/contacts/util/TelephonyManagerUtils.java
@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.content.Context;
-import android.telephony.PhoneNumberUtils;
 import android.telephony.TelephonyManager;
-import android.text.TextUtils;
 import android.util.Log;
 
 import java.util.Locale;
diff --git a/src/com/android/contacts/common/util/TrafficStatsTags.java b/src/com/android/contacts/util/TrafficStatsTags.java
similarity index 94%
rename from src/com/android/contacts/common/util/TrafficStatsTags.java
rename to src/com/android/contacts/util/TrafficStatsTags.java
index 78faa94..617aa4d 100644
--- a/src/com/android/contacts/common/util/TrafficStatsTags.java
+++ b/src/com/android/contacts/util/TrafficStatsTags.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 public class TrafficStatsTags {
     public static final int CONTACT_PHOTO_DOWNLOAD_TAG = 0x0001;
diff --git a/src/com/android/contacts/common/util/UriUtils.java b/src/com/android/contacts/util/UriUtils.java
similarity index 98%
rename from src/com/android/contacts/common/util/UriUtils.java
rename to src/com/android/contacts/util/UriUtils.java
index 41ef62f..419304f 100644
--- a/src/com/android/contacts/common/util/UriUtils.java
+++ b/src/com/android/contacts/util/UriUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.net.Uri;
 import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/util/ViewUtil.java b/src/com/android/contacts/util/ViewUtil.java
similarity index 97%
rename from src/com/android/contacts/common/util/ViewUtil.java
rename to src/com/android/contacts/util/ViewUtil.java
index 895b757..0ced727 100644
--- a/src/com/android/contacts/common/util/ViewUtil.java
+++ b/src/com/android/contacts/util/ViewUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.content.res.Resources;
 import android.graphics.Outline;
@@ -24,7 +24,7 @@
 import android.widget.ListView;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.compat.CompatUtils;
+import com.android.contacts.compat.CompatUtils;
 
 /**
  * Provides static functions to work with views
diff --git a/src/com/android/contacts/common/util/WeakAsyncTask.java b/src/com/android/contacts/util/WeakAsyncTask.java
similarity index 97%
rename from src/com/android/contacts/common/util/WeakAsyncTask.java
rename to src/com/android/contacts/util/WeakAsyncTask.java
index f46e514..f60cfd7 100644
--- a/src/com/android/contacts/common/util/WeakAsyncTask.java
+++ b/src/com/android/contacts/util/WeakAsyncTask.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.util;
+package com.android.contacts.util;
 
 import android.os.AsyncTask;
 
diff --git a/src/com/android/contacts/common/vcard/CancelActivity.java b/src/com/android/contacts/vcard/CancelActivity.java
similarity index 98%
rename from src/com/android/contacts/common/vcard/CancelActivity.java
rename to src/com/android/contacts/vcard/CancelActivity.java
index 8e393e1..6354944 100644
--- a/src/com/android/contacts/common/vcard/CancelActivity.java
+++ b/src/com/android/contacts/vcard/CancelActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/src/com/android/contacts/common/vcard/CancelRequest.java b/src/com/android/contacts/vcard/CancelRequest.java
similarity index 95%
rename from src/com/android/contacts/common/vcard/CancelRequest.java
rename to src/com/android/contacts/vcard/CancelRequest.java
index a5eb4aa..0b4baee 100644
--- a/src/com/android/contacts/common/vcard/CancelRequest.java
+++ b/src/com/android/contacts/vcard/CancelRequest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 /**
  * Class representing one request for canceling vCard import/export.
diff --git a/src/com/android/contacts/common/vcard/ExportProcessor.java b/src/com/android/contacts/vcard/ExportProcessor.java
similarity index 99%
rename from src/com/android/contacts/common/vcard/ExportProcessor.java
rename to src/com/android/contacts/vcard/ExportProcessor.java
index 48420da..27a7601 100644
--- a/src/com/android/contacts/common/vcard/ExportProcessor.java
+++ b/src/com/android/contacts/vcard/ExportProcessor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 import android.app.Notification;
 import android.app.NotificationManager;
diff --git a/src/com/android/contacts/common/vcard/ExportRequest.java b/src/com/android/contacts/vcard/ExportRequest.java
similarity index 95%
rename from src/com/android/contacts/common/vcard/ExportRequest.java
rename to src/com/android/contacts/vcard/ExportRequest.java
index e05a32c..65e395e 100644
--- a/src/com/android/contacts/common/vcard/ExportRequest.java
+++ b/src/com/android/contacts/vcard/ExportRequest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 import android.net.Uri;
 
diff --git a/src/com/android/contacts/common/vcard/ExportVCardActivity.java b/src/com/android/contacts/vcard/ExportVCardActivity.java
similarity index 99%
rename from src/com/android/contacts/common/vcard/ExportVCardActivity.java
rename to src/com/android/contacts/vcard/ExportVCardActivity.java
index 18de505..a6c96ea 100644
--- a/src/com/android/contacts/common/vcard/ExportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ExportVCardActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/src/com/android/contacts/common/vcard/ImportProcessor.java b/src/com/android/contacts/vcard/ImportProcessor.java
similarity index 99%
rename from src/com/android/contacts/common/vcard/ImportProcessor.java
rename to src/com/android/contacts/vcard/ImportProcessor.java
index 36836c6..d6483b8 100644
--- a/src/com/android/contacts/common/vcard/ImportProcessor.java
+++ b/src/com/android/contacts/vcard/ImportProcessor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 import android.accounts.Account;
 import android.content.ContentResolver;
diff --git a/src/com/android/contacts/common/vcard/ImportRequest.java b/src/com/android/contacts/vcard/ImportRequest.java
similarity index 96%
rename from src/com/android/contacts/common/vcard/ImportRequest.java
rename to src/com/android/contacts/vcard/ImportRequest.java
index 32efb99..6e9470f 100644
--- a/src/com/android/contacts/common/vcard/ImportRequest.java
+++ b/src/com/android/contacts/vcard/ImportRequest.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 import android.accounts.Account;
 import android.net.Uri;
 
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.vcard.VCardSourceDetector;
 
 /**
diff --git a/src/com/android/contacts/common/vcard/ImportVCardActivity.java b/src/com/android/contacts/vcard/ImportVCardActivity.java
similarity index 98%
rename from src/com/android/contacts/common/vcard/ImportVCardActivity.java
rename to src/com/android/contacts/vcard/ImportVCardActivity.java
index e5fab4e..e65c3d5 100644
--- a/src/com/android/contacts/common/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ImportVCardActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -42,8 +42,8 @@
 
 import com.android.contacts.common.R;
 import com.android.contacts.common.activity.RequestImportVCardPermissionsActivity;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contactsbind.FeedbackHelper;
 import com.android.vcard.VCardEntryCounter;
 import com.android.vcard.VCardParser;
@@ -92,10 +92,10 @@
     private static final int FAILURE_NOTIFICATION_ID = 1;
 
     private static final String LOCAL_TMP_FILE_NAME_EXTRA =
-            "com.android.contacts.common.vcard.LOCAL_TMP_FILE_NAME";
+            "com.android.contacts.vcard.LOCAL_TMP_FILE_NAME";
 
     private static final String SOURCE_URI_DISPLAY_NAME =
-            "com.android.contacts.common.vcard.SOURCE_URI_DISPLAY_NAME";
+            "com.android.contacts.vcard.SOURCE_URI_DISPLAY_NAME";
 
     private static final String STORAGE_VCARD_URI_PREFIX = "file:///storage";
 
diff --git a/src/com/android/contacts/common/vcard/ImportVCardDialogFragment.java b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
similarity index 98%
rename from src/com/android/contacts/common/vcard/ImportVCardDialogFragment.java
rename to src/com/android/contacts/vcard/ImportVCardDialogFragment.java
index b1f1c3b..521a610 100644
--- a/src/com/android/contacts/common/vcard/ImportVCardDialogFragment.java
+++ b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/src/com/android/contacts/common/vcard/NfcImportVCardActivity.java b/src/com/android/contacts/vcard/NfcImportVCardActivity.java
similarity index 97%
rename from src/com/android/contacts/common/vcard/NfcImportVCardActivity.java
rename to src/com/android/contacts/vcard/NfcImportVCardActivity.java
index f2ddcab..bcf375a 100644
--- a/src/com/android/contacts/common/vcard/NfcImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/NfcImportVCardActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 import android.app.Activity;
 import android.app.Notification;
@@ -37,9 +37,9 @@
 
 import com.android.contacts.common.R;
 import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.ImplicitIntentsUtil;
 import com.android.contactsbind.FeedbackHelper;
 import com.android.vcard.VCardEntry;
 import com.android.vcard.VCardEntryCounter;
diff --git a/src/com/android/contacts/common/vcard/NotificationImportExportListener.java b/src/com/android/contacts/vcard/NotificationImportExportListener.java
similarity index 99%
rename from src/com/android/contacts/common/vcard/NotificationImportExportListener.java
rename to src/com/android/contacts/vcard/NotificationImportExportListener.java
index 2ac8c1c..247f399 100644
--- a/src/com/android/contacts/common/vcard/NotificationImportExportListener.java
+++ b/src/com/android/contacts/vcard/NotificationImportExportListener.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 import android.app.Activity;
 import android.app.Notification;
diff --git a/src/com/android/contacts/common/vcard/ProcessorBase.java b/src/com/android/contacts/vcard/ProcessorBase.java
similarity index 98%
rename from src/com/android/contacts/common/vcard/ProcessorBase.java
rename to src/com/android/contacts/vcard/ProcessorBase.java
index abc859d..1ce21cf 100644
--- a/src/com/android/contacts/common/vcard/ProcessorBase.java
+++ b/src/com/android/contacts/vcard/ProcessorBase.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
diff --git a/src/com/android/contacts/common/vcard/SelectAccountActivity.java b/src/com/android/contacts/vcard/SelectAccountActivity.java
similarity index 94%
rename from src/com/android/contacts/common/vcard/SelectAccountActivity.java
rename to src/com/android/contacts/vcard/SelectAccountActivity.java
index 387f3fb..a0583d2 100644
--- a/src/com/android/contacts/common/vcard/SelectAccountActivity.java
+++ b/src/com/android/contacts/vcard/SelectAccountActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -23,9 +23,9 @@
 import android.util.Log;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountSelectionUtil;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountSelectionUtil;
 
 import java.util.List;
 
diff --git a/src/com/android/contacts/common/vcard/ShareVCardActivity.java b/src/com/android/contacts/vcard/ShareVCardActivity.java
similarity index 98%
rename from src/com/android/contacts/common/vcard/ShareVCardActivity.java
rename to src/com/android/contacts/vcard/ShareVCardActivity.java
index 26d20d1..ba6ce92 100644
--- a/src/com/android/contacts/common/vcard/ShareVCardActivity.java
+++ b/src/com/android/contacts/vcard/ShareVCardActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 import android.content.ComponentName;
 import android.net.Uri;
diff --git a/src/com/android/contacts/common/vcard/VCardCommonArguments.java b/src/com/android/contacts/vcard/VCardCommonArguments.java
similarity index 95%
rename from src/com/android/contacts/common/vcard/VCardCommonArguments.java
rename to src/com/android/contacts/vcard/VCardCommonArguments.java
index c423ca3..06b49a2 100644
--- a/src/com/android/contacts/common/vcard/VCardCommonArguments.java
+++ b/src/com/android/contacts/vcard/VCardCommonArguments.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 /**
  * Argument constants used by many activities and services.
diff --git a/src/com/android/contacts/common/vcard/VCardImportExportListener.java b/src/com/android/contacts/vcard/VCardImportExportListener.java
similarity index 96%
rename from src/com/android/contacts/common/vcard/VCardImportExportListener.java
rename to src/com/android/contacts/vcard/VCardImportExportListener.java
index e4e4893..82d7c21 100644
--- a/src/com/android/contacts/common/vcard/VCardImportExportListener.java
+++ b/src/com/android/contacts/vcard/VCardImportExportListener.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 import android.net.Uri;
 
diff --git a/src/com/android/contacts/common/vcard/VCardService.java b/src/com/android/contacts/vcard/VCardService.java
similarity index 97%
rename from src/com/android/contacts/common/vcard/VCardService.java
rename to src/com/android/contacts/vcard/VCardService.java
index 1d7837b..721c2e4 100644
--- a/src/com/android/contacts/common/vcard/VCardService.java
+++ b/src/com/android/contacts/vcard/VCardService.java
@@ -13,31 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
 
 import android.app.Service;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.media.MediaScannerConnection;
 import android.media.MediaScannerConnection.MediaScannerConnectionClient;
 import android.net.Uri;
 import android.os.Binder;
-import android.os.Environment;
 import android.os.IBinder;
-import android.os.Message;
-import android.os.Messenger;
-import android.os.RemoteException;
-import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 
 import com.android.contacts.common.R;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
diff --git a/src/com/android/contacts/common/widget/ActivityTouchLinearLayout.java b/src/com/android/contacts/widget/ActivityTouchLinearLayout.java
similarity index 92%
rename from src/com/android/contacts/common/widget/ActivityTouchLinearLayout.java
rename to src/com/android/contacts/widget/ActivityTouchLinearLayout.java
index d81526e..bcedb72 100644
--- a/src/com/android/contacts/common/widget/ActivityTouchLinearLayout.java
+++ b/src/com/android/contacts/widget/ActivityTouchLinearLayout.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.widget;
+package com.android.contacts.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.widget.LinearLayout;
 
-import com.android.contacts.common.interactions.TouchPointManager;
+import com.android.contacts.interactions.TouchPointManager;
 
 /**
  * Linear layout for an activity that listens to all touch events on the screen and saves the touch
diff --git a/src/com/android/contacts/common/widget/FloatingActionButtonController.java b/src/com/android/contacts/widget/FloatingActionButtonController.java
similarity index 98%
rename from src/com/android/contacts/common/widget/FloatingActionButtonController.java
rename to src/com/android/contacts/widget/FloatingActionButtonController.java
index 0e94df1..9f35049 100644
--- a/src/com/android/contacts/common/widget/FloatingActionButtonController.java
+++ b/src/com/android/contacts/widget/FloatingActionButtonController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.widget;
+package com.android.contacts.widget;
 
 import android.app.Activity;
 import android.content.res.Resources;
@@ -24,7 +24,7 @@
 import android.view.View;
 import android.widget.ImageButton;
 
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.util.ViewUtil;
 import com.android.contacts.common.R;
 import com.android.phone.common.animation.AnimUtils;
 
diff --git a/src/com/android/contacts/common/widget/LayoutSuppressingImageView.java b/src/com/android/contacts/widget/LayoutSuppressingImageView.java
similarity index 96%
rename from src/com/android/contacts/common/widget/LayoutSuppressingImageView.java
rename to src/com/android/contacts/widget/LayoutSuppressingImageView.java
index abcf786..d80aeea 100644
--- a/src/com/android/contacts/common/widget/LayoutSuppressingImageView.java
+++ b/src/com/android/contacts/widget/LayoutSuppressingImageView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.widget;
+package com.android.contacts.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/contacts/common/widget/LayoutSuppressingQuickContactBadge.java b/src/com/android/contacts/widget/LayoutSuppressingQuickContactBadge.java
similarity index 96%
rename from src/com/android/contacts/common/widget/LayoutSuppressingQuickContactBadge.java
rename to src/com/android/contacts/widget/LayoutSuppressingQuickContactBadge.java
index 1f48f5d..3413e53 100644
--- a/src/com/android/contacts/common/widget/LayoutSuppressingQuickContactBadge.java
+++ b/src/com/android/contacts/widget/LayoutSuppressingQuickContactBadge.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.widget;
+package com.android.contacts.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java
index b86bebf..245f781 100644
--- a/src/com/android/contacts/widget/MultiShrinkScroller.java
+++ b/src/com/android/contacts/widget/MultiShrinkScroller.java
@@ -1,7 +1,7 @@
 package com.android.contacts.widget;
 
 import com.android.contacts.R;
-import com.android.contacts.common.compat.CompatUtils;
+import com.android.contacts.compat.CompatUtils;
 import com.android.contacts.compat.EdgeEffectCompat;
 import com.android.contacts.quickcontact.ExpandingEntryCardView;
 import com.android.contacts.test.NeededForReflection;
diff --git a/src/com/android/contacts/common/widget/ProportionalLayout.java b/src/com/android/contacts/widget/ProportionalLayout.java
similarity index 98%
rename from src/com/android/contacts/common/widget/ProportionalLayout.java
rename to src/com/android/contacts/widget/ProportionalLayout.java
index 5a5ac29..b60d2a4 100644
--- a/src/com/android/contacts/common/widget/ProportionalLayout.java
+++ b/src/com/android/contacts/widget/ProportionalLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.widget;
+package com.android.contacts.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/src/com/android/contacts/widget/QuickContactImageView.java b/src/com/android/contacts/widget/QuickContactImageView.java
index f85fe16..4c21670 100644
--- a/src/com/android/contacts/widget/QuickContactImageView.java
+++ b/src/com/android/contacts/widget/QuickContactImageView.java
@@ -1,6 +1,6 @@
 package com.android.contacts.widget;
 
-import com.android.contacts.common.lettertiles.LetterTileDrawable;
+import com.android.contacts.lettertiles.LetterTileDrawable;
 
 import android.content.Context;
 import android.graphics.drawable.BitmapDrawable;
diff --git a/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java b/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
similarity index 97%
rename from src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
rename to src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
index 709ce41..8b7bb5f 100644
--- a/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
+++ b/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
@@ -14,14 +14,13 @@
  * limitations under the License
  */
 
-package com.android.contacts.common.widget;
+package com.android.contacts.widget;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.drawable.Icon;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.ResultReceiver;
@@ -41,8 +40,8 @@
 import android.widget.TextView;
 
 import com.android.contacts.common.R;
-import com.android.contacts.common.compat.PhoneAccountCompat;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.compat.PhoneAccountCompat;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
 
 import java.util.ArrayList;
 import java.util.List;