diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4b41c7ce44c..83350b5d503 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -278,7 +278,7 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.WifiP2pSettings" />
+                android:value="com.android.settings.wifi.p2p.WifiP2pSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/wireless_settings" />
             <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 1f72a93453c..1e85b9a3563 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -46,7 +46,7 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:fragment="com.android.settings.WifiP2pSettings"
+        android:fragment="com.android.settings.wifi.p2p.WifiP2pSettings"
         android:key="wifi_p2p_settings"
         android:title="@string/wifi_p2p_settings_title"
         android:summary="@string/wifi_p2p_settings_summary">
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 2e055952bff..6ec3a1af3dd 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.wifi.p2p;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -43,9 +43,8 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.Switch;
 
-import com.android.settings.wifi.p2p.WifiP2pDialog;
-import com.android.settings.wifi.p2p.WifiP2pEnabler;
-import com.android.settings.wifi.p2p.WifiP2pPeer;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
 
 import java.util.Arrays;
 import java.util.List;