diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ad667d780..a231c6375 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -11,25 +11,25 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-    	<activity android:name=".fileselect.FileSelectActivity"></activity>
-    	<activity android:name=".PasswordActivity" android:configChanges="orientation|keyboardHidden"></activity>
-    	<activity android:name=".GroupActivity">
+    	<activity android:name="com.keepassdroid.fileselect.FileSelectActivity"></activity>
+    	<activity android:name="com.keepassdroid.PasswordActivity" android:configChanges="orientation|keyboardHidden"></activity>
+    	<activity android:name="com.keepassdroid.GroupActivity">
             <!-- This metadata entry causes .app.SearchQueryResults to be the default context -->
             <!-- whenever the user invokes search while in this Activity. -->
             <meta-data android:name="android.app.default_searchable"
                        android:value=".search.SearchResults" />
     	</activity>
-		<activity android:name=".EntryActivity"></activity>
-		<activity android:name=".LockingActivity"></activity>
-		<activity android:name=".EntryEditActivity" android:configChanges="orientation|keyboardHidden"></activity>
-		<activity android:name=".search.SearchResults" android:launchMode="standard">
+		<activity android:name="com.keepassdroid.EntryActivity"></activity>
+		<activity android:name="com.keepassdroid.LockingActivity"></activity>
+		<activity android:name="com.keepassdroid.EntryEditActivity" android:configChanges="orientation|keyboardHidden"></activity>
+		<activity android:name="com.keepassdroid.search.SearchResults" android:launchMode="standard">
 		    <intent-filter>
 			    <action android:name="android.intent.action.SEARCH" />
 			    <category android:name="android.intent.category.DEFAULT" />
 		     </intent-filter>
 			<meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
 		</activity>
-		<service android:name=".services.TimeoutService"></service>
+		<service android:name="com.keepassdroid.services.TimeoutService"></service>
 		<meta-data android:name="com.a0soft.gphone.aTrackDog.webURL" android:value="http://keepassdroid.com" />
 	</application>
 </manifest> 
