diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index cb80509..cb99a04 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -2,7 +2,7 @@
 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <header
-        android:fragment="i2p.bote.SettingsActivity$SettingsFragment"
+        android:fragment="i2p.bote.config.SettingsActivity$SettingsFragment"
         android:title="@string/pref_title_general"
         android:summary="@string/pref_summ_general" >
         <extra
@@ -11,8 +11,8 @@
     </header>
     <header android:title="@string/pref_title_change_password" >
         <intent
-            android:targetClass="i2p.bote.SetPasswordActivity"
-            android:targetPackage="i2p.bote" />
+            android:targetClass="i2p.bote.config.SetPasswordActivity"
+            android:targetPackage="i2p.bote.config" />
     </header>
     <header
         android:id="@+id/identity_settings"
diff --git a/res/xml/settings_headers_legacy.xml b/res/xml/settings_headers_legacy.xml
index f2a2832..6bdd8c4 100644
--- a/res/xml/settings_headers_legacy.xml
+++ b/res/xml/settings_headers_legacy.xml
@@ -4,13 +4,13 @@
     <Preference android:title="@string/pref_title_general" >
         <intent
             android:action="i2p.bote.PREFS_GENERAL"
-            android:targetClass="i2p.bote.SettingsActivity"
-            android:targetPackage="i2p.bote" />
+            android:targetClass="i2p.bote.config.SettingsActivity"
+            android:targetPackage="i2p.bote.config" />
     </Preference>
     <Preference android:title="@string/pref_title_change_password" >
         <intent
-            android:targetClass="i2p.bote.SetPasswordActivity"
-            android:targetPackage="i2p.bote" />
+            android:targetClass="i2p.bote.config.SetPasswordActivity"
+            android:targetPackage="i2p.bote.config" />
     </Preference>
 
 </PreferenceScreen>
\ No newline at end of file