diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a6fd78c..1790b45 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -27,14 +27,14 @@
             android:name="i2p.bote.ViewEmailActivity"
             android:parentActivityName="i2p.bote.EmailListActivity" />
         <activity
-            android:name="i2p.bote.SettingsActivity"
+            android:name="i2p.bote.config.SettingsActivity"
             android:parentActivityName="i2p.bote.EmailListActivity" />
         <activity
-            android:name="i2p.bote.SetPasswordActivity"
-            android:parentActivityName="i2p.bote.SettingsActivity" />
+            android:name="i2p.bote.config.SetPasswordActivity"
+            android:parentActivityName="i2p.bote.config.SettingsActivity" />
         <activity
-            android:name="i2p.bote.EditIdentityActivity"
-            android:parentActivityName="i2p.bote.SettingsActivity" />
+            android:name="i2p.bote.config.EditIdentityActivity"
+            android:parentActivityName="i2p.bote.config.SettingsActivity" />
     </application>
 
 </manifest>
diff --git a/res/layout/activity_set_password.xml b/res/layout/activity_set_password.xml
index 127e30b..096fc57 100644
--- a/res/layout/activity_set_password.xml
+++ b/res/layout/activity_set_password.xml
@@ -11,7 +11,7 @@
 
         <fragment
             android:id="@+id/set_password_frag"
-            android:name="i2p.bote.SetPasswordFragment"
+            android:name="i2p.bote.config.SetPasswordFragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:layout="@layout/fragment_set_password" >
diff --git a/src/i2p/bote/EmailListActivity.java b/src/i2p/bote/EmailListActivity.java
index 59a0f80..044dd50 100644
--- a/src/i2p/bote/EmailListActivity.java
+++ b/src/i2p/bote/EmailListActivity.java
@@ -1,6 +1,7 @@
 package i2p.bote;
 
 import net.i2p.client.I2PClient;
+import i2p.bote.config.SettingsActivity;
 import i2p.bote.folder.EmailFolder;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
diff --git a/src/i2p/bote/EditIdentityActivity.java b/src/i2p/bote/config/EditIdentityActivity.java
similarity index 96%
rename from src/i2p/bote/EditIdentityActivity.java
rename to src/i2p/bote/config/EditIdentityActivity.java
index 5234d02..fa9b68a 100644
--- a/src/i2p/bote/EditIdentityActivity.java
+++ b/src/i2p/bote/config/EditIdentityActivity.java
@@ -1,5 +1,6 @@
-package i2p.bote;
+package i2p.bote.config;
 
+import i2p.bote.R;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
 import android.widget.Toast;
diff --git a/src/i2p/bote/EditIdentityFragment.java b/src/i2p/bote/config/EditIdentityFragment.java
similarity index 98%
rename from src/i2p/bote/EditIdentityFragment.java
rename to src/i2p/bote/config/EditIdentityFragment.java
index 57e737c..58e8c5e 100644
--- a/src/i2p/bote/EditIdentityFragment.java
+++ b/src/i2p/bote/config/EditIdentityFragment.java
@@ -1,8 +1,11 @@
-package i2p.bote;
+package i2p.bote.config;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 
+import i2p.bote.I2PBote;
+import i2p.bote.R;
+import i2p.bote.StatusListener;
 import i2p.bote.email.EmailIdentity;
 import i2p.bote.fileencryption.PasswordException;
 import i2p.bote.util.BoteHelper;
diff --git a/src/i2p/bote/SetPasswordActivity.java b/src/i2p/bote/config/SetPasswordActivity.java
similarity index 94%
rename from src/i2p/bote/SetPasswordActivity.java
rename to src/i2p/bote/config/SetPasswordActivity.java
index 886d60b..b20f6a1 100644
--- a/src/i2p/bote/SetPasswordActivity.java
+++ b/src/i2p/bote/config/SetPasswordActivity.java
@@ -1,5 +1,6 @@
-package i2p.bote;
+package i2p.bote.config;
 
+import i2p.bote.R;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
 import android.widget.Toast;
diff --git a/src/i2p/bote/SetPasswordFragment.java b/src/i2p/bote/config/SetPasswordFragment.java
similarity index 98%
rename from src/i2p/bote/SetPasswordFragment.java
rename to src/i2p/bote/config/SetPasswordFragment.java
index b335d55..2ed43ff 100644
--- a/src/i2p/bote/SetPasswordFragment.java
+++ b/src/i2p/bote/config/SetPasswordFragment.java
@@ -1,5 +1,8 @@
-package i2p.bote;
+package i2p.bote.config;
 
+import i2p.bote.I2PBote;
+import i2p.bote.R;
+import i2p.bote.StatusListener;
 import i2p.bote.util.RobustAsyncTask;
 import i2p.bote.util.TaskFragment;
 import android.app.Activity;
diff --git a/src/i2p/bote/SettingsActivity.java b/src/i2p/bote/config/SettingsActivity.java
similarity index 99%
rename from src/i2p/bote/SettingsActivity.java
rename to src/i2p/bote/config/SettingsActivity.java
index 2d09a20..7f26004 100644
--- a/src/i2p/bote/SettingsActivity.java
+++ b/src/i2p/bote/config/SettingsActivity.java
@@ -1,5 +1,8 @@
-package i2p.bote;
+package i2p.bote.config;
 
+import i2p.bote.Configuration;
+import i2p.bote.I2PBote;
+import i2p.bote.R;
 import i2p.bote.email.EmailIdentity;
 import i2p.bote.fileencryption.PasswordException;
 import java.io.IOException;