\ No newline at end of file
diff --git a/src/com/android/keepass/KeePass.java b/src/com/android/keepass/KeePass.java
index bcef0c486..45ba58e5f 100644
--- a/src/com/android/keepass/KeePass.java
+++ b/src/com/android/keepass/KeePass.java
@@ -23,8 +23,9 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.android.keepass.fileselect.FileSelectActivity;
-import com.android.keepass.services.TimeoutService;
+import com.keepassdroid.Database;
+import com.keepassdroid.fileselect.FileSelectActivity;
+import com.keepassdroid.services.TimeoutService;
 
 public class KeePass extends Activity {
 
diff --git a/src/com/android/keepass/AboutDialog.java b/src/com/keepassdroid/AboutDialog.java
similarity index 96%
rename from src/com/android/keepass/AboutDialog.java
rename to src/com/keepassdroid/AboutDialog.java
index 7c3772823..6095d937a 100644
--- a/src/com/android/keepass/AboutDialog.java
+++ b/src/com/keepassdroid/AboutDialog.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -25,6 +25,8 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
+import com.android.keepass.R;
+
 public class AboutDialog extends Dialog {
 	Context mCtx;
 	
diff --git a/src/com/android/keepass/ClickView.java b/src/com/keepassdroid/ClickView.java
similarity index 97%
rename from src/com/android/keepass/ClickView.java
rename to src/com/keepassdroid/ClickView.java
index 52e76c0ca..3228179d9 100644
--- a/src/com/android/keepass/ClickView.java
+++ b/src/com/keepassdroid/ClickView.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import android.content.Context;
 import android.view.ContextMenu;
diff --git a/src/com/android/keepass/Database.java b/src/com/keepassdroid/Database.java
similarity index 96%
rename from src/com/android/keepass/Database.java
rename to src/com/keepassdroid/Database.java
index 7f295605c..ced70179f 100644
--- a/src/com/android/keepass/Database.java
+++ b/src/com/keepassdroid/Database.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -39,10 +39,10 @@ import org.phoneid.keepassj2me.Types;
 
 import android.content.Context;
 
-import com.android.keepass.keepasslib.InvalidKeyFileException;
-import com.android.keepass.keepasslib.PwManagerOutput;
-import com.android.keepass.keepasslib.PwManagerOutputException;
-import com.android.keepass.search.SearchDbHelper;
+import com.keepassdroid.keepasslib.InvalidKeyFileException;
+import com.keepassdroid.keepasslib.PwManagerOutput;
+import com.keepassdroid.keepasslib.PwManagerOutputException;
+import com.keepassdroid.search.SearchDbHelper;
 
 /**
  * @author bpellin
diff --git a/src/com/android/keepass/EntryActivity.java b/src/com/keepassdroid/EntryActivity.java
similarity index 98%
rename from src/com/android/keepass/EntryActivity.java
rename to src/com/keepassdroid/EntryActivity.java
index fd28cff27..ba42744ee 100644
--- a/src/com/android/keepass/EntryActivity.java
+++ b/src/com/keepassdroid/EntryActivity.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import java.text.DateFormat;
 import java.util.Calendar;
@@ -42,6 +42,9 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.keepass.KeePass;
+import com.android.keepass.R;
+
 public class EntryActivity extends LockingActivity {
 	public static final String KEY_ENTRY = "entry";
 	public static final String KEY_REFRESH_POS = "refresh_pos";
diff --git a/src/com/android/keepass/EntryEditActivity.java b/src/com/keepassdroid/EntryEditActivity.java
similarity index 98%
rename from src/com/android/keepass/EntryEditActivity.java
rename to src/com/keepassdroid/EntryEditActivity.java
index 9cc045c23..9526cd2f4 100644
--- a/src/com/android/keepass/EntryEditActivity.java
+++ b/src/com/keepassdroid/EntryEditActivity.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Calendar;
@@ -41,6 +41,9 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.keepass.KeePass;
+import com.android.keepass.R;
+
 public class EntryEditActivity extends LockingActivity {
 	public static final String KEY_ENTRY = "entry";
 	public static final String KEY_PARENT = "parent";
diff --git a/src/com/android/keepass/GroupActivity.java b/src/com/keepassdroid/GroupActivity.java
similarity index 98%
rename from src/com/android/keepass/GroupActivity.java
rename to src/com/keepassdroid/GroupActivity.java
index 2a8437ef6..2366aa104 100644
--- a/src/com/android/keepass/GroupActivity.java
+++ b/src/com/keepassdroid/GroupActivity.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import java.lang.ref.WeakReference;
 
@@ -37,6 +37,9 @@ import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.Button;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 
+import com.android.keepass.KeePass;
+import com.android.keepass.R;
+
 public class GroupActivity extends GroupBaseActivity {
 	
 	public static final int UNINIT = -1;
diff --git a/src/com/android/keepass/GroupBaseActivity.java b/src/com/keepassdroid/GroupBaseActivity.java
similarity index 97%
rename from src/com/android/keepass/GroupBaseActivity.java
rename to src/com/keepassdroid/GroupBaseActivity.java
index 31a06d681..420d08718 100644
--- a/src/com/android/keepass/GroupBaseActivity.java
+++ b/src/com/keepassdroid/GroupBaseActivity.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import org.phoneid.keepassj2me.PwGroup;
 
@@ -32,6 +32,9 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.android.keepass.KeePass;
+import com.android.keepass.R;
+
 public abstract class GroupBaseActivity extends LockingListActivity {
 	public static final String KEY_ENTRY = "entry";
 	public static final String KEY_MODE = "mode";
diff --git a/src/com/android/keepass/GroupCreateDialog.java b/src/com/keepassdroid/GroupCreateDialog.java
similarity index 97%
rename from src/com/android/keepass/GroupCreateDialog.java
rename to src/com/keepassdroid/GroupCreateDialog.java
index 431c0b7d3..45b040999 100644
--- a/src/com/android/keepass/GroupCreateDialog.java
+++ b/src/com/keepassdroid/GroupCreateDialog.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -27,6 +27,8 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.keepass.R;
+
 public class GroupCreateDialog extends Dialog {
 	Context mCtx;
 	String mRes;
diff --git a/src/com/android/keepass/LockManager.java b/src/com/keepassdroid/LockManager.java
similarity index 93%
rename from src/com/android/keepass/LockManager.java
rename to src/com/keepassdroid/LockManager.java
index 87683f660..acc29ee17 100644
--- a/src/com/android/keepass/LockManager.java
+++ b/src/com/keepassdroid/LockManager.java
@@ -17,12 +17,12 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import android.app.Activity;
 import android.content.Intent;
 
-import com.android.keepass.intents.TimeoutIntents;
+import com.keepassdroid.intents.TimeoutIntents;
 
 public class LockManager {
 	private final Activity mAct;
diff --git a/src/com/android/keepass/LockingActivity.java b/src/com/keepassdroid/LockingActivity.java
similarity index 95%
rename from src/com/android/keepass/LockingActivity.java
rename to src/com/keepassdroid/LockingActivity.java
index f0150a443..b5ef53528 100644
--- a/src/com/android/keepass/LockingActivity.java
+++ b/src/com/keepassdroid/LockingActivity.java
@@ -17,7 +17,9 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
+
+import com.android.keepass.KeePass;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/src/com/android/keepass/LockingListActivity.java b/src/com/keepassdroid/LockingListActivity.java
similarity index 95%
rename from src/com/android/keepass/LockingListActivity.java
rename to src/com/keepassdroid/LockingListActivity.java
index 6dbdc88c1..0010bada4 100644
--- a/src/com/android/keepass/LockingListActivity.java
+++ b/src/com/keepassdroid/LockingListActivity.java
@@ -17,7 +17,9 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
+
+import com.android.keepass.KeePass;
 
 import android.app.ListActivity;
 import android.os.Bundle;
diff --git a/src/com/android/keepass/PasswordActivity.java b/src/com/keepassdroid/PasswordActivity.java
similarity index 96%
rename from src/com/android/keepass/PasswordActivity.java
rename to src/com/keepassdroid/PasswordActivity.java
index 737db84ce..6a47fe409 100644
--- a/src/com/android/keepass/PasswordActivity.java
+++ b/src/com/keepassdroid/PasswordActivity.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -29,7 +29,6 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Debug;
 import android.os.Handler;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -38,9 +37,11 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.keepass.fileselect.FileDbHelper;
-import com.android.keepass.intents.TimeoutIntents;
-import com.android.keepass.keepasslib.InvalidKeyFileException;
+import com.android.keepass.KeePass;
+import com.android.keepass.R;
+import com.keepassdroid.fileselect.FileDbHelper;
+import com.keepassdroid.intents.TimeoutIntents;
+import com.keepassdroid.keepasslib.InvalidKeyFileException;
 
 public class PasswordActivity extends Activity {
 
diff --git a/src/com/android/keepass/ProgressTask.java b/src/com/keepassdroid/ProgressTask.java
similarity index 98%
rename from src/com/android/keepass/ProgressTask.java
rename to src/com/keepassdroid/ProgressTask.java
index f5081e81b..35f67fadb 100644
--- a/src/com/android/keepass/ProgressTask.java
+++ b/src/com/keepassdroid/ProgressTask.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import android.app.ProgressDialog;
 import android.content.Context;
diff --git a/src/com/android/keepass/PwEntryView.java b/src/com/keepassdroid/PwEntryView.java
similarity index 97%
rename from src/com/android/keepass/PwEntryView.java
rename to src/com/keepassdroid/PwEntryView.java
index 25359f29f..d20b0cbf0 100644
--- a/src/com/android/keepass/PwEntryView.java
+++ b/src/com/keepassdroid/PwEntryView.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import org.phoneid.keepassj2me.PwEntry;
 
@@ -29,6 +29,8 @@ import android.view.View;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.TextView;
 
+import com.android.keepass.R;
+
 public class PwEntryView extends ClickView {
 
 	private Activity mAct;
diff --git a/src/com/android/keepass/PwGroupView.java b/src/com/keepassdroid/PwGroupView.java
similarity index 94%
rename from src/com/android/keepass/PwGroupView.java
rename to src/com/keepassdroid/PwGroupView.java
index a1ee531c9..6228824b0 100644
--- a/src/com/android/keepass/PwGroupView.java
+++ b/src/com/keepassdroid/PwGroupView.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import org.phoneid.keepassj2me.PwGroup;
 
@@ -29,7 +29,9 @@ import android.view.View;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.TextView;
 
-import com.android.keepass.database.DeleteGroup;
+import com.android.keepass.KeePass;
+import com.android.keepass.R;
+import com.keepassdroid.database.DeleteGroup;
 
 
 public class PwGroupView extends ClickView {
diff --git a/src/com/android/keepass/PwListAdapter.java b/src/com/keepassdroid/PwListAdapter.java
similarity index 99%
rename from src/com/android/keepass/PwListAdapter.java
rename to src/com/keepassdroid/PwListAdapter.java
index 667b53190..bdb98e81b 100644
--- a/src/com/android/keepass/PwListAdapter.java
+++ b/src/com/keepassdroid/PwListAdapter.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import java.util.Vector;
 
diff --git a/src/com/android/keepass/UIToastTask.java b/src/com/keepassdroid/UIToastTask.java
similarity index 97%
rename from src/com/android/keepass/UIToastTask.java
rename to src/com/keepassdroid/UIToastTask.java
index 607325d9e..0e0a42173 100644
--- a/src/com/android/keepass/UIToastTask.java
+++ b/src/com/keepassdroid/UIToastTask.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import android.content.Context;
 import android.widget.Toast;
diff --git a/src/com/android/keepass/Util.java b/src/com/keepassdroid/Util.java
similarity index 98%
rename from src/com/android/keepass/Util.java
rename to src/com/keepassdroid/Util.java
index 71aa53bce..21d8c5674 100644
--- a/src/com/android/keepass/Util.java
+++ b/src/com/keepassdroid/Util.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass;
+package com.keepassdroid;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
diff --git a/src/com/android/keepass/database/DeleteGroup.java b/src/com/keepassdroid/database/DeleteGroup.java
similarity index 88%
rename from src/com/android/keepass/database/DeleteGroup.java
rename to src/com/keepassdroid/database/DeleteGroup.java
index 979958602..0d19442de 100644
--- a/src/com/android/keepass/database/DeleteGroup.java
+++ b/src/com/keepassdroid/database/DeleteGroup.java
@@ -1,4 +1,4 @@
-package com.android.keepass.database;
+package com.keepassdroid.database;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
@@ -8,9 +8,9 @@ import org.phoneid.keepassj2me.PwGroup;
 import android.content.Context;
 import android.os.Handler;
 
-import com.android.keepass.Database;
-import com.android.keepass.UIToastTask;
-import com.android.keepass.keepasslib.PwManagerOutputException;
+import com.keepassdroid.Database;
+import com.keepassdroid.UIToastTask;
+import com.keepassdroid.keepasslib.PwManagerOutputException;
 
 public class DeleteGroup implements Runnable {
 	
diff --git a/src/com/android/keepass/fileselect/FileDbHelper.java b/src/com/keepassdroid/fileselect/FileDbHelper.java
similarity index 99%
rename from src/com/android/keepass/fileselect/FileDbHelper.java
rename to src/com/keepassdroid/fileselect/FileDbHelper.java
index 7b1e3ff4d..9c29fed3f 100644
--- a/src/com/android/keepass/fileselect/FileDbHelper.java
+++ b/src/com/keepassdroid/fileselect/FileDbHelper.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.fileselect;
+package com.keepassdroid.fileselect;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/com/android/keepass/fileselect/FileListAdapter.java b/src/com/keepassdroid/fileselect/FileListAdapter.java
similarity index 97%
rename from src/com/android/keepass/fileselect/FileListAdapter.java
rename to src/com/keepassdroid/fileselect/FileListAdapter.java
index 49239bfbb..42e1e864e 100644
--- a/src/com/android/keepass/fileselect/FileListAdapter.java
+++ b/src/com/keepassdroid/fileselect/FileListAdapter.java
@@ -16,7 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
- */package com.android.keepass.fileselect;
+ */package com.keepassdroid.fileselect;
 
 import android.content.Context;
 import android.view.View;
diff --git a/src/com/android/keepass/fileselect/FileSelectActivity.java b/src/com/keepassdroid/fileselect/FileSelectActivity.java
similarity index 94%
rename from src/com/android/keepass/fileselect/FileSelectActivity.java
rename to src/com/keepassdroid/fileselect/FileSelectActivity.java
index 9a412ad64..67d2c01e0 100644
--- a/src/com/android/keepass/fileselect/FileSelectActivity.java
+++ b/src/com/keepassdroid/fileselect/FileSelectActivity.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.fileselect;
+package com.keepassdroid.fileselect;
 
 import java.io.FileNotFoundException;
 
@@ -26,7 +26,6 @@ import android.app.ListActivity;
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.os.Debug;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -35,11 +34,11 @@ import android.widget.ListView;
 import android.widget.SimpleCursorAdapter;
 import android.widget.Toast;
 
-import com.android.keepass.AboutDialog;
-import com.android.keepass.PasswordActivity;
 import com.android.keepass.R;
-import com.android.keepass.Util;
-import com.android.keepass.intents.TimeoutIntents;
+import com.keepassdroid.AboutDialog;
+import com.keepassdroid.PasswordActivity;
+import com.keepassdroid.Util;
+import com.keepassdroid.intents.TimeoutIntents;
 
 public class FileSelectActivity extends ListActivity {
 
diff --git a/src/com/android/keepass/intents/TimeoutIntents.java b/src/com/keepassdroid/intents/TimeoutIntents.java
similarity index 80%
rename from src/com/android/keepass/intents/TimeoutIntents.java
rename to src/com/keepassdroid/intents/TimeoutIntents.java
index f6cb0bc8b..636fb9da7 100644
--- a/src/com/android/keepass/intents/TimeoutIntents.java
+++ b/src/com/keepassdroid/intents/TimeoutIntents.java
@@ -16,9 +16,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
- */package com.android.keepass.intents;
+ */package com.keepassdroid.intents;
 
 public class TimeoutIntents {
-	public static final String START = "com.android.keepass.timeout.start";
-	public static final String CANCEL = "com.android.keepass.timeout.cancel";
+	public static final String START = "com.keepassdroid.timeout.start";
+	public static final String CANCEL = "com.keepassdroid.timeout.cancel";
 }
diff --git a/src/com/android/keepass/keepasslib/BufferedBlockCipherOutputStream.java b/src/com/keepassdroid/keepasslib/BufferedBlockCipherOutputStream.java
similarity index 98%
rename from src/com/android/keepass/keepasslib/BufferedBlockCipherOutputStream.java
rename to src/com/keepassdroid/keepasslib/BufferedBlockCipherOutputStream.java
index 5e6e15f06..ccd39e06a 100644
--- a/src/com/android/keepass/keepasslib/BufferedBlockCipherOutputStream.java
+++ b/src/com/keepassdroid/keepasslib/BufferedBlockCipherOutputStream.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;
diff --git a/src/com/android/keepass/keepasslib/Exporter.java b/src/com/keepassdroid/keepasslib/Exporter.java
similarity index 81%
rename from src/com/android/keepass/keepasslib/Exporter.java
rename to src/com/keepassdroid/keepasslib/Exporter.java
index ba04e3bd2..60942f5b1 100644
--- a/src/com/android/keepass/keepasslib/Exporter.java
+++ b/src/com/keepassdroid/keepasslib/Exporter.java
@@ -1,4 +1,4 @@
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.OutputStream;
 
diff --git a/src/com/android/keepass/keepasslib/InvalidKeyFileException.java b/src/com/keepassdroid/keepasslib/InvalidKeyFileException.java
similarity index 95%
rename from src/com/android/keepass/keepasslib/InvalidKeyFileException.java
rename to src/com/keepassdroid/keepasslib/InvalidKeyFileException.java
index 61019e7d7..138cf0ff1 100644
--- a/src/com/android/keepass/keepasslib/InvalidKeyFileException.java
+++ b/src/com/keepassdroid/keepasslib/InvalidKeyFileException.java
@@ -16,7 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
- */package com.android.keepass.keepasslib;
+ */package com.keepassdroid.keepasslib;
 
 public class InvalidKeyFileException extends Exception {
 	/**
diff --git a/src/com/android/keepass/keepasslib/NullOutputStream.java b/src/com/keepassdroid/keepasslib/NullOutputStream.java
similarity index 97%
rename from src/com/android/keepass/keepasslib/NullOutputStream.java
rename to src/com/keepassdroid/keepasslib/NullOutputStream.java
index bd60d4e20..1641c4789 100644
--- a/src/com/android/keepass/keepasslib/NullOutputStream.java
+++ b/src/com/keepassdroid/keepasslib/NullOutputStream.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/com/android/keepass/keepasslib/PwDbHeaderOutput.java b/src/com/keepassdroid/keepasslib/PwDbHeaderOutput.java
similarity index 97%
rename from src/com/android/keepass/keepasslib/PwDbHeaderOutput.java
rename to src/com/keepassdroid/keepasslib/PwDbHeaderOutput.java
index 013b909d7..05b503a19 100644
--- a/src/com/android/keepass/keepasslib/PwDbHeaderOutput.java
+++ b/src/com/keepassdroid/keepasslib/PwDbHeaderOutput.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/com/android/keepass/keepasslib/PwEntryOutput.java b/src/com/keepassdroid/keepasslib/PwEntryOutput.java
similarity index 99%
rename from src/com/android/keepass/keepasslib/PwEntryOutput.java
rename to src/com/keepassdroid/keepasslib/PwEntryOutput.java
index 7244f3c8a..2472f8d77 100644
--- a/src/com/android/keepass/keepasslib/PwEntryOutput.java
+++ b/src/com/keepassdroid/keepasslib/PwEntryOutput.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/com/android/keepass/keepasslib/PwGroupOutput.java b/src/com/keepassdroid/keepasslib/PwGroupOutput.java
similarity index 98%
rename from src/com/android/keepass/keepasslib/PwGroupOutput.java
rename to src/com/keepassdroid/keepasslib/PwGroupOutput.java
index db1d6415c..24539d737 100644
--- a/src/com/android/keepass/keepasslib/PwGroupOutput.java
+++ b/src/com/keepassdroid/keepasslib/PwGroupOutput.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/com/android/keepass/keepasslib/PwManagerOutput.java b/src/com/keepassdroid/keepasslib/PwManagerOutput.java
similarity index 99%
rename from src/com/android/keepass/keepasslib/PwManagerOutput.java
rename to src/com/keepassdroid/keepasslib/PwManagerOutput.java
index 924b1457c..707a6a1b2 100644
--- a/src/com/android/keepass/keepasslib/PwManagerOutput.java
+++ b/src/com/keepassdroid/keepasslib/PwManagerOutput.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/com/android/keepass/keepasslib/PwManagerOutputException.java b/src/com/keepassdroid/keepasslib/PwManagerOutputException.java
similarity index 96%
rename from src/com/android/keepass/keepasslib/PwManagerOutputException.java
rename to src/com/keepassdroid/keepasslib/PwManagerOutputException.java
index 6dc28fe55..246694380 100644
--- a/src/com/android/keepass/keepasslib/PwManagerOutputException.java
+++ b/src/com/keepassdroid/keepasslib/PwManagerOutputException.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 public class PwManagerOutputException extends Exception {
 	public PwManagerOutputException(String string) {
diff --git a/src/com/android/keepass/keepasslib/RandomFileOutputStream.java b/src/com/keepassdroid/keepasslib/RandomFileOutputStream.java
similarity index 97%
rename from src/com/android/keepass/keepasslib/RandomFileOutputStream.java
rename to src/com/keepassdroid/keepasslib/RandomFileOutputStream.java
index 12d120841..69fe92bc5 100644
--- a/src/com/android/keepass/keepasslib/RandomFileOutputStream.java
+++ b/src/com/keepassdroid/keepasslib/RandomFileOutputStream.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.keepasslib;
+package com.keepassdroid.keepasslib;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/com/android/keepass/search/SearchDbHelper.java b/src/com/keepassdroid/search/SearchDbHelper.java
similarity index 98%
rename from src/com/android/keepass/search/SearchDbHelper.java
rename to src/com/keepassdroid/search/SearchDbHelper.java
index d5fa77f98..fdf117c16 100644
--- a/src/com/android/keepass/search/SearchDbHelper.java
+++ b/src/com/keepassdroid/search/SearchDbHelper.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.search;
+package com.keepassdroid.search;
 
 import java.util.UUID;
 import java.util.Vector;
@@ -34,7 +34,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
-import com.android.keepass.Database;
+import com.keepassdroid.Database;
 
 public class SearchDbHelper {
 	private static final String DATABASE_NAME = "search";
diff --git a/src/com/android/keepass/search/SearchResults.java b/src/com/keepassdroid/search/SearchResults.java
similarity index 94%
rename from src/com/android/keepass/search/SearchResults.java
rename to src/com/keepassdroid/search/SearchResults.java
index 0484e6592..511b0f5c9 100644
--- a/src/com/android/keepass/search/SearchResults.java
+++ b/src/com/keepassdroid/search/SearchResults.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.search;
+package com.keepassdroid.search;
 
 import org.phoneid.keepassj2me.PwGroup;
 
@@ -25,10 +25,10 @@ import android.app.SearchManager;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.android.keepass.GroupBaseActivity;
 import com.android.keepass.KeePass;
-import com.android.keepass.PwListAdapter;
 import com.android.keepass.R;
+import com.keepassdroid.GroupBaseActivity;
+import com.keepassdroid.PwListAdapter;
 
 public class SearchResults extends GroupBaseActivity {
 
diff --git a/src/com/android/keepass/services/TimeoutService.java b/src/com/keepassdroid/services/TimeoutService.java
similarity index 96%
rename from src/com/android/keepass/services/TimeoutService.java
rename to src/com/keepassdroid/services/TimeoutService.java
index 0c2bbe44c..2aa209aa8 100644
--- a/src/com/android/keepass/services/TimeoutService.java
+++ b/src/com/keepassdroid/services/TimeoutService.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.services;
+package com.keepassdroid.services;
 
 import java.util.Timer;
 import java.util.TimerTask;
@@ -31,7 +31,7 @@ import android.os.Binder;
 import android.os.IBinder;
 
 import com.android.keepass.KeePass;
-import com.android.keepass.intents.TimeoutIntents;
+import com.keepassdroid.intents.TimeoutIntents;
 
 public class TimeoutService extends Service {
 	private static final long DEFAULT_TIMEOUT = 5 * 60 * 1000;  // 5 minutes
diff --git a/src/org/phoneid/keepassj2me/ImporterV3.java b/src/org/phoneid/keepassj2me/ImporterV3.java
index 80cffcf6f..8de6f7c06 100644
--- a/src/org/phoneid/keepassj2me/ImporterV3.java
+++ b/src/org/phoneid/keepassj2me/ImporterV3.java
@@ -51,8 +51,8 @@ import org.phoneid.PhoneIDUtil;
 
 import android.util.Log;
 
-import com.android.keepass.keepasslib.InvalidKeyFileException;
-import com.android.keepass.keepasslib.NullOutputStream;
+import com.keepassdroid.keepasslib.InvalidKeyFileException;
+import com.keepassdroid.keepasslib.NullOutputStream;
 
 /**
  * Load a v3 database file.
diff --git a/src/org/phoneid/keepassj2me/PwEntry.java b/src/org/phoneid/keepassj2me/PwEntry.java
index 2ed3e6209..cab78440f 100644
--- a/src/org/phoneid/keepassj2me/PwEntry.java
+++ b/src/org/phoneid/keepassj2me/PwEntry.java
@@ -27,7 +27,7 @@ package org.phoneid.keepassj2me;
 // PhoneID
 import org.phoneid.*;
 
-import com.android.keepass.Database;
+import com.keepassdroid.Database;
 
 
 // Java
diff --git a/src/org/phoneid/keepassj2me/PwManager.java b/src/org/phoneid/keepassj2me/PwManager.java
index e6458cace..ce73bdf75 100644
--- a/src/org/phoneid/keepassj2me/PwManager.java
+++ b/src/org/phoneid/keepassj2me/PwManager.java
@@ -38,7 +38,7 @@ import java.util.Vector;
 
 import org.bouncycastle.crypto.digests.SHA256Digest;
 
-import com.android.keepass.keepasslib.InvalidKeyFileException;
+import com.keepassdroid.keepasslib.InvalidKeyFileException;
 
 /**
  * @author Naomaru Itoi <nao@phoneid.org>
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index cfb57bb81..d047cde08 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.android.keepass.tests"
+      package="com.keepassdroid.tests"
       android:versionCode="1"
       android:versionName="1.0.0">
     <application>
diff --git a/tests/src/com/android/keepass/tests/.gitignore b/tests/src/com/keepassdroid/tests/.gitignore
similarity index 100%
rename from tests/src/com/android/keepass/tests/.gitignore
rename to tests/src/com/keepassdroid/tests/.gitignore
diff --git a/tests/src/com/android/keepass/tests/AccentTest.java b/tests/src/com/keepassdroid/tests/AccentTest.java
similarity index 93%
rename from tests/src/com/android/keepass/tests/AccentTest.java
rename to tests/src/com/keepassdroid/tests/AccentTest.java
index 4f5e963d2..b3a9c47ee 100644
--- a/tests/src/com/android/keepass/tests/AccentTest.java
+++ b/tests/src/com/keepassdroid/tests/AccentTest.java
@@ -17,11 +17,11 @@
 * along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package com.android.keepass.tests;
+package com.keepassdroid.tests;
 
 import android.test.AndroidTestCase;
 
-import com.android.keepass.tests.output.TestData;
+import com.keepassdroid.tests.output.TestData;
 
 public class AccentTest extends AndroidTestCase {
 	
diff --git a/tests/src/com/android/keepass/tests/AllTests.java b/tests/src/com/keepassdroid/tests/AllTests.java
similarity index 96%
rename from tests/src/com/android/keepass/tests/AllTests.java
rename to tests/src/com/keepassdroid/tests/AllTests.java
index b1acf4f47..c7051d3cb 100644
--- a/tests/src/com/android/keepass/tests/AllTests.java
+++ b/tests/src/com/keepassdroid/tests/AllTests.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.tests;
+package com.keepassdroid.tests;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
diff --git a/tests/src/com/android/keepass/tests/OutputTests.java b/tests/src/com/keepassdroid/tests/OutputTests.java
similarity index 91%
rename from tests/src/com/android/keepass/tests/OutputTests.java
rename to tests/src/com/keepassdroid/tests/OutputTests.java
index 9eb3d71ae..262c88b55 100644
--- a/tests/src/com/android/keepass/tests/OutputTests.java
+++ b/tests/src/com/keepassdroid/tests/OutputTests.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.tests;
+package com.keepassdroid.tests;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -29,7 +29,7 @@ public class OutputTests extends TestSuite {
 	public static Test suite() {
 
 		return new TestSuiteBuilder(AllTests.class)
-		.includePackages("com.android.keepass.tests.output")
+		.includePackages("com.keepassdroid.tests.output")
 		.build();
 	}
 }
diff --git a/tests/src/com/android/keepass/tests/PwEntryTest.java b/tests/src/com/keepassdroid/tests/PwEntryTest.java
similarity index 95%
rename from tests/src/com/android/keepass/tests/PwEntryTest.java
rename to tests/src/com/keepassdroid/tests/PwEntryTest.java
index c3abc0931..308eb39a9 100644
--- a/tests/src/com/android/keepass/tests/PwEntryTest.java
+++ b/tests/src/com/keepassdroid/tests/PwEntryTest.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.tests;
+package com.keepassdroid.tests;
 
 import static org.junit.Assert.assertArrayEquals;
 
@@ -28,7 +28,7 @@ import org.phoneid.keepassj2me.PwEntry;
 
 import android.test.AndroidTestCase;
 
-import com.android.keepass.tests.output.TestData;
+import com.keepassdroid.tests.output.TestData;
 
 public class PwEntryTest extends AndroidTestCase {
 	PwEntry mPE;
diff --git a/tests/src/com/android/keepass/tests/PwGroupTest.java b/tests/src/com/keepassdroid/tests/PwGroupTest.java
similarity index 93%
rename from tests/src/com/android/keepass/tests/PwGroupTest.java
rename to tests/src/com/keepassdroid/tests/PwGroupTest.java
index 19b9430db..541f61f47 100644
--- a/tests/src/com/android/keepass/tests/PwGroupTest.java
+++ b/tests/src/com/keepassdroid/tests/PwGroupTest.java
@@ -17,13 +17,13 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.tests;
+package com.keepassdroid.tests;
 
 import org.phoneid.keepassj2me.PwGroup;
 
 import android.test.AndroidTestCase;
 
-import com.android.keepass.tests.output.TestData;
+import com.keepassdroid.tests.output.TestData;
 
 public class PwGroupTest extends AndroidTestCase {
 
diff --git a/tests/src/com/android/keepass/tests/TypesTest.java b/tests/src/com/keepassdroid/tests/TypesTest.java
similarity index 98%
rename from tests/src/com/android/keepass/tests/TypesTest.java
rename to tests/src/com/keepassdroid/tests/TypesTest.java
index 30f3c45cc..55bf86a67 100644
--- a/tests/src/com/android/keepass/tests/TypesTest.java
+++ b/tests/src/com/keepassdroid/tests/TypesTest.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.tests;
+package com.keepassdroid.tests;
 
 import java.util.Calendar;
 
diff --git a/tests/src/com/android/keepass/tests/output/PwManagerOutputTest.java b/tests/src/com/keepassdroid/tests/output/PwManagerOutputTest.java
similarity index 95%
rename from tests/src/com/android/keepass/tests/output/PwManagerOutputTest.java
rename to tests/src/com/keepassdroid/tests/output/PwManagerOutputTest.java
index 3d47ad9ff..a637daada 100644
--- a/tests/src/com/android/keepass/tests/output/PwManagerOutputTest.java
+++ b/tests/src/com/keepassdroid/tests/output/PwManagerOutputTest.java
@@ -17,7 +17,7 @@
 * along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package com.android.keepass.tests.output;
+package com.keepassdroid.tests.output;
  
 import static org.junit.Assert.assertArrayEquals;
 
@@ -35,10 +35,10 @@ import org.phoneid.keepassj2me.PwManager;
 import android.content.res.AssetManager;
 import android.test.AndroidTestCase;
 
-import com.android.keepass.keepasslib.NullOutputStream;
-import com.android.keepass.keepasslib.PwDbHeaderOutput;
-import com.android.keepass.keepasslib.PwManagerOutput;
-import com.android.keepass.keepasslib.PwManagerOutputException;
+import com.keepassdroid.keepasslib.NullOutputStream;
+import com.keepassdroid.keepasslib.PwDbHeaderOutput;
+import com.keepassdroid.keepasslib.PwManagerOutput;
+import com.keepassdroid.keepasslib.PwManagerOutputException;
  
 public class PwManagerOutputTest extends AndroidTestCase {
   PwManager mPM;
diff --git a/tests/src/com/android/keepass/tests/output/TestData.java b/tests/src/com/keepassdroid/tests/output/TestData.java
similarity index 93%
rename from tests/src/com/android/keepass/tests/output/TestData.java
rename to tests/src/com/keepassdroid/tests/output/TestData.java
index 26b20c1d7..eb260da70 100644
--- a/tests/src/com/android/keepass/tests/output/TestData.java
+++ b/tests/src/com/keepassdroid/tests/output/TestData.java
@@ -17,7 +17,7 @@
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.android.keepass.tests.output;
+package com.keepassdroid.tests.output;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,8 +29,8 @@ import org.phoneid.keepassj2me.PwManager;
 import android.content.Context;
 import android.content.res.AssetManager;
 
-import com.android.keepass.Database;
-import com.android.keepass.keepasslib.InvalidKeyFileException;
+import com.keepassdroid.Database;
+import com.keepassdroid.keepasslib.InvalidKeyFileException;
 
 public class TestData {
 	private static final String TEST1_KEYFILE = "";
diff --git a/tests/src/com/android/keepass/tests/search/SearchTest.java b/tests/src/com/keepassdroid/tests/search/SearchTest.java
similarity index 89%
rename from tests/src/com/android/keepass/tests/search/SearchTest.java
rename to tests/src/com/keepassdroid/tests/search/SearchTest.java
index 972ca0ae8..eeb986140 100644
--- a/tests/src/com/android/keepass/tests/search/SearchTest.java
+++ b/tests/src/com/keepassdroid/tests/search/SearchTest.java
@@ -17,14 +17,14 @@
 * along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package com.android.keepass.tests.search;
+package com.keepassdroid.tests.search;
 
 import org.phoneid.keepassj2me.PwGroup;
 
 import android.test.AndroidTestCase;
 
-import com.android.keepass.Database;
-import com.android.keepass.tests.output.TestData;
+import com.keepassdroid.Database;
+import com.keepassdroid.tests.output.TestData;
 
 public class SearchTest extends AndroidTestCase {