diff --git a/.gitignore b/.gitignore
index 2e423e1a3..a1fa2dab4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,3 @@
-#Android generated
-bin
-gen
-obj
-libs/armeabi
-lint.xml
-local.properties
-
-#Eclipse
-.project
-.classpath
-.settings
-
-#IntelliJ IDEA
-.idea
-*.iml
-
-#Maven
-target
-release.properties
-
-#Mac
-.DS_Store
\ No newline at end of file
+*.class
+*.apk
+.metadata
\ No newline at end of file
diff --git a/org_apg/.gitignore b/org_apg/.gitignore
new file mode 100644
index 000000000..2e423e1a3
--- /dev/null
+++ b/org_apg/.gitignore
@@ -0,0 +1,23 @@
+#Android generated
+bin
+gen
+obj
+libs/armeabi
+lint.xml
+local.properties
+
+#Eclipse
+.project
+.classpath
+.settings
+
+#IntelliJ IDEA
+.idea
+*.iml
+
+#Maven
+target
+release.properties
+
+#Mac
+.DS_Store
\ No newline at end of file
diff --git a/AndroidManifest.xml b/org_apg/AndroidManifest.xml
similarity index 100%
rename from AndroidManifest.xml
rename to org_apg/AndroidManifest.xml
diff --git a/build.xml b/org_apg/build.xml
similarity index 100%
rename from build.xml
rename to org_apg/build.xml
diff --git a/libs/android-integration-supportv4.jar b/org_apg/libs/android-integration-supportv4.jar
similarity index 100%
rename from libs/android-integration-supportv4.jar
rename to org_apg/libs/android-integration-supportv4.jar
diff --git a/libs/android-support-v4.jar b/org_apg/libs/android-support-v4.jar
similarity index 100%
rename from libs/android-support-v4.jar
rename to org_apg/libs/android-support-v4.jar
diff --git a/libs/bcprov-jdk16-146.jar b/org_apg/libs/bcprov-jdk16-146.jar
similarity index 100%
rename from libs/bcprov-jdk16-146.jar
rename to org_apg/libs/bcprov-jdk16-146.jar
diff --git a/pom.xml b/org_apg/pom.xml
similarity index 100%
rename from pom.xml
rename to org_apg/pom.xml
diff --git a/project.properties b/org_apg/project.properties
similarity index 100%
rename from project.properties
rename to org_apg/project.properties
diff --git a/res/anim/push_left_in.xml b/org_apg/res/anim/push_left_in.xml
similarity index 100%
rename from res/anim/push_left_in.xml
rename to org_apg/res/anim/push_left_in.xml
diff --git a/res/anim/push_left_out.xml b/org_apg/res/anim/push_left_out.xml
similarity index 100%
rename from res/anim/push_left_out.xml
rename to org_apg/res/anim/push_left_out.xml
diff --git a/res/anim/push_right_in.xml b/org_apg/res/anim/push_right_in.xml
similarity index 100%
rename from res/anim/push_right_in.xml
rename to org_apg/res/anim/push_right_in.xml
diff --git a/res/anim/push_right_out.xml b/org_apg/res/anim/push_right_out.xml
similarity index 100%
rename from res/anim/push_right_out.xml
rename to org_apg/res/anim/push_right_out.xml
diff --git a/res/drawable-finger/btn_circle.xml b/org_apg/res/drawable-finger/btn_circle.xml
similarity index 100%
rename from res/drawable-finger/btn_circle.xml
rename to org_apg/res/drawable-finger/btn_circle.xml
diff --git a/res/drawable-hdpi-finger/btn_circle_disable.png b/org_apg/res/drawable-hdpi-finger/btn_circle_disable.png
similarity index 100%
rename from res/drawable-hdpi-finger/btn_circle_disable.png
rename to org_apg/res/drawable-hdpi-finger/btn_circle_disable.png
diff --git a/res/drawable-hdpi-finger/btn_circle_disable_focused.png b/org_apg/res/drawable-hdpi-finger/btn_circle_disable_focused.png
similarity index 100%
rename from res/drawable-hdpi-finger/btn_circle_disable_focused.png
rename to org_apg/res/drawable-hdpi-finger/btn_circle_disable_focused.png
diff --git a/res/drawable-hdpi-finger/btn_circle_normal.png b/org_apg/res/drawable-hdpi-finger/btn_circle_normal.png
similarity index 100%
rename from res/drawable-hdpi-finger/btn_circle_normal.png
rename to org_apg/res/drawable-hdpi-finger/btn_circle_normal.png
diff --git a/res/drawable-hdpi-finger/btn_circle_pressed.png b/org_apg/res/drawable-hdpi-finger/btn_circle_pressed.png
similarity index 100%
rename from res/drawable-hdpi-finger/btn_circle_pressed.png
rename to org_apg/res/drawable-hdpi-finger/btn_circle_pressed.png
diff --git a/res/drawable-hdpi-finger/btn_circle_selected.png b/org_apg/res/drawable-hdpi-finger/btn_circle_selected.png
similarity index 100%
rename from res/drawable-hdpi-finger/btn_circle_selected.png
rename to org_apg/res/drawable-hdpi-finger/btn_circle_selected.png
diff --git a/res/drawable-hdpi-finger/ic_btn_round_minus.png b/org_apg/res/drawable-hdpi-finger/ic_btn_round_minus.png
similarity index 100%
rename from res/drawable-hdpi-finger/ic_btn_round_minus.png
rename to org_apg/res/drawable-hdpi-finger/ic_btn_round_minus.png
diff --git a/res/drawable-hdpi-finger/ic_btn_round_plus.png b/org_apg/res/drawable-hdpi-finger/ic_btn_round_plus.png
similarity index 100%
rename from res/drawable-hdpi-finger/ic_btn_round_plus.png
rename to org_apg/res/drawable-hdpi-finger/ic_btn_round_plus.png
diff --git a/res/drawable-hdpi/encrypted.png b/org_apg/res/drawable-hdpi/encrypted.png
similarity index 100%
rename from res/drawable-hdpi/encrypted.png
rename to org_apg/res/drawable-hdpi/encrypted.png
diff --git a/res/drawable-hdpi/encrypted_large.png b/org_apg/res/drawable-hdpi/encrypted_large.png
similarity index 100%
rename from res/drawable-hdpi/encrypted_large.png
rename to org_apg/res/drawable-hdpi/encrypted_large.png
diff --git a/res/drawable-hdpi/encrypted_small.png b/org_apg/res/drawable-hdpi/encrypted_small.png
similarity index 100%
rename from res/drawable-hdpi/encrypted_small.png
rename to org_apg/res/drawable-hdpi/encrypted_small.png
diff --git a/res/drawable-hdpi/ic_next.png b/org_apg/res/drawable-hdpi/ic_next.png
similarity index 100%
rename from res/drawable-hdpi/ic_next.png
rename to org_apg/res/drawable-hdpi/ic_next.png
diff --git a/res/drawable-hdpi/ic_previous.png b/org_apg/res/drawable-hdpi/ic_previous.png
similarity index 100%
rename from res/drawable-hdpi/ic_previous.png
rename to org_apg/res/drawable-hdpi/ic_previous.png
diff --git a/res/drawable-hdpi/icon.png b/org_apg/res/drawable-hdpi/icon.png
similarity index 100%
rename from res/drawable-hdpi/icon.png
rename to org_apg/res/drawable-hdpi/icon.png
diff --git a/res/drawable-hdpi/key.png b/org_apg/res/drawable-hdpi/key.png
similarity index 100%
rename from res/drawable-hdpi/key.png
rename to org_apg/res/drawable-hdpi/key.png
diff --git a/res/drawable-hdpi/key_large.png b/org_apg/res/drawable-hdpi/key_large.png
similarity index 100%
rename from res/drawable-hdpi/key_large.png
rename to org_apg/res/drawable-hdpi/key_large.png
diff --git a/res/drawable-hdpi/key_small.png b/org_apg/res/drawable-hdpi/key_small.png
similarity index 100%
rename from res/drawable-hdpi/key_small.png
rename to org_apg/res/drawable-hdpi/key_small.png
diff --git a/res/drawable-hdpi/overlay_error.png b/org_apg/res/drawable-hdpi/overlay_error.png
similarity index 100%
rename from res/drawable-hdpi/overlay_error.png
rename to org_apg/res/drawable-hdpi/overlay_error.png
diff --git a/res/drawable-hdpi/overlay_ok.png b/org_apg/res/drawable-hdpi/overlay_ok.png
similarity index 100%
rename from res/drawable-hdpi/overlay_ok.png
rename to org_apg/res/drawable-hdpi/overlay_ok.png
diff --git a/res/drawable-hdpi/signed.png b/org_apg/res/drawable-hdpi/signed.png
similarity index 100%
rename from res/drawable-hdpi/signed.png
rename to org_apg/res/drawable-hdpi/signed.png
diff --git a/res/drawable-hdpi/signed_large.png b/org_apg/res/drawable-hdpi/signed_large.png
similarity index 100%
rename from res/drawable-hdpi/signed_large.png
rename to org_apg/res/drawable-hdpi/signed_large.png
diff --git a/res/drawable-hdpi/signed_small.png b/org_apg/res/drawable-hdpi/signed_small.png
similarity index 100%
rename from res/drawable-hdpi/signed_small.png
rename to org_apg/res/drawable-hdpi/signed_small.png
diff --git a/res/drawable-ldpi/encrypted.png b/org_apg/res/drawable-ldpi/encrypted.png
similarity index 100%
rename from res/drawable-ldpi/encrypted.png
rename to org_apg/res/drawable-ldpi/encrypted.png
diff --git a/res/drawable-ldpi/encrypted_large.png b/org_apg/res/drawable-ldpi/encrypted_large.png
similarity index 100%
rename from res/drawable-ldpi/encrypted_large.png
rename to org_apg/res/drawable-ldpi/encrypted_large.png
diff --git a/res/drawable-ldpi/encrypted_small.png b/org_apg/res/drawable-ldpi/encrypted_small.png
similarity index 100%
rename from res/drawable-ldpi/encrypted_small.png
rename to org_apg/res/drawable-ldpi/encrypted_small.png
diff --git a/res/drawable-ldpi/ic_next.png b/org_apg/res/drawable-ldpi/ic_next.png
similarity index 100%
rename from res/drawable-ldpi/ic_next.png
rename to org_apg/res/drawable-ldpi/ic_next.png
diff --git a/res/drawable-ldpi/ic_previous.png b/org_apg/res/drawable-ldpi/ic_previous.png
similarity index 100%
rename from res/drawable-ldpi/ic_previous.png
rename to org_apg/res/drawable-ldpi/ic_previous.png
diff --git a/res/drawable-ldpi/icon.png b/org_apg/res/drawable-ldpi/icon.png
similarity index 100%
rename from res/drawable-ldpi/icon.png
rename to org_apg/res/drawable-ldpi/icon.png
diff --git a/res/drawable-ldpi/key.png b/org_apg/res/drawable-ldpi/key.png
similarity index 100%
rename from res/drawable-ldpi/key.png
rename to org_apg/res/drawable-ldpi/key.png
diff --git a/res/drawable-ldpi/key_large.png b/org_apg/res/drawable-ldpi/key_large.png
similarity index 100%
rename from res/drawable-ldpi/key_large.png
rename to org_apg/res/drawable-ldpi/key_large.png
diff --git a/res/drawable-ldpi/key_small.png b/org_apg/res/drawable-ldpi/key_small.png
similarity index 100%
rename from res/drawable-ldpi/key_small.png
rename to org_apg/res/drawable-ldpi/key_small.png
diff --git a/res/drawable-ldpi/overlay_error.png b/org_apg/res/drawable-ldpi/overlay_error.png
similarity index 100%
rename from res/drawable-ldpi/overlay_error.png
rename to org_apg/res/drawable-ldpi/overlay_error.png
diff --git a/res/drawable-ldpi/overlay_ok.png b/org_apg/res/drawable-ldpi/overlay_ok.png
similarity index 100%
rename from res/drawable-ldpi/overlay_ok.png
rename to org_apg/res/drawable-ldpi/overlay_ok.png
diff --git a/res/drawable-ldpi/signed.png b/org_apg/res/drawable-ldpi/signed.png
similarity index 100%
rename from res/drawable-ldpi/signed.png
rename to org_apg/res/drawable-ldpi/signed.png
diff --git a/res/drawable-ldpi/signed_large.png b/org_apg/res/drawable-ldpi/signed_large.png
similarity index 100%
rename from res/drawable-ldpi/signed_large.png
rename to org_apg/res/drawable-ldpi/signed_large.png
diff --git a/res/drawable-ldpi/signed_small.png b/org_apg/res/drawable-ldpi/signed_small.png
similarity index 100%
rename from res/drawable-ldpi/signed_small.png
rename to org_apg/res/drawable-ldpi/signed_small.png
diff --git a/res/drawable-mdpi-finger/btn_circle_disable.png b/org_apg/res/drawable-mdpi-finger/btn_circle_disable.png
similarity index 100%
rename from res/drawable-mdpi-finger/btn_circle_disable.png
rename to org_apg/res/drawable-mdpi-finger/btn_circle_disable.png
diff --git a/res/drawable-mdpi-finger/btn_circle_disable_focused.png b/org_apg/res/drawable-mdpi-finger/btn_circle_disable_focused.png
similarity index 100%
rename from res/drawable-mdpi-finger/btn_circle_disable_focused.png
rename to org_apg/res/drawable-mdpi-finger/btn_circle_disable_focused.png
diff --git a/res/drawable-mdpi-finger/btn_circle_normal.png b/org_apg/res/drawable-mdpi-finger/btn_circle_normal.png
similarity index 100%
rename from res/drawable-mdpi-finger/btn_circle_normal.png
rename to org_apg/res/drawable-mdpi-finger/btn_circle_normal.png
diff --git a/res/drawable-mdpi-finger/btn_circle_pressed.png b/org_apg/res/drawable-mdpi-finger/btn_circle_pressed.png
similarity index 100%
rename from res/drawable-mdpi-finger/btn_circle_pressed.png
rename to org_apg/res/drawable-mdpi-finger/btn_circle_pressed.png
diff --git a/res/drawable-mdpi-finger/btn_circle_selected.png b/org_apg/res/drawable-mdpi-finger/btn_circle_selected.png
similarity index 100%
rename from res/drawable-mdpi-finger/btn_circle_selected.png
rename to org_apg/res/drawable-mdpi-finger/btn_circle_selected.png
diff --git a/res/drawable-mdpi-finger/ic_btn_round_minus.png b/org_apg/res/drawable-mdpi-finger/ic_btn_round_minus.png
similarity index 100%
rename from res/drawable-mdpi-finger/ic_btn_round_minus.png
rename to org_apg/res/drawable-mdpi-finger/ic_btn_round_minus.png
diff --git a/res/drawable-mdpi-finger/ic_btn_round_plus.png b/org_apg/res/drawable-mdpi-finger/ic_btn_round_plus.png
similarity index 100%
rename from res/drawable-mdpi-finger/ic_btn_round_plus.png
rename to org_apg/res/drawable-mdpi-finger/ic_btn_round_plus.png
diff --git a/res/drawable-mdpi/encrypted.png b/org_apg/res/drawable-mdpi/encrypted.png
similarity index 100%
rename from res/drawable-mdpi/encrypted.png
rename to org_apg/res/drawable-mdpi/encrypted.png
diff --git a/res/drawable-mdpi/encrypted_large.png b/org_apg/res/drawable-mdpi/encrypted_large.png
similarity index 100%
rename from res/drawable-mdpi/encrypted_large.png
rename to org_apg/res/drawable-mdpi/encrypted_large.png
diff --git a/res/drawable-mdpi/encrypted_small.png b/org_apg/res/drawable-mdpi/encrypted_small.png
similarity index 100%
rename from res/drawable-mdpi/encrypted_small.png
rename to org_apg/res/drawable-mdpi/encrypted_small.png
diff --git a/res/drawable-mdpi/ic_next.png b/org_apg/res/drawable-mdpi/ic_next.png
similarity index 100%
rename from res/drawable-mdpi/ic_next.png
rename to org_apg/res/drawable-mdpi/ic_next.png
diff --git a/res/drawable-mdpi/ic_previous.png b/org_apg/res/drawable-mdpi/ic_previous.png
similarity index 100%
rename from res/drawable-mdpi/ic_previous.png
rename to org_apg/res/drawable-mdpi/ic_previous.png
diff --git a/res/drawable-mdpi/icon.png b/org_apg/res/drawable-mdpi/icon.png
similarity index 100%
rename from res/drawable-mdpi/icon.png
rename to org_apg/res/drawable-mdpi/icon.png
diff --git a/res/drawable-mdpi/key.png b/org_apg/res/drawable-mdpi/key.png
similarity index 100%
rename from res/drawable-mdpi/key.png
rename to org_apg/res/drawable-mdpi/key.png
diff --git a/res/drawable-mdpi/key_large.png b/org_apg/res/drawable-mdpi/key_large.png
similarity index 100%
rename from res/drawable-mdpi/key_large.png
rename to org_apg/res/drawable-mdpi/key_large.png
diff --git a/res/drawable-mdpi/key_small.png b/org_apg/res/drawable-mdpi/key_small.png
similarity index 100%
rename from res/drawable-mdpi/key_small.png
rename to org_apg/res/drawable-mdpi/key_small.png
diff --git a/res/drawable-mdpi/overlay_error.png b/org_apg/res/drawable-mdpi/overlay_error.png
similarity index 100%
rename from res/drawable-mdpi/overlay_error.png
rename to org_apg/res/drawable-mdpi/overlay_error.png
diff --git a/res/drawable-mdpi/overlay_ok.png b/org_apg/res/drawable-mdpi/overlay_ok.png
similarity index 100%
rename from res/drawable-mdpi/overlay_ok.png
rename to org_apg/res/drawable-mdpi/overlay_ok.png
diff --git a/res/drawable-mdpi/signed.png b/org_apg/res/drawable-mdpi/signed.png
similarity index 100%
rename from res/drawable-mdpi/signed.png
rename to org_apg/res/drawable-mdpi/signed.png
diff --git a/res/drawable-mdpi/signed_large.png b/org_apg/res/drawable-mdpi/signed_large.png
similarity index 100%
rename from res/drawable-mdpi/signed_large.png
rename to org_apg/res/drawable-mdpi/signed_large.png
diff --git a/res/drawable-mdpi/signed_small.png b/org_apg/res/drawable-mdpi/signed_small.png
similarity index 100%
rename from res/drawable-mdpi/signed_small.png
rename to org_apg/res/drawable-mdpi/signed_small.png
diff --git a/res/drawable-xhdpi/icon.png b/org_apg/res/drawable-xhdpi/icon.png
similarity index 100%
rename from res/drawable-xhdpi/icon.png
rename to org_apg/res/drawable-xhdpi/icon.png
diff --git a/res/drawable/btn_circle_disable.png b/org_apg/res/drawable/btn_circle_disable.png
similarity index 100%
rename from res/drawable/btn_circle_disable.png
rename to org_apg/res/drawable/btn_circle_disable.png
diff --git a/res/drawable/btn_circle_disable_focused.png b/org_apg/res/drawable/btn_circle_disable_focused.png
similarity index 100%
rename from res/drawable/btn_circle_disable_focused.png
rename to org_apg/res/drawable/btn_circle_disable_focused.png
diff --git a/res/drawable/btn_circle_normal.png b/org_apg/res/drawable/btn_circle_normal.png
similarity index 100%
rename from res/drawable/btn_circle_normal.png
rename to org_apg/res/drawable/btn_circle_normal.png
diff --git a/res/drawable/btn_circle_pressed.png b/org_apg/res/drawable/btn_circle_pressed.png
similarity index 100%
rename from res/drawable/btn_circle_pressed.png
rename to org_apg/res/drawable/btn_circle_pressed.png
diff --git a/res/drawable/btn_circle_selected.png b/org_apg/res/drawable/btn_circle_selected.png
similarity index 100%
rename from res/drawable/btn_circle_selected.png
rename to org_apg/res/drawable/btn_circle_selected.png
diff --git a/res/drawable/encrypted.png b/org_apg/res/drawable/encrypted.png
similarity index 100%
rename from res/drawable/encrypted.png
rename to org_apg/res/drawable/encrypted.png
diff --git a/res/drawable/encrypted_large.png b/org_apg/res/drawable/encrypted_large.png
similarity index 100%
rename from res/drawable/encrypted_large.png
rename to org_apg/res/drawable/encrypted_large.png
diff --git a/res/drawable/encrypted_small.png b/org_apg/res/drawable/encrypted_small.png
similarity index 100%
rename from res/drawable/encrypted_small.png
rename to org_apg/res/drawable/encrypted_small.png
diff --git a/res/drawable/ic_btn_round_minus.png b/org_apg/res/drawable/ic_btn_round_minus.png
similarity index 100%
rename from res/drawable/ic_btn_round_minus.png
rename to org_apg/res/drawable/ic_btn_round_minus.png
diff --git a/res/drawable/ic_btn_round_plus.png b/org_apg/res/drawable/ic_btn_round_plus.png
similarity index 100%
rename from res/drawable/ic_btn_round_plus.png
rename to org_apg/res/drawable/ic_btn_round_plus.png
diff --git a/res/drawable/ic_launcher_folder.png b/org_apg/res/drawable/ic_launcher_folder.png
similarity index 100%
rename from res/drawable/ic_launcher_folder.png
rename to org_apg/res/drawable/ic_launcher_folder.png
diff --git a/res/drawable/ic_launcher_folder_small.png b/org_apg/res/drawable/ic_launcher_folder_small.png
similarity index 100%
rename from res/drawable/ic_launcher_folder_small.png
rename to org_apg/res/drawable/ic_launcher_folder_small.png
diff --git a/res/drawable/ic_next.png b/org_apg/res/drawable/ic_next.png
similarity index 100%
rename from res/drawable/ic_next.png
rename to org_apg/res/drawable/ic_next.png
diff --git a/res/drawable/ic_previous.png b/org_apg/res/drawable/ic_previous.png
similarity index 100%
rename from res/drawable/ic_previous.png
rename to org_apg/res/drawable/ic_previous.png
diff --git a/res/drawable/key.png b/org_apg/res/drawable/key.png
similarity index 100%
rename from res/drawable/key.png
rename to org_apg/res/drawable/key.png
diff --git a/res/drawable/key_large.png b/org_apg/res/drawable/key_large.png
similarity index 100%
rename from res/drawable/key_large.png
rename to org_apg/res/drawable/key_large.png
diff --git a/res/drawable/key_small.png b/org_apg/res/drawable/key_small.png
similarity index 100%
rename from res/drawable/key_small.png
rename to org_apg/res/drawable/key_small.png
diff --git a/res/drawable/overlay_error.png b/org_apg/res/drawable/overlay_error.png
similarity index 100%
rename from res/drawable/overlay_error.png
rename to org_apg/res/drawable/overlay_error.png
diff --git a/res/drawable/overlay_ok.png b/org_apg/res/drawable/overlay_ok.png
similarity index 100%
rename from res/drawable/overlay_ok.png
rename to org_apg/res/drawable/overlay_ok.png
diff --git a/res/drawable/signed.png b/org_apg/res/drawable/signed.png
similarity index 100%
rename from res/drawable/signed.png
rename to org_apg/res/drawable/signed.png
diff --git a/res/drawable/signed_large.png b/org_apg/res/drawable/signed_large.png
similarity index 100%
rename from res/drawable/signed_large.png
rename to org_apg/res/drawable/signed_large.png
diff --git a/res/drawable/signed_small.png b/org_apg/res/drawable/signed_small.png
similarity index 100%
rename from res/drawable/signed_small.png
rename to org_apg/res/drawable/signed_small.png
diff --git a/res/layout/about_activity.xml b/org_apg/res/layout/about_activity.xml
similarity index 100%
rename from res/layout/about_activity.xml
rename to org_apg/res/layout/about_activity.xml
diff --git a/res/layout/account_item.xml b/org_apg/res/layout/account_item.xml
similarity index 100%
rename from res/layout/account_item.xml
rename to org_apg/res/layout/account_item.xml
diff --git a/res/layout/add_account_dialog.xml b/org_apg/res/layout/add_account_dialog.xml
similarity index 100%
rename from res/layout/add_account_dialog.xml
rename to org_apg/res/layout/add_account_dialog.xml
diff --git a/res/layout/create_key.xml b/org_apg/res/layout/create_key.xml
similarity index 100%
rename from res/layout/create_key.xml
rename to org_apg/res/layout/create_key.xml
diff --git a/res/layout/decrypt.xml b/org_apg/res/layout/decrypt.xml
similarity index 100%
rename from res/layout/decrypt.xml
rename to org_apg/res/layout/decrypt.xml
diff --git a/res/layout/edit_key.xml b/org_apg/res/layout/edit_key.xml
similarity index 100%
rename from res/layout/edit_key.xml
rename to org_apg/res/layout/edit_key.xml
diff --git a/res/layout/edit_key_key_item.xml b/org_apg/res/layout/edit_key_key_item.xml
similarity index 100%
rename from res/layout/edit_key_key_item.xml
rename to org_apg/res/layout/edit_key_key_item.xml
diff --git a/res/layout/edit_key_section.xml b/org_apg/res/layout/edit_key_section.xml
similarity index 100%
rename from res/layout/edit_key_section.xml
rename to org_apg/res/layout/edit_key_section.xml
diff --git a/res/layout/edit_key_user_id_item.xml b/org_apg/res/layout/edit_key_user_id_item.xml
similarity index 100%
rename from res/layout/edit_key_user_id_item.xml
rename to org_apg/res/layout/edit_key_user_id_item.xml
diff --git a/res/layout/encrypt.xml b/org_apg/res/layout/encrypt.xml
similarity index 100%
rename from res/layout/encrypt.xml
rename to org_apg/res/layout/encrypt.xml
diff --git a/res/layout/file_dialog.xml b/org_apg/res/layout/file_dialog.xml
similarity index 100%
rename from res/layout/file_dialog.xml
rename to org_apg/res/layout/file_dialog.xml
diff --git a/res/layout/filter_info.xml b/org_apg/res/layout/filter_info.xml
similarity index 100%
rename from res/layout/filter_info.xml
rename to org_apg/res/layout/filter_info.xml
diff --git a/res/layout/general.xml b/org_apg/res/layout/general.xml
similarity index 100%
rename from res/layout/general.xml
rename to org_apg/res/layout/general.xml
diff --git a/res/layout/info.xml b/org_apg/res/layout/info.xml
similarity index 100%
rename from res/layout/info.xml
rename to org_apg/res/layout/info.xml
diff --git a/res/layout/key_list.xml b/org_apg/res/layout/key_list.xml
similarity index 100%
rename from res/layout/key_list.xml
rename to org_apg/res/layout/key_list.xml
diff --git a/res/layout/key_list_child_item_master_key.xml b/org_apg/res/layout/key_list_child_item_master_key.xml
similarity index 100%
rename from res/layout/key_list_child_item_master_key.xml
rename to org_apg/res/layout/key_list_child_item_master_key.xml
diff --git a/res/layout/key_list_child_item_sub_key.xml b/org_apg/res/layout/key_list_child_item_sub_key.xml
similarity index 100%
rename from res/layout/key_list_child_item_sub_key.xml
rename to org_apg/res/layout/key_list_child_item_sub_key.xml
diff --git a/res/layout/key_list_child_item_user_id.xml b/org_apg/res/layout/key_list_child_item_user_id.xml
similarity index 100%
rename from res/layout/key_list_child_item_user_id.xml
rename to org_apg/res/layout/key_list_child_item_user_id.xml
diff --git a/res/layout/key_list_group_item.xml b/org_apg/res/layout/key_list_group_item.xml
similarity index 100%
rename from res/layout/key_list_group_item.xml
rename to org_apg/res/layout/key_list_group_item.xml
diff --git a/res/layout/key_server_editor.xml b/org_apg/res/layout/key_server_editor.xml
similarity index 100%
rename from res/layout/key_server_editor.xml
rename to org_apg/res/layout/key_server_editor.xml
diff --git a/res/layout/key_server_export_layout.xml b/org_apg/res/layout/key_server_export_layout.xml
similarity index 100%
rename from res/layout/key_server_export_layout.xml
rename to org_apg/res/layout/key_server_export_layout.xml
diff --git a/res/layout/key_server_preference.xml b/org_apg/res/layout/key_server_preference.xml
similarity index 100%
rename from res/layout/key_server_preference.xml
rename to org_apg/res/layout/key_server_preference.xml
diff --git a/res/layout/key_server_query_layout.xml b/org_apg/res/layout/key_server_query_layout.xml
similarity index 100%
rename from res/layout/key_server_query_layout.xml
rename to org_apg/res/layout/key_server_query_layout.xml
diff --git a/res/layout/key_server_query_result_item.xml b/org_apg/res/layout/key_server_query_result_item.xml
similarity index 100%
rename from res/layout/key_server_query_result_item.xml
rename to org_apg/res/layout/key_server_query_result_item.xml
diff --git a/res/layout/key_server_query_result_user_id.xml b/org_apg/res/layout/key_server_query_result_user_id.xml
similarity index 100%
rename from res/layout/key_server_query_result_user_id.xml
rename to org_apg/res/layout/key_server_query_result_user_id.xml
diff --git a/res/layout/mailbox_message_item.xml b/org_apg/res/layout/mailbox_message_item.xml
similarity index 100%
rename from res/layout/mailbox_message_item.xml
rename to org_apg/res/layout/mailbox_message_item.xml
diff --git a/res/layout/main.xml b/org_apg/res/layout/main.xml
similarity index 100%
rename from res/layout/main.xml
rename to org_apg/res/layout/main.xml
diff --git a/res/layout/pass_phrase.xml b/org_apg/res/layout/pass_phrase.xml
similarity index 100%
rename from res/layout/pass_phrase.xml
rename to org_apg/res/layout/pass_phrase.xml
diff --git a/res/layout/select_public_key.xml b/org_apg/res/layout/select_public_key.xml
similarity index 100%
rename from res/layout/select_public_key.xml
rename to org_apg/res/layout/select_public_key.xml
diff --git a/res/layout/select_public_key_item.xml b/org_apg/res/layout/select_public_key_item.xml
similarity index 100%
rename from res/layout/select_public_key_item.xml
rename to org_apg/res/layout/select_public_key_item.xml
diff --git a/res/layout/select_secret_key.xml b/org_apg/res/layout/select_secret_key.xml
similarity index 100%
rename from res/layout/select_secret_key.xml
rename to org_apg/res/layout/select_secret_key.xml
diff --git a/res/layout/select_secret_key_item.xml b/org_apg/res/layout/select_secret_key_item.xml
similarity index 100%
rename from res/layout/select_secret_key_item.xml
rename to org_apg/res/layout/select_secret_key_item.xml
diff --git a/res/layout/sign_key_layout.xml b/org_apg/res/layout/sign_key_layout.xml
similarity index 100%
rename from res/layout/sign_key_layout.xml
rename to org_apg/res/layout/sign_key_layout.xml
diff --git a/res/values-da/strings.xml b/org_apg/res/values-da/strings.xml
similarity index 100%
rename from res/values-da/strings.xml
rename to org_apg/res/values-da/strings.xml
diff --git a/res/values-de/strings.xml b/org_apg/res/values-de/strings.xml
similarity index 100%
rename from res/values-de/strings.xml
rename to org_apg/res/values-de/strings.xml
diff --git a/res/values-es/strings.xml b/org_apg/res/values-es/strings.xml
similarity index 100%
rename from res/values-es/strings.xml
rename to org_apg/res/values-es/strings.xml
diff --git a/res/values-it/strings.xml b/org_apg/res/values-it/strings.xml
similarity index 100%
rename from res/values-it/strings.xml
rename to org_apg/res/values-it/strings.xml
diff --git a/res/values-no/strings.xml b/org_apg/res/values-no/strings.xml
similarity index 100%
rename from res/values-no/strings.xml
rename to org_apg/res/values-no/strings.xml
diff --git a/res/values-pt/strings.xml b/org_apg/res/values-pt/strings.xml
similarity index 100%
rename from res/values-pt/strings.xml
rename to org_apg/res/values-pt/strings.xml
diff --git a/res/values-sl/strings.xml b/org_apg/res/values-sl/strings.xml
similarity index 100%
rename from res/values-sl/strings.xml
rename to org_apg/res/values-sl/strings.xml
diff --git a/res/values-zh/strings.xml b/org_apg/res/values-zh/strings.xml
similarity index 100%
rename from res/values-zh/strings.xml
rename to org_apg/res/values-zh/strings.xml
diff --git a/res/values/arrays.xml b/org_apg/res/values/arrays.xml
similarity index 100%
rename from res/values/arrays.xml
rename to org_apg/res/values/arrays.xml
diff --git a/res/values/static_strings.xml b/org_apg/res/values/static_strings.xml
similarity index 100%
rename from res/values/static_strings.xml
rename to org_apg/res/values/static_strings.xml
diff --git a/res/values/strings.xml b/org_apg/res/values/strings.xml
similarity index 100%
rename from res/values/strings.xml
rename to org_apg/res/values/strings.xml
diff --git a/res/values/styles.xml b/org_apg/res/values/styles.xml
similarity index 100%
rename from res/values/styles.xml
rename to org_apg/res/values/styles.xml
diff --git a/res/xml/apg_preferences.xml b/org_apg/res/xml/apg_preferences.xml
similarity index 100%
rename from res/xml/apg_preferences.xml
rename to org_apg/res/xml/apg_preferences.xml
diff --git a/res/xml/searchable_public_keys.xml b/org_apg/res/xml/searchable_public_keys.xml
similarity index 100%
rename from res/xml/searchable_public_keys.xml
rename to org_apg/res/xml/searchable_public_keys.xml
diff --git a/res/xml/searchable_secret_keys.xml b/org_apg/res/xml/searchable_secret_keys.xml
similarity index 100%
rename from res/xml/searchable_secret_keys.xml
rename to org_apg/res/xml/searchable_secret_keys.xml
diff --git a/src/org/apg/Apg.java b/org_apg/src/org/apg/Apg.java
similarity index 100%
rename from src/org/apg/Apg.java
rename to org_apg/src/org/apg/Apg.java
diff --git a/src/org/apg/ApgService.java b/org_apg/src/org/apg/ApgService.java
similarity index 100%
rename from src/org/apg/ApgService.java
rename to org_apg/src/org/apg/ApgService.java
diff --git a/src/org/apg/AskForSecretKeyPassPhrase.java b/org_apg/src/org/apg/AskForSecretKeyPassPhrase.java
similarity index 100%
rename from src/org/apg/AskForSecretKeyPassPhrase.java
rename to org_apg/src/org/apg/AskForSecretKeyPassPhrase.java
diff --git a/src/org/apg/CachedPassPhrase.java b/org_apg/src/org/apg/CachedPassPhrase.java
similarity index 100%
rename from src/org/apg/CachedPassPhrase.java
rename to org_apg/src/org/apg/CachedPassPhrase.java
diff --git a/src/org/apg/Constants.java b/org_apg/src/org/apg/Constants.java
similarity index 100%
rename from src/org/apg/Constants.java
rename to org_apg/src/org/apg/Constants.java
diff --git a/src/org/apg/DataDestination.java b/org_apg/src/org/apg/DataDestination.java
similarity index 100%
rename from src/org/apg/DataDestination.java
rename to org_apg/src/org/apg/DataDestination.java
diff --git a/src/org/apg/DataSource.java b/org_apg/src/org/apg/DataSource.java
similarity index 100%
rename from src/org/apg/DataSource.java
rename to org_apg/src/org/apg/DataSource.java
diff --git a/src/org/apg/FileDialog.java b/org_apg/src/org/apg/FileDialog.java
similarity index 100%
rename from src/org/apg/FileDialog.java
rename to org_apg/src/org/apg/FileDialog.java
diff --git a/src/org/apg/HkpKeyServer.java b/org_apg/src/org/apg/HkpKeyServer.java
similarity index 100%
rename from src/org/apg/HkpKeyServer.java
rename to org_apg/src/org/apg/HkpKeyServer.java
diff --git a/src/org/apg/IApgService.aidl b/org_apg/src/org/apg/IApgService.aidl
similarity index 100%
rename from src/org/apg/IApgService.aidl
rename to org_apg/src/org/apg/IApgService.aidl
diff --git a/src/org/apg/Id.java b/org_apg/src/org/apg/Id.java
similarity index 100%
rename from src/org/apg/Id.java
rename to org_apg/src/org/apg/Id.java
diff --git a/src/org/apg/InputData.java b/org_apg/src/org/apg/InputData.java
similarity index 100%
rename from src/org/apg/InputData.java
rename to org_apg/src/org/apg/InputData.java
diff --git a/src/org/apg/KeyServer.java b/org_apg/src/org/apg/KeyServer.java
similarity index 100%
rename from src/org/apg/KeyServer.java
rename to org_apg/src/org/apg/KeyServer.java
diff --git a/src/org/apg/PausableThread.java b/org_apg/src/org/apg/PausableThread.java
similarity index 100%
rename from src/org/apg/PausableThread.java
rename to org_apg/src/org/apg/PausableThread.java
diff --git a/src/org/apg/PositionAwareInputStream.java b/org_apg/src/org/apg/PositionAwareInputStream.java
similarity index 100%
rename from src/org/apg/PositionAwareInputStream.java
rename to org_apg/src/org/apg/PositionAwareInputStream.java
diff --git a/src/org/apg/Preferences.java b/org_apg/src/org/apg/Preferences.java
similarity index 100%
rename from src/org/apg/Preferences.java
rename to org_apg/src/org/apg/Preferences.java
diff --git a/src/org/apg/Primes.java b/org_apg/src/org/apg/Primes.java
similarity index 100%
rename from src/org/apg/Primes.java
rename to org_apg/src/org/apg/Primes.java
diff --git a/src/org/apg/ProgressDialogUpdater.java b/org_apg/src/org/apg/ProgressDialogUpdater.java
similarity index 100%
rename from src/org/apg/ProgressDialogUpdater.java
rename to org_apg/src/org/apg/ProgressDialogUpdater.java
diff --git a/src/org/apg/Service.java b/org_apg/src/org/apg/Service.java
similarity index 100%
rename from src/org/apg/Service.java
rename to org_apg/src/org/apg/Service.java
diff --git a/src/org/apg/provider/Accounts.java b/org_apg/src/org/apg/provider/Accounts.java
similarity index 100%
rename from src/org/apg/provider/Accounts.java
rename to org_apg/src/org/apg/provider/Accounts.java
diff --git a/src/org/apg/provider/ApgServiceBlobDatabase.java b/org_apg/src/org/apg/provider/ApgServiceBlobDatabase.java
similarity index 100%
rename from src/org/apg/provider/ApgServiceBlobDatabase.java
rename to org_apg/src/org/apg/provider/ApgServiceBlobDatabase.java
diff --git a/src/org/apg/provider/ApgServiceBlobProvider.java b/org_apg/src/org/apg/provider/ApgServiceBlobProvider.java
similarity index 100%
rename from src/org/apg/provider/ApgServiceBlobProvider.java
rename to org_apg/src/org/apg/provider/ApgServiceBlobProvider.java
diff --git a/src/org/apg/provider/DataProvider.java b/org_apg/src/org/apg/provider/DataProvider.java
similarity index 100%
rename from src/org/apg/provider/DataProvider.java
rename to org_apg/src/org/apg/provider/DataProvider.java
diff --git a/src/org/apg/provider/Database.java b/org_apg/src/org/apg/provider/Database.java
similarity index 100%
rename from src/org/apg/provider/Database.java
rename to org_apg/src/org/apg/provider/Database.java
diff --git a/src/org/apg/provider/KeyRings.java b/org_apg/src/org/apg/provider/KeyRings.java
similarity index 100%
rename from src/org/apg/provider/KeyRings.java
rename to org_apg/src/org/apg/provider/KeyRings.java
diff --git a/src/org/apg/provider/Keys.java b/org_apg/src/org/apg/provider/Keys.java
similarity index 100%
rename from src/org/apg/provider/Keys.java
rename to org_apg/src/org/apg/provider/Keys.java
diff --git a/src/org/apg/provider/UserIds.java b/org_apg/src/org/apg/provider/UserIds.java
similarity index 100%
rename from src/org/apg/provider/UserIds.java
rename to org_apg/src/org/apg/provider/UserIds.java
diff --git a/src/org/apg/ui/AboutActivity.java b/org_apg/src/org/apg/ui/AboutActivity.java
similarity index 100%
rename from src/org/apg/ui/AboutActivity.java
rename to org_apg/src/org/apg/ui/AboutActivity.java
diff --git a/src/org/apg/ui/BaseActivity.java b/org_apg/src/org/apg/ui/BaseActivity.java
similarity index 100%
rename from src/org/apg/ui/BaseActivity.java
rename to org_apg/src/org/apg/ui/BaseActivity.java
diff --git a/src/org/apg/ui/DecryptActivity.java b/org_apg/src/org/apg/ui/DecryptActivity.java
similarity index 100%
rename from src/org/apg/ui/DecryptActivity.java
rename to org_apg/src/org/apg/ui/DecryptActivity.java
diff --git a/src/org/apg/ui/EditKeyActivity.java b/org_apg/src/org/apg/ui/EditKeyActivity.java
similarity index 100%
rename from src/org/apg/ui/EditKeyActivity.java
rename to org_apg/src/org/apg/ui/EditKeyActivity.java
diff --git a/src/org/apg/ui/EncryptActivity.java b/org_apg/src/org/apg/ui/EncryptActivity.java
similarity index 100%
rename from src/org/apg/ui/EncryptActivity.java
rename to org_apg/src/org/apg/ui/EncryptActivity.java
diff --git a/src/org/apg/ui/GeneralActivity.java b/org_apg/src/org/apg/ui/GeneralActivity.java
similarity index 100%
rename from src/org/apg/ui/GeneralActivity.java
rename to org_apg/src/org/apg/ui/GeneralActivity.java
diff --git a/src/org/apg/ui/ImportFromQRCodeActivity.java b/org_apg/src/org/apg/ui/ImportFromQRCodeActivity.java
similarity index 100%
rename from src/org/apg/ui/ImportFromQRCodeActivity.java
rename to org_apg/src/org/apg/ui/ImportFromQRCodeActivity.java
diff --git a/src/org/apg/ui/KeyListActivity.java b/org_apg/src/org/apg/ui/KeyListActivity.java
similarity index 100%
rename from src/org/apg/ui/KeyListActivity.java
rename to org_apg/src/org/apg/ui/KeyListActivity.java
diff --git a/src/org/apg/ui/KeyServerPreferenceActivity.java b/org_apg/src/org/apg/ui/KeyServerPreferenceActivity.java
similarity index 100%
rename from src/org/apg/ui/KeyServerPreferenceActivity.java
rename to org_apg/src/org/apg/ui/KeyServerPreferenceActivity.java
diff --git a/src/org/apg/ui/KeyServerQueryActivity.java b/org_apg/src/org/apg/ui/KeyServerQueryActivity.java
similarity index 100%
rename from src/org/apg/ui/KeyServerQueryActivity.java
rename to org_apg/src/org/apg/ui/KeyServerQueryActivity.java
diff --git a/src/org/apg/ui/MailListActivity.java b/org_apg/src/org/apg/ui/MailListActivity.java
similarity index 100%
rename from src/org/apg/ui/MailListActivity.java
rename to org_apg/src/org/apg/ui/MailListActivity.java
diff --git a/src/org/apg/ui/MainActivity.java b/org_apg/src/org/apg/ui/MainActivity.java
similarity index 100%
rename from src/org/apg/ui/MainActivity.java
rename to org_apg/src/org/apg/ui/MainActivity.java
diff --git a/src/org/apg/ui/PreferencesActivity.java b/org_apg/src/org/apg/ui/PreferencesActivity.java
similarity index 100%
rename from src/org/apg/ui/PreferencesActivity.java
rename to org_apg/src/org/apg/ui/PreferencesActivity.java
diff --git a/src/org/apg/ui/PublicKeyListActivity.java b/org_apg/src/org/apg/ui/PublicKeyListActivity.java
similarity index 100%
rename from src/org/apg/ui/PublicKeyListActivity.java
rename to org_apg/src/org/apg/ui/PublicKeyListActivity.java
diff --git a/src/org/apg/ui/SecretKeyListActivity.java b/org_apg/src/org/apg/ui/SecretKeyListActivity.java
similarity index 100%
rename from src/org/apg/ui/SecretKeyListActivity.java
rename to org_apg/src/org/apg/ui/SecretKeyListActivity.java
diff --git a/src/org/apg/ui/SelectPublicKeyListActivity.java b/org_apg/src/org/apg/ui/SelectPublicKeyListActivity.java
similarity index 100%
rename from src/org/apg/ui/SelectPublicKeyListActivity.java
rename to org_apg/src/org/apg/ui/SelectPublicKeyListActivity.java
diff --git a/src/org/apg/ui/SelectPublicKeyListAdapter.java b/org_apg/src/org/apg/ui/SelectPublicKeyListAdapter.java
similarity index 100%
rename from src/org/apg/ui/SelectPublicKeyListAdapter.java
rename to org_apg/src/org/apg/ui/SelectPublicKeyListAdapter.java
diff --git a/src/org/apg/ui/SelectSecretKeyListActivity.java b/org_apg/src/org/apg/ui/SelectSecretKeyListActivity.java
similarity index 100%
rename from src/org/apg/ui/SelectSecretKeyListActivity.java
rename to org_apg/src/org/apg/ui/SelectSecretKeyListActivity.java
diff --git a/src/org/apg/ui/SelectSecretKeyListAdapter.java b/org_apg/src/org/apg/ui/SelectSecretKeyListAdapter.java
similarity index 100%
rename from src/org/apg/ui/SelectSecretKeyListAdapter.java
rename to org_apg/src/org/apg/ui/SelectSecretKeyListAdapter.java
diff --git a/src/org/apg/ui/SendKeyActivity.java b/org_apg/src/org/apg/ui/SendKeyActivity.java
similarity index 100%
rename from src/org/apg/ui/SendKeyActivity.java
rename to org_apg/src/org/apg/ui/SendKeyActivity.java
diff --git a/src/org/apg/ui/SignKeyActivity.java b/org_apg/src/org/apg/ui/SignKeyActivity.java
similarity index 100%
rename from src/org/apg/ui/SignKeyActivity.java
rename to org_apg/src/org/apg/ui/SignKeyActivity.java
diff --git a/src/org/apg/ui/widget/Editor.java b/org_apg/src/org/apg/ui/widget/Editor.java
similarity index 100%
rename from src/org/apg/ui/widget/Editor.java
rename to org_apg/src/org/apg/ui/widget/Editor.java
diff --git a/src/org/apg/ui/widget/IntegerListPreference.java b/org_apg/src/org/apg/ui/widget/IntegerListPreference.java
similarity index 100%
rename from src/org/apg/ui/widget/IntegerListPreference.java
rename to org_apg/src/org/apg/ui/widget/IntegerListPreference.java
diff --git a/src/org/apg/ui/widget/KeyEditor.java b/org_apg/src/org/apg/ui/widget/KeyEditor.java
similarity index 100%
rename from src/org/apg/ui/widget/KeyEditor.java
rename to org_apg/src/org/apg/ui/widget/KeyEditor.java
diff --git a/src/org/apg/ui/widget/KeyServerEditor.java b/org_apg/src/org/apg/ui/widget/KeyServerEditor.java
similarity index 100%
rename from src/org/apg/ui/widget/KeyServerEditor.java
rename to org_apg/src/org/apg/ui/widget/KeyServerEditor.java
diff --git a/src/org/apg/ui/widget/SectionView.java b/org_apg/src/org/apg/ui/widget/SectionView.java
similarity index 100%
rename from src/org/apg/ui/widget/SectionView.java
rename to org_apg/src/org/apg/ui/widget/SectionView.java
diff --git a/src/org/apg/ui/widget/UserIdEditor.java b/org_apg/src/org/apg/ui/widget/UserIdEditor.java
similarity index 100%
rename from src/org/apg/ui/widget/UserIdEditor.java
rename to org_apg/src/org/apg/ui/widget/UserIdEditor.java
diff --git a/src/org/apg/util/ApgCon.java b/org_apg/src/org/apg/util/ApgCon.java
similarity index 100%
rename from src/org/apg/util/ApgCon.java
rename to org_apg/src/org/apg/util/ApgCon.java
diff --git a/src/org/apg/util/ApgConInterface.java b/org_apg/src/org/apg/util/ApgConInterface.java
similarity index 100%
rename from src/org/apg/util/ApgConInterface.java
rename to org_apg/src/org/apg/util/ApgConInterface.java
diff --git a/src/org/apg/util/Choice.java b/org_apg/src/org/apg/util/Choice.java
similarity index 100%
rename from src/org/apg/util/Choice.java
rename to org_apg/src/org/apg/util/Choice.java
diff --git a/src/org/apg/util/Compatibility.java b/org_apg/src/org/apg/util/Compatibility.java
similarity index 100%
rename from src/org/apg/util/Compatibility.java
rename to org_apg/src/org/apg/util/Compatibility.java
diff --git a/src/org/apg/util/IterableIterator.java b/org_apg/src/org/apg/util/IterableIterator.java
similarity index 100%
rename from src/org/apg/util/IterableIterator.java
rename to org_apg/src/org/apg/util/IterableIterator.java