diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b04c8ab..649c14f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -206,7 +206,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".search2.SearchActivity"
+        <activity android:name=".search.SearchActivity"
                   android:label="@string/search_settings"
                   android:icon="@drawable/ic_search_history"
                   android:parentActivityName="Settings">
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 3e45af7..daa23d6 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -62,7 +62,7 @@
 import com.android.settings.development.DevelopmentSettings;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.DynamicIndexableContentMonitor;
-import com.android.settings.search2.SearchFeatureProvider;
+import com.android.settings.search.SearchFeatureProvider;
 import com.android.settings.wfd.WifiDisplaySettings;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.drawer.DashboardCategory;
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index b0403b8..03a620b 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -49,7 +49,7 @@
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.search2.SearchFeatureProviderImpl;
+import com.android.settings.search.SearchFeatureProviderImpl;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.accounts.AuthenticatorHelper;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/src/com/android/settings/core/PreferenceController.java b/src/com/android/settings/core/PreferenceController.java
index 002240d..2b3a7ab 100644
--- a/src/com/android/settings/core/PreferenceController.java
+++ b/src/com/android/settings/core/PreferenceController.java
@@ -18,7 +18,7 @@
 import android.content.Context;
 
 import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.search2.ResultPayload;
+import com.android.settings.search.ResultPayload;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index f36ed36..0cff755 100644
--- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -21,9 +21,9 @@
 
 import android.util.ArrayMap;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.search2.DatabaseIndexingUtils;
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
 import com.android.settings.R;
 
 import java.util.Map;
