diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 49fe4d58bb3..459b0c0a98b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -829,7 +829,7 @@
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.LocationSettings" />
+                android:value="com.android.settings.location.LocationSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/location_settings" />
         </activity>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index ab212d82b8c..246a383f4e0 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -17,7 +17,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/location_settings_title">
 
-        <com.android.settings.WrappingSwitchPreference
+        <com.android.settings.location.WrappingSwitchPreference
             android:key="location_toggle"
             android:title="@string/location_access_title"
             android:summary="@string/location_access_summary"
@@ -34,7 +34,7 @@
             android:dependency="location_toggle"
             android:persistent="false" />
 
-        <com.android.settings.WrappingCheckBoxPreference
+        <com.android.settings.location.WrappingCheckBoxPreference
             android:key="location_network"
             android:title="@string/location_network_based"
             android:summary="@string/location_neighborhood_level"
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 5d3a39fd7c8..9a1d3b830e2 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -125,7 +125,7 @@
 
     <!-- Location -->
     <header
-        android:fragment="com.android.settings.LocationSettings"
+        android:fragment="com.android.settings.location.LocationSettings"
         android:icon="@drawable/ic_settings_location"
         android:title="@string/location_settings_title"
         android:id="@+id/location_settings" />
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index 945b86bc5f7..52d8780b159 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -49,11 +49,11 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.android.settings.DisplaySettings;
-import com.android.settings.LocationSettings;
 import com.android.settings.R;
 import com.android.settings.WirelessSettings;
 import com.android.settings.applications.InstalledAppDetails;
 import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.location.LocationSettings;
 import com.android.settings.wifi.WifiSettings;
 
 public class PowerUsageDetail extends Fragment implements Button.OnClickListener {
diff --git a/src/com/android/settings/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
similarity index 98%
rename from src/com/android/settings/LocationSettings.java
rename to src/com/android/settings/location/LocationSettings.java
index 2edefdfba1f..62bd272c8a2 100644
--- a/src/com/android/settings/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.location;
 
 
 import android.content.ContentQueryMap;
@@ -33,6 +33,9 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
 
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
 import java.util.Observable;
 import java.util.Observer;