diff --git a/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java b/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java
index 35f4bc6..955f747 100644
--- a/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java
+++ b/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java
@@ -20,10 +20,7 @@
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 
-import android.util.ArrayMap;
 import com.android.settings.R;
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class CameraLiftTriggerPreferenceController extends GesturePreferenceController {
diff --git a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
index 75cffa5..b760c25 100644
--- a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
+++ b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
@@ -20,9 +20,6 @@
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 
-import android.util.ArrayMap;
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class SwipeToNotificationPreferenceController extends GesturePreferenceController {
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
index 60893b2..4c4621a 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -30,8 +30,8 @@
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.gestures.AssistGestureFeatureProvider;
 import com.android.settings.localepicker.LocaleFeatureProvider;
-import com.android.settings.search2.SearchFeatureProvider;
 import com.android.settings.security.SecurityFeatureProvider;
+import com.android.settings.search.SearchFeatureProvider;
 import com.android.settings.users.UserFeatureProvider;
 
 /**
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index 21b33c9..d4ee912 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -43,8 +43,8 @@
 import com.android.settings.gestures.AssistGestureFeatureProviderImpl;
 import com.android.settings.localepicker.LocaleFeatureProvider;
 import com.android.settings.localepicker.LocaleFeatureProviderImpl;
-import com.android.settings.search2.SearchFeatureProvider;
-import com.android.settings.search2.SearchFeatureProviderImpl;
+import com.android.settings.search.SearchFeatureProvider;
+import com.android.settings.search.SearchFeatureProviderImpl;
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.security.SecurityFeatureProviderImpl;
 import com.android.settings.users.UserFeatureProvider;
diff --git a/src/com/android/settings/search2/AppSearchResult.java b/src/com/android/settings/search/AppSearchResult.java
similarity index 96%
rename from src/com/android/settings/search2/AppSearchResult.java
rename to src/com/android/settings/search/AppSearchResult.java
index 111f775..fcb83dc 100644
--- a/src/com/android/settings/search2/AppSearchResult.java
+++ b/src/com/android/settings/search/AppSearchResult.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.pm.ApplicationInfo;
 
diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java
index 724868e..11b4db1 100644
--- a/src/com/android/settings/search/BaseSearchIndexProvider.java
+++ b/src/com/android/settings/search/BaseSearchIndexProvider.java
@@ -26,7 +26,6 @@
 import android.util.Xml;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.search2.XmlParserUtils;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
diff --git a/src/com/android/settings/search2/CursorToSearchResultConverter.java b/src/com/android/settings/search/CursorToSearchResultConverter.java
similarity index 87%
rename from src/com/android/settings/search2/CursorToSearchResultConverter.java
rename to src/com/android/settings/search/CursorToSearchResultConverter.java
index 30afbd0..1fa3980 100644
--- a/src/com/android/settings/search2/CursorToSearchResultConverter.java
+++ b/src/com/android/settings/search/CursorToSearchResultConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -37,17 +37,18 @@
 import java.util.Map;
 import java.util.Set;
 
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_CLASS_NAME;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_ICON;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_ID;
-import static com.android.settings.search2.DatabaseResultLoader
-        .COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_KEY;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD_TYPE;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_SCREEN_TITLE;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_SUMMARY_ON;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_TITLE;
+import static com.android.settings.search.DatabaseResultLoader.BASE_RANKS;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_CLASS_NAME;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_ICON;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_ID;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_KEY;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD_TYPE;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_SCREEN_TITLE;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_SUMMARY_ON;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_TITLE;
+import static com.android.settings.search.SearchResult.TOP_RANK;
 
 /**
  * Controller to Build search results from {@link Cursor} Objects.
@@ -221,8 +222,8 @@
      */
     private int getRank(String title, List<String> crumbs, int baseRank, String key) {
         // The result can only be prioritized if it is a top ranked result.
-        if (prioritySettings.contains(key) && baseRank < DatabaseResultLoader.BASE_RANKS[1]) {
-            return SearchResult.TOP_RANK;
+        if (prioritySettings.contains(key) && baseRank < BASE_RANKS[1]) {
+            return TOP_RANK;
         }
         if (title.length() > LONG_TITLE_LENGTH) {
             return baseRank + 2;
diff --git a/src/com/android/settings/search2/DatabaseIndexingManager.java b/src/com/android/settings/search/DatabaseIndexingManager.java
similarity index 98%
rename from src/com/android/settings/search2/DatabaseIndexingManager.java
rename to src/com/android/settings/search/DatabaseIndexingManager.java
index 6e36d18..0e10774 100644
--- a/src/com/android/settings/search2/DatabaseIndexingManager.java
+++ b/src/com/android/settings/search/DatabaseIndexingManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -43,11 +43,6 @@
 
 import com.android.settings.SettingsActivity;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.search.IndexDatabaseHelper;
-import com.android.settings.search.Indexable;
-import com.android.settings.search.IndexingCallback;
-import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.search.SearchIndexableResources;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -84,9 +79,9 @@
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_ACTION;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_CLASS;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RANK;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID;
 
+import static com.android.settings.search.DatabaseResultLoader.*;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.CLASS_NAME;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_ENTRIES;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS;
@@ -111,11 +106,6 @@
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.USER_ID;
 import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX;
 
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_ID;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_KEY;
-import static com.android.settings.search2.DatabaseResultLoader.SELECT_COLUMNS;
-
 /**
  * Consumes the SearchIndexableProvider content providers.
  * Updates the Resource, Raw Data and non-indexable data for Search.
diff --git a/src/com/android/settings/search2/DatabaseIndexingUtils.java b/src/com/android/settings/search/DatabaseIndexingUtils.java
similarity index 98%
rename from src/com/android/settings/search2/DatabaseIndexingUtils.java
rename to src/com/android/settings/search/DatabaseIndexingUtils.java
index b93fa10..a6f3cb1 100644
--- a/src/com/android/settings/search2/DatabaseIndexingUtils.java
+++ b/src/com/android/settings/search/DatabaseIndexingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.Manifest;
 import android.content.Context;
@@ -34,7 +34,6 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.search.Indexable;
 
 import java.lang.reflect.Field;
 import java.text.Normalizer;
diff --git a/src/com/android/settings/search2/DatabaseResultLoader.java b/src/com/android/settings/search/DatabaseResultLoader.java
similarity index 98%
rename from src/com/android/settings/search2/DatabaseResultLoader.java
rename to src/com/android/settings/search/DatabaseResultLoader.java
index 5892ebc..853e691 100644
--- a/src/com/android/settings/search2/DatabaseResultLoader.java
+++ b/src/com/android/settings/search/DatabaseResultLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -23,8 +24,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.IndexDatabaseHelper;
 import com.android.settings.utils.AsyncLoader;
 
 import java.util.ArrayList;
diff --git a/src/com/android/settings/search/DynamicIndexableContentMonitor.java b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
index bb9f5ad..0758387 100644
--- a/src/com/android/settings/search/DynamicIndexableContentMonitor.java
+++ b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
@@ -54,7 +54,6 @@
 import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.print.PrintSettingsFragment;
-import com.android.settings.search2.DatabaseIndexingManager;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/settings/search2/InlinePayload.java b/src/com/android/settings/search/InlinePayload.java
similarity index 93%
rename from src/com/android/settings/search2/InlinePayload.java
rename to src/com/android/settings/search/InlinePayload.java
index 9b1dadd..b2bb59d 100644
--- a/src/com/android/settings/search2/InlinePayload.java
+++ b/src/com/android/settings/search/InlinePayload.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.content.Intent;
 
diff --git a/src/com/android/settings/search2/InlineSwitchPayload.java b/src/com/android/settings/search/InlineSwitchPayload.java
similarity index 97%
rename from src/com/android/settings/search2/InlineSwitchPayload.java
rename to src/com/android/settings/search/InlineSwitchPayload.java
index b223ce8..8046b72 100644
--- a/src/com/android/settings/search2/InlineSwitchPayload.java
+++ b/src/com/android/settings/search/InlineSwitchPayload.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/com/android/settings/search2/InlineSwitchViewHolder.java b/src/com/android/settings/search/InlineSwitchViewHolder.java
similarity index 96%
rename from src/com/android/settings/search2/InlineSwitchViewHolder.java
rename to src/com/android/settings/search/InlineSwitchViewHolder.java
index d4a0ca2..2b3642f 100644
--- a/src/com/android/settings/search2/InlineSwitchViewHolder.java
+++ b/src/com/android/settings/search/InlineSwitchViewHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.util.Pair;
diff --git a/src/com/android/settings/search2/InstalledAppResultLoader.java b/src/com/android/settings/search/InstalledAppResultLoader.java
similarity index 98%
rename from src/com/android/settings/search2/InstalledAppResultLoader.java
rename to src/com/android/settings/search/InstalledAppResultLoader.java
index 978693c..2966838 100644
--- a/src/com/android/settings/search2/InstalledAppResultLoader.java
+++ b/src/com/android/settings/search/InstalledAppResultLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/com/android/settings/search2/IntentSearchViewHolder.java b/src/com/android/settings/search/IntentSearchViewHolder.java
similarity index 95%
rename from src/com/android/settings/search2/IntentSearchViewHolder.java
rename to src/com/android/settings/search/IntentSearchViewHolder.java
index e81056a..68129b6 100644
--- a/src/com/android/settings/search2/IntentSearchViewHolder.java
+++ b/src/com/android/settings/search/IntentSearchViewHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -12,8 +12,9 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.content.ComponentName;
 import android.content.Intent;
diff --git a/src/com/android/settings/search2/ResultPayload.java b/src/com/android/settings/search/ResultPayload.java
similarity index 96%
rename from src/com/android/settings/search2/ResultPayload.java
rename to src/com/android/settings/search/ResultPayload.java
index fe4cea0..2352ffd 100644
--- a/src/com/android/settings/search2/ResultPayload.java
+++ b/src/com/android/settings/search/ResultPayload.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.annotation.IntDef;
 import android.content.Intent;
diff --git a/src/com/android/settings/search2/ResultPayloadUtils.java b/src/com/android/settings/search/ResultPayloadUtils.java
similarity index 88%
rename from src/com/android/settings/search2/ResultPayloadUtils.java
rename to src/com/android/settings/search/ResultPayloadUtils.java
index 41d15e2..2c908c1 100644
--- a/src/com/android/settings/search2/ResultPayloadUtils.java
+++ b/src/com/android/settings/search/ResultPayloadUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -15,14 +15,10 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
-import android.os.BadParcelableException;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.util.Log;
-
-import java.io.StreamCorruptedException;
 
 /**
  * Utility class to Marshall and Unmarshall the payloads stored in the SQLite Database
diff --git a/src/com/android/settings/search2/SavedQueryController.java b/src/com/android/settings/search/SavedQueryController.java
similarity index 98%
rename from src/com/android/settings/search2/SavedQueryController.java
rename to src/com/android/settings/search/SavedQueryController.java
index 92ca42a..f6a3ff6 100644
--- a/src/com/android/settings/search2/SavedQueryController.java
+++ b/src/com/android/settings/search/SavedQueryController.java
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.app.LoaderManager;
 import android.content.Context;
diff --git a/src/com/android/settings/search2/SavedQueryLoader.java b/src/com/android/settings/search/SavedQueryLoader.java
similarity index 96%
rename from src/com/android/settings/search2/SavedQueryLoader.java
rename to src/com/android/settings/search/SavedQueryLoader.java
index 245842c..0cf5ceb 100644
--- a/src/com/android/settings/search2/SavedQueryLoader.java
+++ b/src/com/android/settings/search/SavedQueryLoader.java
@@ -12,16 +12,16 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.support.annotation.VisibleForTesting;
 
-import com.android.settings.search.IndexDatabaseHelper;
 import com.android.settings.search.IndexDatabaseHelper.SavedQueriesColumns;
 import com.android.settings.utils.AsyncLoader;
 
diff --git a/src/com/android/settings/search2/SavedQueryPayload.java b/src/com/android/settings/search/SavedQueryPayload.java
similarity index 97%
rename from src/com/android/settings/search2/SavedQueryPayload.java
rename to src/com/android/settings/search/SavedQueryPayload.java
index 7e0e213..0a151fc 100644
--- a/src/com/android/settings/search2/SavedQueryPayload.java
+++ b/src/com/android/settings/search/SavedQueryPayload.java
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.os.Parcel;
 import android.support.annotation.VisibleForTesting;
diff --git a/src/com/android/settings/search2/SavedQueryRecorder.java b/src/com/android/settings/search/SavedQueryRecorder.java
similarity index 98%
rename from src/com/android/settings/search2/SavedQueryRecorder.java
rename to src/com/android/settings/search/SavedQueryRecorder.java
index e2325e8..466af0b 100644
--- a/src/com/android/settings/search2/SavedQueryRecorder.java
+++ b/src/com/android/settings/search/SavedQueryRecorder.java
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/com/android/settings/search2/SavedQueryRemover.java b/src/com/android/settings/search/SavedQueryRemover.java
similarity index 97%
rename from src/com/android/settings/search2/SavedQueryRemover.java
rename to src/com/android/settings/search/SavedQueryRemover.java
index 4395cb6..47bb3ba 100644
--- a/src/com/android/settings/search2/SavedQueryRemover.java
+++ b/src/com/android/settings/search/SavedQueryRemover.java
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/src/com/android/settings/search2/SavedQueryViewHolder.java b/src/com/android/settings/search/SavedQueryViewHolder.java
similarity index 96%
rename from src/com/android/settings/search2/SavedQueryViewHolder.java
rename to src/com/android/settings/search/SavedQueryViewHolder.java
index e468eb9..158f698 100644
--- a/src/com/android/settings/search2/SavedQueryViewHolder.java
+++ b/src/com/android/settings/search/SavedQueryViewHolder.java
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.view.View;
 import android.widget.TextView;
diff --git a/src/com/android/settings/search2/SearchActivity.java b/src/com/android/settings/search/SearchActivity.java
similarity index 93%
rename from src/com/android/settings/search2/SearchActivity.java
rename to src/com/android/settings/search/SearchActivity.java
index 5a8455b..61a580b 100644
--- a/src/com/android/settings/search2/SearchActivity.java
+++ b/src/com/android/settings/search/SearchActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.app.Activity;
 import android.app.Fragment;
diff --git a/src/com/android/settings/search2/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
similarity index 95%
rename from src/com/android/settings/search2/SearchFeatureProvider.java
rename to src/com/android/settings/search/SearchFeatureProvider.java
index 8a574ba..8e30826 100644
--- a/src/com/android/settings/search2/SearchFeatureProvider.java
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -12,8 +12,9 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.app.Activity;
 import android.content.Context;
@@ -21,7 +22,6 @@
 
 import android.view.View;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search.IndexingCallback;
 
 import java.util.List;
 
diff --git a/src/com/android/settings/search2/SearchFeatureProviderImpl.java b/src/com/android/settings/search/SearchFeatureProviderImpl.java
similarity index 93%
rename from src/com/android/settings/search2/SearchFeatureProviderImpl.java
rename to src/com/android/settings/search/SearchFeatureProviderImpl.java
index 4e47f9d..725a8ee 100644
--- a/src/com/android/settings/search2/SearchFeatureProviderImpl.java
+++ b/src/com/android/settings/search/SearchFeatureProviderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -12,14 +12,14 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -27,9 +27,6 @@
 import com.android.settings.R;
 import com.android.settings.applications.PackageManagerWrapperImpl;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search.IndexingCallback;
-
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * FeatureProvider for the refactored search code.
diff --git a/src/com/android/settings/search2/SearchFragment.java b/src/com/android/settings/search/SearchFragment.java
similarity index 98%
rename from src/com/android/settings/search2/SearchFragment.java
rename to src/com/android/settings/search/SearchFragment.java
index c230686..e50558b 100644
--- a/src/com/android/settings/search2/SearchFragment.java
+++ b/src/com/android/settings/search/SearchFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -41,7 +42,6 @@
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.IndexingCallback;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/src/com/android/settings/search2/SearchResult.java b/src/com/android/settings/search/SearchResult.java
similarity index 97%
rename from src/com/android/settings/search2/SearchResult.java
rename to src/com/android/settings/search/SearchResult.java
index 36fe5b3..c0e817c 100644
--- a/src/com/android/settings/search2/SearchResult.java
+++ b/src/com/android/settings/search/SearchResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.graphics.drawable.Drawable;
 
diff --git a/src/com/android/settings/search2/SearchResultDiffCallback.java b/src/com/android/settings/search/SearchResultDiffCallback.java
similarity index 97%
rename from src/com/android/settings/search2/SearchResultDiffCallback.java
rename to src/com/android/settings/search/SearchResultDiffCallback.java
index 9bd1bde..b7bbc66 100644
--- a/src/com/android/settings/search2/SearchResultDiffCallback.java
+++ b/src/com/android/settings/search/SearchResultDiffCallback.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.support.v7.util.DiffUtil;
 
diff --git a/src/com/android/settings/search2/SearchResultsAdapter.java b/src/com/android/settings/search/SearchResultsAdapter.java
similarity index 92%
rename from src/com/android/settings/search2/SearchResultsAdapter.java
rename to src/com/android/settings/search/SearchResultsAdapter.java
index 5da5966..7861b08 100644
--- a/src/com/android/settings/search2/SearchResultsAdapter.java
+++ b/src/com/android/settings/search/SearchResultsAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.support.annotation.MainThread;
@@ -27,15 +28,11 @@
 import android.view.ViewGroup;
 
 import com.android.settings.R;
-import com.android.settings.search2.ResultPayload.PayloadType;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import static com.android.settings.search2.SearchResult.BOTTOM_RANK;
-import static com.android.settings.search2.SearchResult.TOP_RANK;
-
 public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder> {
 
     private final SearchFragment mFragment;
@@ -60,13 +57,13 @@
         final LayoutInflater inflater = LayoutInflater.from(context);
         final View view;
         switch (viewType) {
-            case PayloadType.INTENT:
+            case ResultPayload.PayloadType.INTENT:
                 view = inflater.inflate(R.layout.search_intent_item, parent, false);
                 return new IntentSearchViewHolder(view);
-            case PayloadType.INLINE_SWITCH:
+            case ResultPayload.PayloadType.INLINE_SWITCH:
                 view = inflater.inflate(R.layout.search_inline_switch_item, parent, false);
                 return new InlineSwitchViewHolder(view, context);
-            case PayloadType.SAVED_QUERY:
+            case ResultPayload.PayloadType.SAVED_QUERY:
                 view = inflater.inflate(R.layout.search_saved_query_item, parent, false);
                 return new SavedQueryViewHolder(view);
             default:
@@ -138,9 +135,9 @@
 
         int dbIndex = 0;
         int appIndex = 0;
-        int rank = TOP_RANK;
+        int rank = SearchResult.TOP_RANK;
 
-        while (rank <= BOTTOM_RANK) {
+        while (rank <= SearchResult.BOTTOM_RANK) {
             while ((dbIndex < dbSize) && (databaseResults.get(dbIndex).rank == rank)) {
                 newResults.add(databaseResults.get(dbIndex++));
             }
diff --git a/src/com/android/settings/search2/SearchViewHolder.java b/src/com/android/settings/search/SearchViewHolder.java
similarity index 97%
rename from src/com/android/settings/search2/SearchViewHolder.java
rename to src/com/android/settings/search/SearchViewHolder.java
index f2fdc70..93409ee 100644
--- a/src/com/android/settings/search2/SearchViewHolder.java
+++ b/src/com/android/settings/search/SearchViewHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -12,8 +12,9 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
diff --git a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
index 1bf0a15..f7c2a16 100644
--- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
+++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
@@ -23,8 +23,6 @@
 import android.provider.SearchIndexablesProvider;
 import android.util.Log;
 
-import com.android.settings.search2.DatabaseIndexingUtils;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/src/com/android/settings/search2/XmlParserUtils.java b/src/com/android/settings/search/XmlParserUtils.java
similarity index 97%
rename from src/com/android/settings/search2/XmlParserUtils.java
rename to src/com/android/settings/search/XmlParserUtils.java
index 17f1743..c81381c 100644
--- a/src/com/android/settings/search2/XmlParserUtils.java
+++ b/src/com/android/settings/search/XmlParserUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java b/tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java
similarity index 97%
rename from tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java
rename to tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java
index e6fe899..2d89721 100644
--- a/tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java
+++ b/tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.support.test.filters.SmallTest;
 import android.support.test.rule.ActivityTestRule;
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
index 6b22f7b..d102ab4 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
@@ -21,7 +21,7 @@
 
 import com.android.settings.core.PreferenceController;
 import com.android.settings.search.Indexable;
-import com.android.settings.search2.DatabaseIndexingUtils;
+import com.android.settings.search.DatabaseIndexingUtils;
 
 import org.robolectric.RuntimeEnvironment;
 
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
index 8dcb7d5..40190d4 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
@@ -29,7 +29,7 @@
 import com.android.settings.development.DevelopmentSettings;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.DatabaseIndexingManager;
+import com.android.settings.search.DatabaseIndexingManager;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -41,7 +41,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
index 6d8696f..a7da857 100644
--- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
@@ -20,9 +20,8 @@
 import android.provider.Settings;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.gestures.DoubleTapPowerPreferenceController;
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java
index e83e237..9bf8438 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java
@@ -23,8 +23,6 @@
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -34,12 +32,8 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED;
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java
index 229ef49..c4b3354 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java
@@ -23,25 +23,15 @@
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED;
-import static android.provider.Settings.Secure.ASSIST_GESTURE_SENSITIVITY;
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java
index 3ea26ab..c3c9379 100644
--- a/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java
@@ -24,8 +24,6 @@
 import com.android.settings.TestConfig;
 
 import com.android.settings.R;
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -34,7 +32,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
 import static android.provider.Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED;
 import static com.google.common.truth.Truth.assertThat;
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
index d7961e3..3e0df89 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
@@ -23,8 +23,6 @@
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
index 442d11d..9958bce 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
@@ -22,8 +22,6 @@
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
index 8393fc3..81dc1fb 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
@@ -24,8 +24,6 @@
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
index 46c0f65..d21a8c7 100644
--- a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
@@ -22,8 +22,6 @@
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
index cf26cb2..8a83e27 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
@@ -22,8 +22,6 @@
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java
rename to tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
index 7d05729..b43846d 100644
--- a/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java
+++ b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -15,26 +15,30 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.database.MatrixCursor;
-import android.graphics.Matrix;
 import android.graphics.drawable.Drawable;
 import android.util.ArrayMap;
 
 import com.android.settings.DisplaySettings;
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.SubSettings;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SiteMapManager;
 import com.android.settings.gestures.SwipeToNotificationSettings;
-import com.android.settings.search2.ResultPayload.PayloadType;
+import com.android.settings.search.CursorToSearchResultConverter;
+import com.android.settings.search.DatabaseResultLoader;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
+import com.android.settings.search.ResultPayload.PayloadType;
 
+import com.android.settings.search.ResultPayloadUtils;
+import com.android.settings.search.SearchResult;
 import com.android.settings.wifi.WifiSettings;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java b/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
index 6ffd704..cb2b678 100644
--- a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
+++ b/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
@@ -10,7 +10,6 @@
 import com.android.settings.TestConfig;
 import com.android.settings.core.codeinspection.CodeInspector;
 import com.android.settings.datausage.DataUsageSummary;
-import com.android.settings.search2.DatabaseIndexingUtils;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
similarity index 99%
rename from tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
rename to tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
index 6bf421f..85ad495 100644
--- a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
@@ -36,8 +36,12 @@
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.search.DatabaseIndexingManager;
 import com.android.settings.search.IndexDatabaseHelper;
 import com.android.settings.search.IndexingCallback;
+import com.android.settings.search.ResultPayload;
+import com.android.settings.search.ResultPayloadUtils;
+import com.android.settings.search.SearchFeatureProviderImpl;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.shadow.ShadowDatabaseIndexingUtils;
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
index 12ee5ae..a4fa373 100644
--- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
@@ -26,10 +26,7 @@
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.display.AutoBrightnessPreferenceController;
-import com.android.settings.search2.DatabaseIndexingUtils;
 import com.android.settings.deviceinfo.SystemUpdatePreferenceController;
-import com.android.settings.search2.ResultPayload;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java
rename to tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
index 3b65913..4782409 100644
--- a/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -25,7 +25,13 @@
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SiteMapManager;
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.DatabaseResultLoader;
 import com.android.settings.search.IndexDatabaseHelper;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
+import com.android.settings.search.ResultPayloadUtils;
+import com.android.settings.search.SearchResult;
 import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 
diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseRowTest.java b/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/search2/DatabaseRowTest.java
rename to tests/robotests/src/com/android/settings/search/DatabaseRowTest.java
index f3a25ed..db4227b 100644
--- a/tests/robotests/src/com/android/settings/search2/DatabaseRowTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.ComponentName;
 import android.content.Intent;
@@ -23,12 +23,14 @@
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.DatabaseIndexingManager.DatabaseRow;
-import com.android.settings.search2.DatabaseIndexingManager.DatabaseRow.Builder;
+import com.android.settings.search.DatabaseIndexingManager.DatabaseRow;
+import com.android.settings.search.DatabaseIndexingManager.DatabaseRow.Builder;
 
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
+import com.android.settings.search.ResultPayloadUtils;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.Result;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
diff --git a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java
index 79c0d63..8d585e5 100644
--- a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java
+++ b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java
@@ -62,7 +62,6 @@
 import com.android.settings.inputmethod.VirtualKeyboardFragment;
 import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.print.PrintSettingsFragment;
-import com.android.settings.search2.DatabaseIndexingManager;
 import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.shadow.ShadowActivityWithLoadManager;
 import com.android.settings.testutils.shadow.ShadowContextImplWithRegisterReceiver;
diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
index 03c7eed..7167df0 100644
--- a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
@@ -24,8 +24,6 @@
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
index c72d4e8..3621847 100644
--- a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
@@ -26,10 +26,6 @@
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.InlineSwitchViewHolder;
-import com.android.settings.search2.SearchFragment;
-import com.android.settings.search2.SearchResult;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java
rename to tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
index e808946..e167091 100644
--- a/tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.content.Intent;
@@ -27,6 +28,8 @@
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.dashboard.SiteMapManager;
+import com.android.settings.search.InstalledAppResultLoader;
+import com.android.settings.search.SearchResult;
 import com.android.settings.testutils.ApplicationTestUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 
diff --git a/tests/robotests/src/com/android/settings/search2/IntentSearchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/search2/IntentSearchViewHolderTest.java
rename to tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
index 607f293..9d0add6 100644
--- a/tests/robotests/src/com/android/settings/search2/IntentSearchViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -29,7 +29,11 @@
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.SearchResult.Builder;
+import com.android.settings.search.IntentSearchViewHolder;
+import com.android.settings.search.ResultPayload;
+import com.android.settings.search.SearchFragment;
+import com.android.settings.search.SearchResult;
+import com.android.settings.search.SearchResult.Builder;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/search2/MockAppLoader.java b/tests/robotests/src/com/android/settings/search/MockAppLoader.java
similarity index 88%
rename from tests/robotests/src/com/android/settings/search2/MockAppLoader.java
rename to tests/robotests/src/com/android/settings/search/MockAppLoader.java
index 17cda43..35e56a1 100644
--- a/tests/robotests/src/com/android/settings/search2/MockAppLoader.java
+++ b/tests/robotests/src/com/android/settings/search/MockAppLoader.java
@@ -15,9 +15,11 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
+import com.android.settings.search.InstalledAppResultLoader;
+import com.android.settings.search.SearchResult;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/tests/robotests/src/com/android/settings/search2/MockDBLoader.java b/tests/robotests/src/com/android/settings/search/MockDBLoader.java
similarity index 88%
rename from tests/robotests/src/com/android/settings/search2/MockDBLoader.java
rename to tests/robotests/src/com/android/settings/search/MockDBLoader.java
index 18d8771..562e375 100644
--- a/tests/robotests/src/com/android/settings/search2/MockDBLoader.java
+++ b/tests/robotests/src/com/android/settings/search/MockDBLoader.java
@@ -15,9 +15,11 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
+import com.android.settings.search.DatabaseResultLoader;
+import com.android.settings.search.SearchResult;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/tests/robotests/src/com/android/settings/search2/ResultPayloadTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/search2/ResultPayloadTest.java
rename to tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
index 02906ab..d18bac38 100644
--- a/tests/robotests/src/com/android/settings/search2/ResultPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
@@ -15,12 +15,13 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Intent;
 import android.os.Parcel;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.search.ResultPayload;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/tests/robotests/src/com/android/settings/search2/ResultPayloadUtilsTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
similarity index 94%
rename from tests/robotests/src/com/android/settings/search2/ResultPayloadUtilsTest.java
rename to tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
index e9a834a..f3785da 100644
--- a/tests/robotests/src/com/android/settings/search2/ResultPayloadUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
@@ -15,11 +15,13 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Intent;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.search.ResultPayload;
+import com.android.settings.search.ResultPayloadUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
similarity index 93%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
index 5209ed9..5222360 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 
 import android.content.ContentValues;
@@ -24,6 +25,9 @@
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.search.IndexDatabaseHelper;
+import com.android.settings.search.ResultPayload;
+import com.android.settings.search.SavedQueryLoader;
+import com.android.settings.search.SearchResult;
 import com.android.settings.testutils.DatabaseTestUtils;
 
 import org.junit.After;
diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
similarity index 89%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
index daa6d5e..3f0936b 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
@@ -12,14 +12,17 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
+import com.android.settings.search.ResultPayload;
+import com.android.settings.search.SavedQueryPayload;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
similarity index 90%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
index ae78279..5037626 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
@@ -12,15 +12,20 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 
 import android.content.Context;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.search.SavedQueryLoader;
+import com.android.settings.search.SavedQueryRecorder;
+import com.android.settings.search.SavedQueryRemover;
+import com.android.settings.search.SearchResult;
 import com.android.settings.testutils.DatabaseTestUtils;
 
 import org.junit.After;
diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
similarity index 92%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
index 5777609..6927be7 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -24,6 +25,9 @@
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
+import com.android.settings.search.SavedQueryViewHolder;
+import com.android.settings.search.SearchFragment;
+import com.android.settings.search.SearchResult;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
index e733196..782ec58 100644
--- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
@@ -23,7 +23,6 @@
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search2.SearchFeatureProviderImpl;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java
rename to tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
index 2e91ec6..94dc233 100644
--- a/tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.app.LoaderManager;
 import android.content.Context;
@@ -26,7 +27,6 @@
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search.IndexingCallback;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
index 4730e41..b4a91c5 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
@@ -22,7 +22,6 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.codeinspection.CodeInspector;
 import com.android.settings.dashboard.DashboardFragmentSearchIndexProviderInspector;
-import com.android.settings.search2.DatabaseIndexingManager;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
index 0c496c8..8bf4d5e 100644
--- a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
@@ -24,9 +24,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.ResultPayload;
-import com.android.settings.search2.SearchResult;
-import com.android.settings.search2.SearchResult.Builder;
+import com.android.settings.search.SearchResult.Builder;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
index 3007f5e..c700758 100644
--- a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
@@ -27,18 +27,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.AppSearchResult;
-import com.android.settings.search2.DatabaseResultLoader;
-import com.android.settings.search2.InlineSwitchViewHolder;
-import com.android.settings.search2.InstalledAppResultLoader;
-import com.android.settings.search2.ResultPayload;
-import com.android.settings.search2.IntentSearchViewHolder;
-import com.android.settings.search2.SearchFeatureProvider;
-import com.android.settings.search2.SearchFragment;
-import com.android.settings.search2.SearchResult;
-import com.android.settings.search2.SearchResult.Builder;
-import com.android.settings.search2.SearchResultsAdapter;
-import com.android.settings.search2.SearchViewHolder;
+import com.android.settings.search.SearchResult.Builder;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -57,7 +46,6 @@
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java b/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java
similarity index 99%
rename from tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java
rename to tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java
index b8ac8fe..2e585ac 100644
--- a/tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java
@@ -12,9 +12,10 @@
  * 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.settings.search2;
+package com.android.settings.search;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
index e35eb10..db5d2b9 100644
--- a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
+++ b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
@@ -26,7 +26,6 @@
 import com.android.settings.TestConfig;
 import com.android.settings.R;
 
-import com.android.settings.search2.XmlParserUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index 6085c1e..8be2496 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -28,9 +28,9 @@
 import com.android.settings.localepicker.LocaleFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.overlay.SupportFeatureProvider;
-import com.android.settings.overlay.SurveyFeatureProvider;
-import com.android.settings.search2.SearchFeatureProvider;
 import com.android.settings.security.SecurityFeatureProvider;
+import com.android.settings.search.SearchFeatureProvider;
+import com.android.settings.overlay.SurveyFeatureProvider;
 import com.android.settings.users.UserFeatureProvider;
 
 import static org.mockito.Matchers.anyString;
diff --git a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
index f9d5439..4f560022 100644
--- a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
@@ -7,7 +7,7 @@
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Xml;
-import com.android.settings.search2.XmlParserUtils;
+import com.android.settings.search.XmlParserUtils;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java
index 724b9c0..f824297 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java
@@ -19,7 +19,7 @@
 
 import android.content.Context;
 import android.content.pm.ResolveInfo;
-import com.android.settings.search2.DatabaseIndexingUtils;
+import com.android.settings.search.DatabaseIndexingUtils;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
diff --git a/tests/unit/src/com/android/settings/search/SearchActivityTest.java b/tests/unit/src/com/android/settings/search/SearchActivityTest.java
index 26b097e..8a7e3fe 100644
--- a/tests/unit/src/com/android/settings/search/SearchActivityTest.java
+++ b/tests/unit/src/com/android/settings/search/SearchActivityTest.java
@@ -25,7 +25,6 @@
 import android.support.test.runner.AndroidJUnit4;
 
 import com.android.settings.Settings;
-import com.android.settings.search2.SearchActivity;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;