diff --git a/org_apg/.gitignore b/APG-API-Demo/.gitignore similarity index 100% rename from org_apg/.gitignore rename to APG-API-Demo/.gitignore diff --git a/org_apg_integration_demo/AndroidManifest.xml b/APG-API-Demo/AndroidManifest.xml similarity index 100% rename from org_apg_integration_demo/AndroidManifest.xml rename to APG-API-Demo/AndroidManifest.xml diff --git a/org_apg_integration_demo/build.xml b/APG-API-Demo/build.xml similarity index 100% rename from org_apg_integration_demo/build.xml rename to APG-API-Demo/build.xml diff --git a/org_apg/proguard-project.txt b/APG-API-Demo/proguard-project.txt similarity index 100% rename from org_apg/proguard-project.txt rename to APG-API-Demo/proguard-project.txt diff --git a/org_apg_integration_demo/project.properties b/APG-API-Demo/project.properties similarity index 100% rename from org_apg_integration_demo/project.properties rename to APG-API-Demo/project.properties diff --git a/org_apg/res/drawable-hdpi/icon.png b/APG-API-Demo/res/drawable-hdpi/icon.png similarity index 100% rename from org_apg/res/drawable-hdpi/icon.png rename to APG-API-Demo/res/drawable-hdpi/icon.png diff --git a/org_apg/res/drawable-ldpi/icon.png b/APG-API-Demo/res/drawable-ldpi/icon.png similarity index 100% rename from org_apg/res/drawable-ldpi/icon.png rename to APG-API-Demo/res/drawable-ldpi/icon.png diff --git a/org_apg/res/drawable-mdpi/icon.png b/APG-API-Demo/res/drawable-mdpi/icon.png similarity index 100% rename from org_apg/res/drawable-mdpi/icon.png rename to APG-API-Demo/res/drawable-mdpi/icon.png diff --git a/org_apg/res/drawable-xhdpi/icon.png b/APG-API-Demo/res/drawable-xhdpi/icon.png similarity index 100% rename from org_apg/res/drawable-xhdpi/icon.png rename to APG-API-Demo/res/drawable-xhdpi/icon.png diff --git a/org_apg_integration_demo/res/layout/aidl_demo.xml b/APG-API-Demo/res/layout/aidl_demo.xml similarity index 100% rename from org_apg_integration_demo/res/layout/aidl_demo.xml rename to APG-API-Demo/res/layout/aidl_demo.xml diff --git a/org_apg_integration_demo/res/layout/intent_demo.xml b/APG-API-Demo/res/layout/intent_demo.xml similarity index 100% rename from org_apg_integration_demo/res/layout/intent_demo.xml rename to APG-API-Demo/res/layout/intent_demo.xml diff --git a/org_apg_integration_demo/res/xml/base_preference.xml b/APG-API-Demo/res/xml/base_preference.xml similarity index 100% rename from org_apg_integration_demo/res/xml/base_preference.xml rename to APG-API-Demo/res/xml/base_preference.xml diff --git a/org_apg_integration_demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java b/APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java similarity index 100% rename from org_apg_integration_demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java rename to APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java diff --git a/org_apg_integration_demo/src/org/thialfihar/android/apg/demo/BaseActivity.java b/APG-API-Demo/src/org/thialfihar/android/apg/demo/BaseActivity.java similarity index 100% rename from org_apg_integration_demo/src/org/thialfihar/android/apg/demo/BaseActivity.java rename to APG-API-Demo/src/org/thialfihar/android/apg/demo/BaseActivity.java diff --git a/org_apg_integration_demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java b/APG-API-Demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java similarity index 100% rename from org_apg_integration_demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java rename to APG-API-Demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java diff --git a/org_apg_integration_demo/.gitignore b/APG-API-Lib/.gitignore similarity index 100% rename from org_apg_integration_demo/.gitignore rename to APG-API-Lib/.gitignore diff --git a/org_apg_integration_lib/AndroidManifest.xml b/APG-API-Lib/AndroidManifest.xml similarity index 100% rename from org_apg_integration_lib/AndroidManifest.xml rename to APG-API-Lib/AndroidManifest.xml diff --git a/org_apg_integration_lib/build.xml b/APG-API-Lib/build.xml similarity index 100% rename from org_apg_integration_lib/build.xml rename to APG-API-Lib/build.xml diff --git a/org_apg_integration_demo/proguard-project.txt b/APG-API-Lib/proguard-project.txt similarity index 100% rename from org_apg_integration_demo/proguard-project.txt rename to APG-API-Lib/proguard-project.txt diff --git a/org_apg_integration_lib/project.properties b/APG-API-Lib/project.properties similarity index 100% rename from org_apg_integration_lib/project.properties rename to APG-API-Lib/project.properties diff --git a/org_apg_integration_lib/res/.readme b/APG-API-Lib/res/.readme similarity index 100% rename from org_apg_integration_lib/res/.readme rename to APG-API-Lib/res/.readme diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgData.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgData.java similarity index 100% rename from org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgData.java rename to APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgData.java diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java similarity index 100% rename from org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java rename to APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java similarity index 100% rename from org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java rename to APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Constants.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/Constants.java similarity index 100% rename from org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Constants.java rename to APG-API-Lib/src/org/thialfihar/android/apg/integration/Constants.java diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ContentProviderHelper.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ContentProviderHelper.java similarity index 100% rename from org_apg_integration_lib/src/org/thialfihar/android/apg/integration/ContentProviderHelper.java rename to APG-API-Lib/src/org/thialfihar/android/apg/integration/ContentProviderHelper.java diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Util.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/Util.java similarity index 100% rename from org_apg_integration_lib/src/org/thialfihar/android/apg/integration/Util.java rename to APG-API-Lib/src/org/thialfihar/android/apg/integration/Util.java diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl b/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl similarity index 100% rename from org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl rename to APG-API-Lib/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl b/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl similarity index 100% rename from org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl rename to APG-API-Lib/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgService.aidl b/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgService.aidl similarity index 100% rename from org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgService.aidl rename to APG-API-Lib/src/org/thialfihar/android/apg/service/IApgService.aidl diff --git a/org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl b/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl similarity index 100% rename from org_apg_integration_lib/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl rename to APG-API-Lib/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl diff --git a/org_apg_integration_lib/.gitignore b/APG/.gitignore similarity index 100% rename from org_apg_integration_lib/.gitignore rename to APG/.gitignore diff --git a/org_apg/AndroidManifest.xml b/APG/AndroidManifest.xml similarity index 100% rename from org_apg/AndroidManifest.xml rename to APG/AndroidManifest.xml diff --git a/org_apg/build.xml b/APG/build.xml similarity index 100% rename from org_apg/build.xml rename to APG/build.xml diff --git a/org_apg/libs/barcodescanner-android-integration-supportv4.jar b/APG/libs/barcodescanner-android-integration-supportv4.jar similarity index 100% rename from org_apg/libs/barcodescanner-android-integration-supportv4.jar rename to APG/libs/barcodescanner-android-integration-supportv4.jar diff --git a/org_apg/libs/htmlcleaner-2.2.jar b/APG/libs/htmlcleaner-2.2.jar similarity index 100% rename from org_apg/libs/htmlcleaner-2.2.jar rename to APG/libs/htmlcleaner-2.2.jar diff --git a/org_apg/libs/htmlspanner-0.2-fork.jar b/APG/libs/htmlspanner-0.2-fork.jar similarity index 100% rename from org_apg/libs/htmlspanner-0.2-fork.jar rename to APG/libs/htmlspanner-0.2-fork.jar diff --git a/org_apg/libs/sc-bzip2-1.47.0.2.jar b/APG/libs/sc-bzip2-1.47.0.2.jar similarity index 100% rename from org_apg/libs/sc-bzip2-1.47.0.2.jar rename to APG/libs/sc-bzip2-1.47.0.2.jar diff --git a/org_apg/libs/sc-light-jdk15on-1.47.0.2.jar b/APG/libs/sc-light-jdk15on-1.47.0.2.jar similarity index 100% rename from org_apg/libs/sc-light-jdk15on-1.47.0.2.jar rename to APG/libs/sc-light-jdk15on-1.47.0.2.jar diff --git a/org_apg/libs/scpg-jdk15on-1.47.0.2.jar b/APG/libs/scpg-jdk15on-1.47.0.2.jar similarity index 100% rename from org_apg/libs/scpg-jdk15on-1.47.0.2.jar rename to APG/libs/scpg-jdk15on-1.47.0.2.jar diff --git a/org_apg/libs/scprov-jdk15on-1.47.0.2.jar b/APG/libs/scprov-jdk15on-1.47.0.2.jar similarity index 100% rename from org_apg/libs/scprov-jdk15on-1.47.0.2.jar rename to APG/libs/scprov-jdk15on-1.47.0.2.jar diff --git a/org_apg/pom.xml b/APG/pom.xml similarity index 100% rename from org_apg/pom.xml rename to APG/pom.xml diff --git a/org_apg_integration_lib/proguard-project.txt b/APG/proguard-project.txt similarity index 100% rename from org_apg_integration_lib/proguard-project.txt rename to APG/proguard-project.txt diff --git a/org_apg/project.properties b/APG/project.properties similarity index 100% rename from org_apg/project.properties rename to APG/project.properties diff --git a/org_apg/res/anim/push_left_in.xml b/APG/res/anim/push_left_in.xml similarity index 100% rename from org_apg/res/anim/push_left_in.xml rename to APG/res/anim/push_left_in.xml diff --git a/org_apg/res/anim/push_left_out.xml b/APG/res/anim/push_left_out.xml similarity index 100% rename from org_apg/res/anim/push_left_out.xml rename to APG/res/anim/push_left_out.xml diff --git a/org_apg/res/anim/push_right_in.xml b/APG/res/anim/push_right_in.xml similarity index 100% rename from org_apg/res/anim/push_right_in.xml rename to APG/res/anim/push_right_in.xml diff --git a/org_apg/res/anim/push_right_out.xml b/APG/res/anim/push_right_out.xml similarity index 100% rename from org_apg/res/anim/push_right_out.xml rename to APG/res/anim/push_right_out.xml diff --git a/org_apg/res/drawable-finger/btn_circle.xml b/APG/res/drawable-finger/btn_circle.xml similarity index 100% rename from org_apg/res/drawable-finger/btn_circle.xml rename to APG/res/drawable-finger/btn_circle.xml diff --git a/org_apg/res/drawable-hdpi-finger/btn_circle_disable.png b/APG/res/drawable-hdpi-finger/btn_circle_disable.png similarity index 100% rename from org_apg/res/drawable-hdpi-finger/btn_circle_disable.png rename to APG/res/drawable-hdpi-finger/btn_circle_disable.png diff --git a/org_apg/res/drawable-hdpi-finger/btn_circle_disable_focused.png b/APG/res/drawable-hdpi-finger/btn_circle_disable_focused.png similarity index 100% rename from org_apg/res/drawable-hdpi-finger/btn_circle_disable_focused.png rename to APG/res/drawable-hdpi-finger/btn_circle_disable_focused.png diff --git a/org_apg/res/drawable-hdpi-finger/btn_circle_normal.png b/APG/res/drawable-hdpi-finger/btn_circle_normal.png similarity index 100% rename from org_apg/res/drawable-hdpi-finger/btn_circle_normal.png rename to APG/res/drawable-hdpi-finger/btn_circle_normal.png diff --git a/org_apg/res/drawable-hdpi-finger/btn_circle_pressed.png b/APG/res/drawable-hdpi-finger/btn_circle_pressed.png similarity index 100% rename from org_apg/res/drawable-hdpi-finger/btn_circle_pressed.png rename to APG/res/drawable-hdpi-finger/btn_circle_pressed.png diff --git a/org_apg/res/drawable-hdpi-finger/btn_circle_selected.png b/APG/res/drawable-hdpi-finger/btn_circle_selected.png similarity index 100% rename from org_apg/res/drawable-hdpi-finger/btn_circle_selected.png rename to APG/res/drawable-hdpi-finger/btn_circle_selected.png diff --git a/org_apg/res/drawable-hdpi-finger/ic_btn_round_minus.png b/APG/res/drawable-hdpi-finger/ic_btn_round_minus.png similarity index 100% rename from org_apg/res/drawable-hdpi-finger/ic_btn_round_minus.png rename to APG/res/drawable-hdpi-finger/ic_btn_round_minus.png diff --git a/org_apg/res/drawable-hdpi-finger/ic_btn_round_plus.png b/APG/res/drawable-hdpi-finger/ic_btn_round_plus.png similarity index 100% rename from org_apg/res/drawable-hdpi-finger/ic_btn_round_plus.png rename to APG/res/drawable-hdpi-finger/ic_btn_round_plus.png diff --git a/org_apg/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png b/APG/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from org_apg/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png rename to APG/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/org_apg/res/drawable-hdpi/dashboard_decrypt_default.png b/APG/res/drawable-hdpi/dashboard_decrypt_default.png similarity index 100% rename from org_apg/res/drawable-hdpi/dashboard_decrypt_default.png rename to APG/res/drawable-hdpi/dashboard_decrypt_default.png diff --git a/org_apg/res/drawable-hdpi/dashboard_decrypt_pressed.png b/APG/res/drawable-hdpi/dashboard_decrypt_pressed.png similarity index 100% rename from org_apg/res/drawable-hdpi/dashboard_decrypt_pressed.png rename to APG/res/drawable-hdpi/dashboard_decrypt_pressed.png diff --git a/org_apg/res/drawable-hdpi/dashboard_encrypt_default.png b/APG/res/drawable-hdpi/dashboard_encrypt_default.png similarity index 100% rename from org_apg/res/drawable-hdpi/dashboard_encrypt_default.png rename to APG/res/drawable-hdpi/dashboard_encrypt_default.png diff --git a/org_apg/res/drawable-hdpi/dashboard_encrypt_pressed.png b/APG/res/drawable-hdpi/dashboard_encrypt_pressed.png similarity index 100% rename from org_apg/res/drawable-hdpi/dashboard_encrypt_pressed.png rename to APG/res/drawable-hdpi/dashboard_encrypt_pressed.png diff --git a/org_apg/res/drawable-hdpi/dashboard_help_default.png b/APG/res/drawable-hdpi/dashboard_help_default.png similarity index 100% rename from org_apg/res/drawable-hdpi/dashboard_help_default.png rename to APG/res/drawable-hdpi/dashboard_help_default.png diff --git a/org_apg/res/drawable-hdpi/dashboard_help_pressed.png b/APG/res/drawable-hdpi/dashboard_help_pressed.png similarity index 100% rename from org_apg/res/drawable-hdpi/dashboard_help_pressed.png rename to APG/res/drawable-hdpi/dashboard_help_pressed.png diff --git a/org_apg/res/drawable-hdpi/dashboard_manage_keys_default.png b/APG/res/drawable-hdpi/dashboard_manage_keys_default.png similarity index 100% rename from org_apg/res/drawable-hdpi/dashboard_manage_keys_default.png rename to APG/res/drawable-hdpi/dashboard_manage_keys_default.png diff --git a/org_apg/res/drawable-hdpi/dashboard_manage_keys_pressed.png b/APG/res/drawable-hdpi/dashboard_manage_keys_pressed.png similarity index 100% rename from org_apg/res/drawable-hdpi/dashboard_manage_keys_pressed.png rename to APG/res/drawable-hdpi/dashboard_manage_keys_pressed.png diff --git a/org_apg/res/drawable-hdpi/dashboard_my_keys_default.png b/APG/res/drawable-hdpi/dashboard_my_keys_default.png similarity index 100% rename from org_apg/res/drawable-hdpi/dashboard_my_keys_default.png rename to APG/res/drawable-hdpi/dashboard_my_keys_default.png diff --git a/org_apg/res/drawable-hdpi/dashboard_my_keys_pressed.png b/APG/res/drawable-hdpi/dashboard_my_keys_pressed.png similarity index 100% rename from org_apg/res/drawable-hdpi/dashboard_my_keys_pressed.png rename to APG/res/drawable-hdpi/dashboard_my_keys_pressed.png diff --git a/org_apg/res/drawable-hdpi/dashboard_scan_qrcode_default.png b/APG/res/drawable-hdpi/dashboard_scan_qrcode_default.png similarity index 100% rename from org_apg/res/drawable-hdpi/dashboard_scan_qrcode_default.png rename to APG/res/drawable-hdpi/dashboard_scan_qrcode_default.png diff --git a/org_apg/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png b/APG/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png similarity index 100% rename from org_apg/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png rename to APG/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png diff --git a/org_apg/res/drawable-hdpi/encrypted.png b/APG/res/drawable-hdpi/encrypted.png similarity index 100% rename from org_apg/res/drawable-hdpi/encrypted.png rename to APG/res/drawable-hdpi/encrypted.png diff --git a/org_apg/res/drawable-hdpi/encrypted_large.png b/APG/res/drawable-hdpi/encrypted_large.png similarity index 100% rename from org_apg/res/drawable-hdpi/encrypted_large.png rename to APG/res/drawable-hdpi/encrypted_large.png diff --git a/org_apg/res/drawable-hdpi/encrypted_small.png b/APG/res/drawable-hdpi/encrypted_small.png similarity index 100% rename from org_apg/res/drawable-hdpi/encrypted_small.png rename to APG/res/drawable-hdpi/encrypted_small.png diff --git a/org_apg/res/drawable-hdpi/ic_menu_about.png b/APG/res/drawable-hdpi/ic_menu_about.png similarity index 100% rename from org_apg/res/drawable-hdpi/ic_menu_about.png rename to APG/res/drawable-hdpi/ic_menu_about.png diff --git a/org_apg/res/drawable-hdpi/ic_menu_decrypt.png b/APG/res/drawable-hdpi/ic_menu_decrypt.png similarity index 100% rename from org_apg/res/drawable-hdpi/ic_menu_decrypt.png rename to APG/res/drawable-hdpi/ic_menu_decrypt.png diff --git a/org_apg/res/drawable-hdpi/ic_menu_encrypt.png b/APG/res/drawable-hdpi/ic_menu_encrypt.png similarity index 100% rename from org_apg/res/drawable-hdpi/ic_menu_encrypt.png rename to APG/res/drawable-hdpi/ic_menu_encrypt.png diff --git a/org_apg/res/drawable-hdpi/ic_menu_filebrowser.png b/APG/res/drawable-hdpi/ic_menu_filebrowser.png similarity index 100% rename from org_apg/res/drawable-hdpi/ic_menu_filebrowser.png rename to APG/res/drawable-hdpi/ic_menu_filebrowser.png diff --git a/org_apg/res/drawable-hdpi/ic_menu_scan_qrcode.png b/APG/res/drawable-hdpi/ic_menu_scan_qrcode.png similarity index 100% rename from org_apg/res/drawable-hdpi/ic_menu_scan_qrcode.png rename to APG/res/drawable-hdpi/ic_menu_scan_qrcode.png diff --git a/org_apg/res/drawable-hdpi/ic_menu_search.png b/APG/res/drawable-hdpi/ic_menu_search.png similarity index 100% rename from org_apg/res/drawable-hdpi/ic_menu_search.png rename to APG/res/drawable-hdpi/ic_menu_search.png diff --git a/org_apg/res/drawable-hdpi/ic_menu_search_list.png b/APG/res/drawable-hdpi/ic_menu_search_list.png similarity index 100% rename from org_apg/res/drawable-hdpi/ic_menu_search_list.png rename to APG/res/drawable-hdpi/ic_menu_search_list.png diff --git a/org_apg/res/drawable-hdpi/ic_menu_settings.png b/APG/res/drawable-hdpi/ic_menu_settings.png similarity index 100% rename from org_apg/res/drawable-hdpi/ic_menu_settings.png rename to APG/res/drawable-hdpi/ic_menu_settings.png diff --git a/org_apg/res/drawable-hdpi/ic_next.png b/APG/res/drawable-hdpi/ic_next.png similarity index 100% rename from org_apg/res/drawable-hdpi/ic_next.png rename to APG/res/drawable-hdpi/ic_next.png diff --git a/org_apg/res/drawable-hdpi/ic_previous.png b/APG/res/drawable-hdpi/ic_previous.png similarity index 100% rename from org_apg/res/drawable-hdpi/ic_previous.png rename to APG/res/drawable-hdpi/ic_previous.png diff --git a/org_apg_integration_demo/res/drawable-hdpi/icon.png b/APG/res/drawable-hdpi/icon.png similarity index 100% rename from org_apg_integration_demo/res/drawable-hdpi/icon.png rename to APG/res/drawable-hdpi/icon.png diff --git a/org_apg/res/drawable-hdpi/key.png b/APG/res/drawable-hdpi/key.png similarity index 100% rename from org_apg/res/drawable-hdpi/key.png rename to APG/res/drawable-hdpi/key.png diff --git a/org_apg/res/drawable-hdpi/key_large.png b/APG/res/drawable-hdpi/key_large.png similarity index 100% rename from org_apg/res/drawable-hdpi/key_large.png rename to APG/res/drawable-hdpi/key_large.png diff --git a/org_apg/res/drawable-hdpi/key_small.png b/APG/res/drawable-hdpi/key_small.png similarity index 100% rename from org_apg/res/drawable-hdpi/key_small.png rename to APG/res/drawable-hdpi/key_small.png diff --git a/org_apg/res/drawable-hdpi/overlay_error.png b/APG/res/drawable-hdpi/overlay_error.png similarity index 100% rename from org_apg/res/drawable-hdpi/overlay_error.png rename to APG/res/drawable-hdpi/overlay_error.png diff --git a/org_apg/res/drawable-hdpi/overlay_ok.png b/APG/res/drawable-hdpi/overlay_ok.png similarity index 100% rename from org_apg/res/drawable-hdpi/overlay_ok.png rename to APG/res/drawable-hdpi/overlay_ok.png diff --git a/org_apg/res/drawable-hdpi/signed.png b/APG/res/drawable-hdpi/signed.png similarity index 100% rename from org_apg/res/drawable-hdpi/signed.png rename to APG/res/drawable-hdpi/signed.png diff --git a/org_apg/res/drawable-hdpi/signed_large.png b/APG/res/drawable-hdpi/signed_large.png similarity index 100% rename from org_apg/res/drawable-hdpi/signed_large.png rename to APG/res/drawable-hdpi/signed_large.png diff --git a/org_apg/res/drawable-hdpi/signed_small.png b/APG/res/drawable-hdpi/signed_small.png similarity index 100% rename from org_apg/res/drawable-hdpi/signed_small.png rename to APG/res/drawable-hdpi/signed_small.png diff --git a/org_apg/res/drawable-ldpi/encrypted.png b/APG/res/drawable-ldpi/encrypted.png similarity index 100% rename from org_apg/res/drawable-ldpi/encrypted.png rename to APG/res/drawable-ldpi/encrypted.png diff --git a/org_apg/res/drawable-ldpi/encrypted_large.png b/APG/res/drawable-ldpi/encrypted_large.png similarity index 100% rename from org_apg/res/drawable-ldpi/encrypted_large.png rename to APG/res/drawable-ldpi/encrypted_large.png diff --git a/org_apg/res/drawable-ldpi/encrypted_small.png b/APG/res/drawable-ldpi/encrypted_small.png similarity index 100% rename from org_apg/res/drawable-ldpi/encrypted_small.png rename to APG/res/drawable-ldpi/encrypted_small.png diff --git a/org_apg/res/drawable-ldpi/ic_next.png b/APG/res/drawable-ldpi/ic_next.png similarity index 100% rename from org_apg/res/drawable-ldpi/ic_next.png rename to APG/res/drawable-ldpi/ic_next.png diff --git a/org_apg/res/drawable-ldpi/ic_previous.png b/APG/res/drawable-ldpi/ic_previous.png similarity index 100% rename from org_apg/res/drawable-ldpi/ic_previous.png rename to APG/res/drawable-ldpi/ic_previous.png diff --git a/org_apg_integration_demo/res/drawable-ldpi/icon.png b/APG/res/drawable-ldpi/icon.png similarity index 100% rename from org_apg_integration_demo/res/drawable-ldpi/icon.png rename to APG/res/drawable-ldpi/icon.png diff --git a/org_apg/res/drawable-ldpi/key.png b/APG/res/drawable-ldpi/key.png similarity index 100% rename from org_apg/res/drawable-ldpi/key.png rename to APG/res/drawable-ldpi/key.png diff --git a/org_apg/res/drawable-ldpi/key_large.png b/APG/res/drawable-ldpi/key_large.png similarity index 100% rename from org_apg/res/drawable-ldpi/key_large.png rename to APG/res/drawable-ldpi/key_large.png diff --git a/org_apg/res/drawable-ldpi/key_small.png b/APG/res/drawable-ldpi/key_small.png similarity index 100% rename from org_apg/res/drawable-ldpi/key_small.png rename to APG/res/drawable-ldpi/key_small.png diff --git a/org_apg/res/drawable-ldpi/overlay_error.png b/APG/res/drawable-ldpi/overlay_error.png similarity index 100% rename from org_apg/res/drawable-ldpi/overlay_error.png rename to APG/res/drawable-ldpi/overlay_error.png diff --git a/org_apg/res/drawable-ldpi/overlay_ok.png b/APG/res/drawable-ldpi/overlay_ok.png similarity index 100% rename from org_apg/res/drawable-ldpi/overlay_ok.png rename to APG/res/drawable-ldpi/overlay_ok.png diff --git a/org_apg/res/drawable-ldpi/signed.png b/APG/res/drawable-ldpi/signed.png similarity index 100% rename from org_apg/res/drawable-ldpi/signed.png rename to APG/res/drawable-ldpi/signed.png diff --git a/org_apg/res/drawable-ldpi/signed_large.png b/APG/res/drawable-ldpi/signed_large.png similarity index 100% rename from org_apg/res/drawable-ldpi/signed_large.png rename to APG/res/drawable-ldpi/signed_large.png diff --git a/org_apg/res/drawable-ldpi/signed_small.png b/APG/res/drawable-ldpi/signed_small.png similarity index 100% rename from org_apg/res/drawable-ldpi/signed_small.png rename to APG/res/drawable-ldpi/signed_small.png diff --git a/org_apg/res/drawable-mdpi-finger/btn_circle_disable.png b/APG/res/drawable-mdpi-finger/btn_circle_disable.png similarity index 100% rename from org_apg/res/drawable-mdpi-finger/btn_circle_disable.png rename to APG/res/drawable-mdpi-finger/btn_circle_disable.png diff --git a/org_apg/res/drawable-mdpi-finger/btn_circle_disable_focused.png b/APG/res/drawable-mdpi-finger/btn_circle_disable_focused.png similarity index 100% rename from org_apg/res/drawable-mdpi-finger/btn_circle_disable_focused.png rename to APG/res/drawable-mdpi-finger/btn_circle_disable_focused.png diff --git a/org_apg/res/drawable-mdpi-finger/btn_circle_normal.png b/APG/res/drawable-mdpi-finger/btn_circle_normal.png similarity index 100% rename from org_apg/res/drawable-mdpi-finger/btn_circle_normal.png rename to APG/res/drawable-mdpi-finger/btn_circle_normal.png diff --git a/org_apg/res/drawable-mdpi-finger/btn_circle_pressed.png b/APG/res/drawable-mdpi-finger/btn_circle_pressed.png similarity index 100% rename from org_apg/res/drawable-mdpi-finger/btn_circle_pressed.png rename to APG/res/drawable-mdpi-finger/btn_circle_pressed.png diff --git a/org_apg/res/drawable-mdpi-finger/btn_circle_selected.png b/APG/res/drawable-mdpi-finger/btn_circle_selected.png similarity index 100% rename from org_apg/res/drawable-mdpi-finger/btn_circle_selected.png rename to APG/res/drawable-mdpi-finger/btn_circle_selected.png diff --git a/org_apg/res/drawable-mdpi-finger/ic_btn_round_minus.png b/APG/res/drawable-mdpi-finger/ic_btn_round_minus.png similarity index 100% rename from org_apg/res/drawable-mdpi-finger/ic_btn_round_minus.png rename to APG/res/drawable-mdpi-finger/ic_btn_round_minus.png diff --git a/org_apg/res/drawable-mdpi-finger/ic_btn_round_plus.png b/APG/res/drawable-mdpi-finger/ic_btn_round_plus.png similarity index 100% rename from org_apg/res/drawable-mdpi-finger/ic_btn_round_plus.png rename to APG/res/drawable-mdpi-finger/ic_btn_round_plus.png diff --git a/org_apg/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png b/APG/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from org_apg/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png rename to APG/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/org_apg/res/drawable-mdpi/encrypted.png b/APG/res/drawable-mdpi/encrypted.png similarity index 100% rename from org_apg/res/drawable-mdpi/encrypted.png rename to APG/res/drawable-mdpi/encrypted.png diff --git a/org_apg/res/drawable-mdpi/encrypted_large.png b/APG/res/drawable-mdpi/encrypted_large.png similarity index 100% rename from org_apg/res/drawable-mdpi/encrypted_large.png rename to APG/res/drawable-mdpi/encrypted_large.png diff --git a/org_apg/res/drawable-mdpi/encrypted_small.png b/APG/res/drawable-mdpi/encrypted_small.png similarity index 100% rename from org_apg/res/drawable-mdpi/encrypted_small.png rename to APG/res/drawable-mdpi/encrypted_small.png diff --git a/org_apg/res/drawable-mdpi/ic_menu_about.png b/APG/res/drawable-mdpi/ic_menu_about.png similarity index 100% rename from org_apg/res/drawable-mdpi/ic_menu_about.png rename to APG/res/drawable-mdpi/ic_menu_about.png diff --git a/org_apg/res/drawable-mdpi/ic_menu_decrypt.png b/APG/res/drawable-mdpi/ic_menu_decrypt.png similarity index 100% rename from org_apg/res/drawable-mdpi/ic_menu_decrypt.png rename to APG/res/drawable-mdpi/ic_menu_decrypt.png diff --git a/org_apg/res/drawable-mdpi/ic_menu_encrypt.png b/APG/res/drawable-mdpi/ic_menu_encrypt.png similarity index 100% rename from org_apg/res/drawable-mdpi/ic_menu_encrypt.png rename to APG/res/drawable-mdpi/ic_menu_encrypt.png diff --git a/org_apg/res/drawable-mdpi/ic_menu_filebrowser.png b/APG/res/drawable-mdpi/ic_menu_filebrowser.png similarity index 100% rename from org_apg/res/drawable-mdpi/ic_menu_filebrowser.png rename to APG/res/drawable-mdpi/ic_menu_filebrowser.png diff --git a/org_apg/res/drawable-mdpi/ic_menu_scan_qrcode.png b/APG/res/drawable-mdpi/ic_menu_scan_qrcode.png similarity index 100% rename from org_apg/res/drawable-mdpi/ic_menu_scan_qrcode.png rename to APG/res/drawable-mdpi/ic_menu_scan_qrcode.png diff --git a/org_apg/res/drawable-mdpi/ic_menu_search.png b/APG/res/drawable-mdpi/ic_menu_search.png similarity index 100% rename from org_apg/res/drawable-mdpi/ic_menu_search.png rename to APG/res/drawable-mdpi/ic_menu_search.png diff --git a/org_apg/res/drawable-mdpi/ic_menu_search_list.png b/APG/res/drawable-mdpi/ic_menu_search_list.png similarity index 100% rename from org_apg/res/drawable-mdpi/ic_menu_search_list.png rename to APG/res/drawable-mdpi/ic_menu_search_list.png diff --git a/org_apg/res/drawable-mdpi/ic_menu_settings.png b/APG/res/drawable-mdpi/ic_menu_settings.png similarity index 100% rename from org_apg/res/drawable-mdpi/ic_menu_settings.png rename to APG/res/drawable-mdpi/ic_menu_settings.png diff --git a/org_apg/res/drawable-mdpi/ic_next.png b/APG/res/drawable-mdpi/ic_next.png similarity index 100% rename from org_apg/res/drawable-mdpi/ic_next.png rename to APG/res/drawable-mdpi/ic_next.png diff --git a/org_apg/res/drawable-mdpi/ic_previous.png b/APG/res/drawable-mdpi/ic_previous.png similarity index 100% rename from org_apg/res/drawable-mdpi/ic_previous.png rename to APG/res/drawable-mdpi/ic_previous.png diff --git a/org_apg_integration_demo/res/drawable-mdpi/icon.png b/APG/res/drawable-mdpi/icon.png similarity index 100% rename from org_apg_integration_demo/res/drawable-mdpi/icon.png rename to APG/res/drawable-mdpi/icon.png diff --git a/org_apg/res/drawable-mdpi/key.png b/APG/res/drawable-mdpi/key.png similarity index 100% rename from org_apg/res/drawable-mdpi/key.png rename to APG/res/drawable-mdpi/key.png diff --git a/org_apg/res/drawable-mdpi/key_large.png b/APG/res/drawable-mdpi/key_large.png similarity index 100% rename from org_apg/res/drawable-mdpi/key_large.png rename to APG/res/drawable-mdpi/key_large.png diff --git a/org_apg/res/drawable-mdpi/key_small.png b/APG/res/drawable-mdpi/key_small.png similarity index 100% rename from org_apg/res/drawable-mdpi/key_small.png rename to APG/res/drawable-mdpi/key_small.png diff --git a/org_apg/res/drawable-mdpi/overlay_error.png b/APG/res/drawable-mdpi/overlay_error.png similarity index 100% rename from org_apg/res/drawable-mdpi/overlay_error.png rename to APG/res/drawable-mdpi/overlay_error.png diff --git a/org_apg/res/drawable-mdpi/overlay_ok.png b/APG/res/drawable-mdpi/overlay_ok.png similarity index 100% rename from org_apg/res/drawable-mdpi/overlay_ok.png rename to APG/res/drawable-mdpi/overlay_ok.png diff --git a/org_apg/res/drawable-mdpi/signed.png b/APG/res/drawable-mdpi/signed.png similarity index 100% rename from org_apg/res/drawable-mdpi/signed.png rename to APG/res/drawable-mdpi/signed.png diff --git a/org_apg/res/drawable-mdpi/signed_large.png b/APG/res/drawable-mdpi/signed_large.png similarity index 100% rename from org_apg/res/drawable-mdpi/signed_large.png rename to APG/res/drawable-mdpi/signed_large.png diff --git a/org_apg/res/drawable-mdpi/signed_small.png b/APG/res/drawable-mdpi/signed_small.png similarity index 100% rename from org_apg/res/drawable-mdpi/signed_small.png rename to APG/res/drawable-mdpi/signed_small.png diff --git a/org_apg/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png b/APG/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from org_apg/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png rename to APG/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/org_apg/res/drawable-xhdpi/ic_menu_about.png b/APG/res/drawable-xhdpi/ic_menu_about.png similarity index 100% rename from org_apg/res/drawable-xhdpi/ic_menu_about.png rename to APG/res/drawable-xhdpi/ic_menu_about.png diff --git a/org_apg/res/drawable-xhdpi/ic_menu_decrypt.png b/APG/res/drawable-xhdpi/ic_menu_decrypt.png similarity index 100% rename from org_apg/res/drawable-xhdpi/ic_menu_decrypt.png rename to APG/res/drawable-xhdpi/ic_menu_decrypt.png diff --git a/org_apg/res/drawable-xhdpi/ic_menu_encrypt.png b/APG/res/drawable-xhdpi/ic_menu_encrypt.png similarity index 100% rename from org_apg/res/drawable-xhdpi/ic_menu_encrypt.png rename to APG/res/drawable-xhdpi/ic_menu_encrypt.png diff --git a/org_apg/res/drawable-xhdpi/ic_menu_filebrowser.png b/APG/res/drawable-xhdpi/ic_menu_filebrowser.png similarity index 100% rename from org_apg/res/drawable-xhdpi/ic_menu_filebrowser.png rename to APG/res/drawable-xhdpi/ic_menu_filebrowser.png diff --git a/org_apg/res/drawable-xhdpi/ic_menu_scan_qrcode.png b/APG/res/drawable-xhdpi/ic_menu_scan_qrcode.png similarity index 100% rename from org_apg/res/drawable-xhdpi/ic_menu_scan_qrcode.png rename to APG/res/drawable-xhdpi/ic_menu_scan_qrcode.png diff --git a/org_apg/res/drawable-xhdpi/ic_menu_search.png b/APG/res/drawable-xhdpi/ic_menu_search.png similarity index 100% rename from org_apg/res/drawable-xhdpi/ic_menu_search.png rename to APG/res/drawable-xhdpi/ic_menu_search.png diff --git a/org_apg/res/drawable-xhdpi/ic_menu_search_list.png b/APG/res/drawable-xhdpi/ic_menu_search_list.png similarity index 100% rename from org_apg/res/drawable-xhdpi/ic_menu_search_list.png rename to APG/res/drawable-xhdpi/ic_menu_search_list.png diff --git a/org_apg/res/drawable-xhdpi/ic_menu_settings.png b/APG/res/drawable-xhdpi/ic_menu_settings.png similarity index 100% rename from org_apg/res/drawable-xhdpi/ic_menu_settings.png rename to APG/res/drawable-xhdpi/ic_menu_settings.png diff --git a/org_apg_integration_demo/res/drawable-xhdpi/icon.png b/APG/res/drawable-xhdpi/icon.png similarity index 100% rename from org_apg_integration_demo/res/drawable-xhdpi/icon.png rename to APG/res/drawable-xhdpi/icon.png diff --git a/org_apg/res/drawable/btn_circle_disable.png b/APG/res/drawable/btn_circle_disable.png similarity index 100% rename from org_apg/res/drawable/btn_circle_disable.png rename to APG/res/drawable/btn_circle_disable.png diff --git a/org_apg/res/drawable/btn_circle_disable_focused.png b/APG/res/drawable/btn_circle_disable_focused.png similarity index 100% rename from org_apg/res/drawable/btn_circle_disable_focused.png rename to APG/res/drawable/btn_circle_disable_focused.png diff --git a/org_apg/res/drawable/btn_circle_normal.png b/APG/res/drawable/btn_circle_normal.png similarity index 100% rename from org_apg/res/drawable/btn_circle_normal.png rename to APG/res/drawable/btn_circle_normal.png diff --git a/org_apg/res/drawable/btn_circle_pressed.png b/APG/res/drawable/btn_circle_pressed.png similarity index 100% rename from org_apg/res/drawable/btn_circle_pressed.png rename to APG/res/drawable/btn_circle_pressed.png diff --git a/org_apg/res/drawable/btn_circle_selected.png b/APG/res/drawable/btn_circle_selected.png similarity index 100% rename from org_apg/res/drawable/btn_circle_selected.png rename to APG/res/drawable/btn_circle_selected.png diff --git a/org_apg/res/drawable/dashboard_decrypt.xml b/APG/res/drawable/dashboard_decrypt.xml similarity index 100% rename from org_apg/res/drawable/dashboard_decrypt.xml rename to APG/res/drawable/dashboard_decrypt.xml diff --git a/org_apg/res/drawable/dashboard_encrypt.xml b/APG/res/drawable/dashboard_encrypt.xml similarity index 100% rename from org_apg/res/drawable/dashboard_encrypt.xml rename to APG/res/drawable/dashboard_encrypt.xml diff --git a/org_apg/res/drawable/dashboard_help.xml b/APG/res/drawable/dashboard_help.xml similarity index 100% rename from org_apg/res/drawable/dashboard_help.xml rename to APG/res/drawable/dashboard_help.xml diff --git a/org_apg/res/drawable/dashboard_manage_keys.xml b/APG/res/drawable/dashboard_manage_keys.xml similarity index 100% rename from org_apg/res/drawable/dashboard_manage_keys.xml rename to APG/res/drawable/dashboard_manage_keys.xml diff --git a/org_apg/res/drawable/dashboard_my_keys.xml b/APG/res/drawable/dashboard_my_keys.xml similarity index 100% rename from org_apg/res/drawable/dashboard_my_keys.xml rename to APG/res/drawable/dashboard_my_keys.xml diff --git a/org_apg/res/drawable/dashboard_scan_qrcode.xml b/APG/res/drawable/dashboard_scan_qrcode.xml similarity index 100% rename from org_apg/res/drawable/dashboard_scan_qrcode.xml rename to APG/res/drawable/dashboard_scan_qrcode.xml diff --git a/org_apg/res/drawable/encrypted.png b/APG/res/drawable/encrypted.png similarity index 100% rename from org_apg/res/drawable/encrypted.png rename to APG/res/drawable/encrypted.png diff --git a/org_apg/res/drawable/encrypted_large.png b/APG/res/drawable/encrypted_large.png similarity index 100% rename from org_apg/res/drawable/encrypted_large.png rename to APG/res/drawable/encrypted_large.png diff --git a/org_apg/res/drawable/encrypted_small.png b/APG/res/drawable/encrypted_small.png similarity index 100% rename from org_apg/res/drawable/encrypted_small.png rename to APG/res/drawable/encrypted_small.png diff --git a/org_apg/res/drawable/ic_btn_round_minus.png b/APG/res/drawable/ic_btn_round_minus.png similarity index 100% rename from org_apg/res/drawable/ic_btn_round_minus.png rename to APG/res/drawable/ic_btn_round_minus.png diff --git a/org_apg/res/drawable/ic_btn_round_plus.png b/APG/res/drawable/ic_btn_round_plus.png similarity index 100% rename from org_apg/res/drawable/ic_btn_round_plus.png rename to APG/res/drawable/ic_btn_round_plus.png diff --git a/org_apg/res/drawable/ic_launcher_folder.png b/APG/res/drawable/ic_launcher_folder.png similarity index 100% rename from org_apg/res/drawable/ic_launcher_folder.png rename to APG/res/drawable/ic_launcher_folder.png diff --git a/org_apg/res/drawable/ic_launcher_folder_small.png b/APG/res/drawable/ic_launcher_folder_small.png similarity index 100% rename from org_apg/res/drawable/ic_launcher_folder_small.png rename to APG/res/drawable/ic_launcher_folder_small.png diff --git a/org_apg/res/drawable/ic_next.png b/APG/res/drawable/ic_next.png similarity index 100% rename from org_apg/res/drawable/ic_next.png rename to APG/res/drawable/ic_next.png diff --git a/org_apg/res/drawable/ic_previous.png b/APG/res/drawable/ic_previous.png similarity index 100% rename from org_apg/res/drawable/ic_previous.png rename to APG/res/drawable/ic_previous.png diff --git a/org_apg/res/drawable/key.png b/APG/res/drawable/key.png similarity index 100% rename from org_apg/res/drawable/key.png rename to APG/res/drawable/key.png diff --git a/org_apg/res/drawable/key_large.png b/APG/res/drawable/key_large.png similarity index 100% rename from org_apg/res/drawable/key_large.png rename to APG/res/drawable/key_large.png diff --git a/org_apg/res/drawable/key_small.png b/APG/res/drawable/key_small.png similarity index 100% rename from org_apg/res/drawable/key_small.png rename to APG/res/drawable/key_small.png diff --git a/org_apg/res/drawable/overlay_error.png b/APG/res/drawable/overlay_error.png similarity index 100% rename from org_apg/res/drawable/overlay_error.png rename to APG/res/drawable/overlay_error.png diff --git a/org_apg/res/drawable/overlay_ok.png b/APG/res/drawable/overlay_ok.png similarity index 100% rename from org_apg/res/drawable/overlay_ok.png rename to APG/res/drawable/overlay_ok.png diff --git a/org_apg/res/drawable/section_header.xml b/APG/res/drawable/section_header.xml similarity index 100% rename from org_apg/res/drawable/section_header.xml rename to APG/res/drawable/section_header.xml diff --git a/org_apg/res/drawable/signed.png b/APG/res/drawable/signed.png similarity index 100% rename from org_apg/res/drawable/signed.png rename to APG/res/drawable/signed.png diff --git a/org_apg/res/drawable/signed_large.png b/APG/res/drawable/signed_large.png similarity index 100% rename from org_apg/res/drawable/signed_large.png rename to APG/res/drawable/signed_large.png diff --git a/org_apg/res/drawable/signed_small.png b/APG/res/drawable/signed_small.png similarity index 100% rename from org_apg/res/drawable/signed_small.png rename to APG/res/drawable/signed_small.png diff --git a/org_apg/res/layout/account_item.xml b/APG/res/layout/account_item.xml similarity index 100% rename from org_apg/res/layout/account_item.xml rename to APG/res/layout/account_item.xml diff --git a/org_apg/res/layout/create_key.xml b/APG/res/layout/create_key.xml similarity index 100% rename from org_apg/res/layout/create_key.xml rename to APG/res/layout/create_key.xml diff --git a/org_apg/res/layout/decrypt.xml b/APG/res/layout/decrypt.xml similarity index 100% rename from org_apg/res/layout/decrypt.xml rename to APG/res/layout/decrypt.xml diff --git a/org_apg/res/layout/edit_key.xml b/APG/res/layout/edit_key.xml similarity index 100% rename from org_apg/res/layout/edit_key.xml rename to APG/res/layout/edit_key.xml diff --git a/org_apg/res/layout/edit_key_key_item.xml b/APG/res/layout/edit_key_key_item.xml similarity index 100% rename from org_apg/res/layout/edit_key_key_item.xml rename to APG/res/layout/edit_key_key_item.xml diff --git a/org_apg/res/layout/edit_key_section.xml b/APG/res/layout/edit_key_section.xml similarity index 100% rename from org_apg/res/layout/edit_key_section.xml rename to APG/res/layout/edit_key_section.xml diff --git a/org_apg/res/layout/edit_key_user_id_item.xml b/APG/res/layout/edit_key_user_id_item.xml similarity index 100% rename from org_apg/res/layout/edit_key_user_id_item.xml rename to APG/res/layout/edit_key_user_id_item.xml diff --git a/org_apg/res/layout/encrypt.xml b/APG/res/layout/encrypt.xml similarity index 100% rename from org_apg/res/layout/encrypt.xml rename to APG/res/layout/encrypt.xml diff --git a/org_apg/res/layout/file_dialog.xml b/APG/res/layout/file_dialog.xml similarity index 100% rename from org_apg/res/layout/file_dialog.xml rename to APG/res/layout/file_dialog.xml diff --git a/org_apg/res/layout/filter_info.xml b/APG/res/layout/filter_info.xml similarity index 100% rename from org_apg/res/layout/filter_info.xml rename to APG/res/layout/filter_info.xml diff --git a/org_apg/res/layout/general.xml b/APG/res/layout/general.xml similarity index 100% rename from org_apg/res/layout/general.xml rename to APG/res/layout/general.xml diff --git a/org_apg/res/layout/help_activity.xml b/APG/res/layout/help_activity.xml similarity index 100% rename from org_apg/res/layout/help_activity.xml rename to APG/res/layout/help_activity.xml diff --git a/org_apg/res/layout/help_fragment_about.xml b/APG/res/layout/help_fragment_about.xml similarity index 100% rename from org_apg/res/layout/help_fragment_about.xml rename to APG/res/layout/help_fragment_about.xml diff --git a/org_apg/res/layout/import_from_qr_code.xml b/APG/res/layout/import_from_qr_code.xml similarity index 100% rename from org_apg/res/layout/import_from_qr_code.xml rename to APG/res/layout/import_from_qr_code.xml diff --git a/org_apg/res/layout/key_list_child_item.xml b/APG/res/layout/key_list_child_item.xml similarity index 100% rename from org_apg/res/layout/key_list_child_item.xml rename to APG/res/layout/key_list_child_item.xml diff --git a/org_apg/res/layout/key_list_group_item.xml b/APG/res/layout/key_list_group_item.xml similarity index 100% rename from org_apg/res/layout/key_list_group_item.xml rename to APG/res/layout/key_list_group_item.xml diff --git a/org_apg/res/layout/key_list_public_activity.xml b/APG/res/layout/key_list_public_activity.xml similarity index 100% rename from org_apg/res/layout/key_list_public_activity.xml rename to APG/res/layout/key_list_public_activity.xml diff --git a/org_apg/res/layout/key_list_secret_activity.xml b/APG/res/layout/key_list_secret_activity.xml similarity index 100% rename from org_apg/res/layout/key_list_secret_activity.xml rename to APG/res/layout/key_list_secret_activity.xml diff --git a/org_apg/res/layout/key_server_editor.xml b/APG/res/layout/key_server_editor.xml similarity index 100% rename from org_apg/res/layout/key_server_editor.xml rename to APG/res/layout/key_server_editor.xml diff --git a/org_apg/res/layout/key_server_export_layout.xml b/APG/res/layout/key_server_export_layout.xml similarity index 100% rename from org_apg/res/layout/key_server_export_layout.xml rename to APG/res/layout/key_server_export_layout.xml diff --git a/org_apg/res/layout/key_server_preference.xml b/APG/res/layout/key_server_preference.xml similarity index 100% rename from org_apg/res/layout/key_server_preference.xml rename to APG/res/layout/key_server_preference.xml diff --git a/org_apg/res/layout/key_server_query_layout.xml b/APG/res/layout/key_server_query_layout.xml similarity index 100% rename from org_apg/res/layout/key_server_query_layout.xml rename to APG/res/layout/key_server_query_layout.xml diff --git a/org_apg/res/layout/key_server_query_result_item.xml b/APG/res/layout/key_server_query_result_item.xml similarity index 100% rename from org_apg/res/layout/key_server_query_result_item.xml rename to APG/res/layout/key_server_query_result_item.xml diff --git a/org_apg/res/layout/key_server_query_result_user_id.xml b/APG/res/layout/key_server_query_result_user_id.xml similarity index 100% rename from org_apg/res/layout/key_server_query_result_user_id.xml rename to APG/res/layout/key_server_query_result_user_id.xml diff --git a/org_apg/res/layout/main.xml b/APG/res/layout/main.xml similarity index 100% rename from org_apg/res/layout/main.xml rename to APG/res/layout/main.xml diff --git a/org_apg/res/layout/passphrase.xml b/APG/res/layout/passphrase.xml similarity index 100% rename from org_apg/res/layout/passphrase.xml rename to APG/res/layout/passphrase.xml diff --git a/org_apg/res/layout/passphrase_repeat.xml b/APG/res/layout/passphrase_repeat.xml similarity index 100% rename from org_apg/res/layout/passphrase_repeat.xml rename to APG/res/layout/passphrase_repeat.xml diff --git a/org_apg/res/layout/select_key_item.xml b/APG/res/layout/select_key_item.xml similarity index 100% rename from org_apg/res/layout/select_key_item.xml rename to APG/res/layout/select_key_item.xml diff --git a/org_apg/res/layout/select_public_key_activity.xml b/APG/res/layout/select_public_key_activity.xml similarity index 100% rename from org_apg/res/layout/select_public_key_activity.xml rename to APG/res/layout/select_public_key_activity.xml diff --git a/org_apg/res/layout/select_secret_key_activity.xml b/APG/res/layout/select_secret_key_activity.xml similarity index 100% rename from org_apg/res/layout/select_secret_key_activity.xml rename to APG/res/layout/select_secret_key_activity.xml diff --git a/org_apg/res/layout/sign_key_layout.xml b/APG/res/layout/sign_key_layout.xml similarity index 100% rename from org_apg/res/layout/sign_key_layout.xml rename to APG/res/layout/sign_key_layout.xml diff --git a/org_apg/res/raw/help_about.html b/APG/res/raw/help_about.html similarity index 97% rename from org_apg/res/raw/help_about.html rename to APG/res/raw/help_about.html index 7781ca85a..1b1f0b52e 100644 --- a/org_apg/res/raw/help_about.html +++ b/APG/res/raw/help_about.html @@ -11,11 +11,11 @@ And don't add newlines before or after p tags because of transifex -->

Developer

Libraries

diff --git a/org_apg/res/raw/help_changelog.html b/APG/res/raw/help_changelog.html similarity index 100% rename from org_apg/res/raw/help_changelog.html rename to APG/res/raw/help_changelog.html diff --git a/org_apg/res/raw/help_start.html b/APG/res/raw/help_start.html similarity index 100% rename from org_apg/res/raw/help_start.html rename to APG/res/raw/help_start.html diff --git a/org_apg/res/values/arrays.xml b/APG/res/values/arrays.xml similarity index 100% rename from org_apg/res/values/arrays.xml rename to APG/res/values/arrays.xml diff --git a/org_apg/res/values/colors.xml b/APG/res/values/colors.xml similarity index 100% rename from org_apg/res/values/colors.xml rename to APG/res/values/colors.xml diff --git a/org_apg/res/values/static_strings.xml b/APG/res/values/static_strings.xml similarity index 100% rename from org_apg/res/values/static_strings.xml rename to APG/res/values/static_strings.xml diff --git a/org_apg/res/values/strings.xml b/APG/res/values/strings.xml similarity index 100% rename from org_apg/res/values/strings.xml rename to APG/res/values/strings.xml diff --git a/org_apg/res/values/styles.xml b/APG/res/values/styles.xml similarity index 100% rename from org_apg/res/values/styles.xml rename to APG/res/values/styles.xml diff --git a/org_apg/res/xml/apg_preferences.xml b/APG/res/xml/apg_preferences.xml similarity index 100% rename from org_apg/res/xml/apg_preferences.xml rename to APG/res/xml/apg_preferences.xml diff --git a/org_apg/res/xml/searchable_public_keys.xml b/APG/res/xml/searchable_public_keys.xml similarity index 100% rename from org_apg/res/xml/searchable_public_keys.xml rename to APG/res/xml/searchable_public_keys.xml diff --git a/org_apg/res/xml/searchable_secret_keys.xml b/APG/res/xml/searchable_secret_keys.xml similarity index 100% rename from org_apg/res/xml/searchable_secret_keys.xml rename to APG/res/xml/searchable_secret_keys.xml diff --git a/org_apg/src/org/thialfihar/android/apg/ApgApplication.java b/APG/src/org/thialfihar/android/apg/ApgApplication.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ApgApplication.java rename to APG/src/org/thialfihar/android/apg/ApgApplication.java diff --git a/org_apg/src/org/thialfihar/android/apg/Constants.java b/APG/src/org/thialfihar/android/apg/Constants.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/Constants.java rename to APG/src/org/thialfihar/android/apg/Constants.java diff --git a/org_apg/src/org/thialfihar/android/apg/Id.java b/APG/src/org/thialfihar/android/apg/Id.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/Id.java rename to APG/src/org/thialfihar/android/apg/Id.java diff --git a/org_apg/src/org/thialfihar/android/apg/helper/FileHelper.java b/APG/src/org/thialfihar/android/apg/helper/FileHelper.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/helper/FileHelper.java rename to APG/src/org/thialfihar/android/apg/helper/FileHelper.java diff --git a/org_apg/src/org/thialfihar/android/apg/helper/OtherHelper.java b/APG/src/org/thialfihar/android/apg/helper/OtherHelper.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/helper/OtherHelper.java rename to APG/src/org/thialfihar/android/apg/helper/OtherHelper.java diff --git a/org_apg/src/org/thialfihar/android/apg/helper/PGPConversionHelper.java b/APG/src/org/thialfihar/android/apg/helper/PGPConversionHelper.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/helper/PGPConversionHelper.java rename to APG/src/org/thialfihar/android/apg/helper/PGPConversionHelper.java diff --git a/org_apg/src/org/thialfihar/android/apg/helper/PGPHelper.java b/APG/src/org/thialfihar/android/apg/helper/PGPHelper.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/helper/PGPHelper.java rename to APG/src/org/thialfihar/android/apg/helper/PGPHelper.java diff --git a/org_apg/src/org/thialfihar/android/apg/helper/PGPMain.java b/APG/src/org/thialfihar/android/apg/helper/PGPMain.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/helper/PGPMain.java rename to APG/src/org/thialfihar/android/apg/helper/PGPMain.java diff --git a/org_apg/src/org/thialfihar/android/apg/helper/Preferences.java b/APG/src/org/thialfihar/android/apg/helper/Preferences.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/helper/Preferences.java rename to APG/src/org/thialfihar/android/apg/helper/Preferences.java diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgContract.java b/APG/src/org/thialfihar/android/apg/provider/ApgContract.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/provider/ApgContract.java rename to APG/src/org/thialfihar/android/apg/provider/ApgContract.java diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgDatabase.java b/APG/src/org/thialfihar/android/apg/provider/ApgDatabase.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/provider/ApgDatabase.java rename to APG/src/org/thialfihar/android/apg/provider/ApgDatabase.java diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgProvider.java b/APG/src/org/thialfihar/android/apg/provider/ApgProvider.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/provider/ApgProvider.java rename to APG/src/org/thialfihar/android/apg/provider/ApgProvider.java diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgProviderExternal.java b/APG/src/org/thialfihar/android/apg/provider/ApgProviderExternal.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/provider/ApgProviderExternal.java rename to APG/src/org/thialfihar/android/apg/provider/ApgProviderExternal.java diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgProviderInternal.java b/APG/src/org/thialfihar/android/apg/provider/ApgProviderInternal.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/provider/ApgProviderInternal.java rename to APG/src/org/thialfihar/android/apg/provider/ApgProviderInternal.java diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobContract.java b/APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobContract.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobContract.java rename to APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobContract.java diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobDatabase.java b/APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobDatabase.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobDatabase.java rename to APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobDatabase.java diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobProvider.java b/APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobProvider.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/provider/ApgServiceBlobProvider.java rename to APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobProvider.java diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ProviderHelper.java b/APG/src/org/thialfihar/android/apg/provider/ProviderHelper.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/provider/ProviderHelper.java rename to APG/src/org/thialfihar/android/apg/provider/ProviderHelper.java diff --git a/org_apg/src/org/thialfihar/android/apg/service/ApgIntentService.java b/APG/src/org/thialfihar/android/apg/service/ApgIntentService.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/service/ApgIntentService.java rename to APG/src/org/thialfihar/android/apg/service/ApgIntentService.java diff --git a/org_apg/src/org/thialfihar/android/apg/service/ApgIntentServiceHandler.java b/APG/src/org/thialfihar/android/apg/service/ApgIntentServiceHandler.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/service/ApgIntentServiceHandler.java rename to APG/src/org/thialfihar/android/apg/service/ApgIntentServiceHandler.java diff --git a/org_apg/src/org/thialfihar/android/apg/service/ApgService.java b/APG/src/org/thialfihar/android/apg/service/ApgService.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/service/ApgService.java rename to APG/src/org/thialfihar/android/apg/service/ApgService.java diff --git a/org_apg/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl b/APG/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl rename to APG/src/org/thialfihar/android/apg/service/IApgEncryptDecryptHandler.aidl diff --git a/org_apg/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl b/APG/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl rename to APG/src/org/thialfihar/android/apg/service/IApgHelperHandler.aidl diff --git a/org_apg/src/org/thialfihar/android/apg/service/IApgService.aidl b/APG/src/org/thialfihar/android/apg/service/IApgService.aidl similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/service/IApgService.aidl rename to APG/src/org/thialfihar/android/apg/service/IApgService.aidl diff --git a/org_apg/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl b/APG/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl rename to APG/src/org/thialfihar/android/apg/service/IApgSignVerifyHandler.aidl diff --git a/org_apg/src/org/thialfihar/android/apg/service/PassphraseCacheService.java b/APG/src/org/thialfihar/android/apg/service/PassphraseCacheService.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/service/PassphraseCacheService.java rename to APG/src/org/thialfihar/android/apg/service/PassphraseCacheService.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java b/APG/src/org/thialfihar/android/apg/ui/DecryptActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java rename to APG/src/org/thialfihar/android/apg/ui/DecryptActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java b/APG/src/org/thialfihar/android/apg/ui/EditKeyActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java rename to APG/src/org/thialfihar/android/apg/ui/EditKeyActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/EncryptActivity.java b/APG/src/org/thialfihar/android/apg/ui/EncryptActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/EncryptActivity.java rename to APG/src/org/thialfihar/android/apg/ui/EncryptActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/HelpActivity.java b/APG/src/org/thialfihar/android/apg/ui/HelpActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/HelpActivity.java rename to APG/src/org/thialfihar/android/apg/ui/HelpActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/HelpFragmentAbout.java b/APG/src/org/thialfihar/android/apg/ui/HelpFragmentAbout.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/HelpFragmentAbout.java rename to APG/src/org/thialfihar/android/apg/ui/HelpFragmentAbout.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/HelpFragmentHtml.java b/APG/src/org/thialfihar/android/apg/ui/HelpFragmentHtml.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/HelpFragmentHtml.java rename to APG/src/org/thialfihar/android/apg/ui/HelpFragmentHtml.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java b/APG/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java rename to APG/src/org/thialfihar/android/apg/ui/ImportFromQRCodeActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyListActivity.java b/APG/src/org/thialfihar/android/apg/ui/KeyListActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/KeyListActivity.java rename to APG/src/org/thialfihar/android/apg/ui/KeyListActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyListFragment.java b/APG/src/org/thialfihar/android/apg/ui/KeyListFragment.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/KeyListFragment.java rename to APG/src/org/thialfihar/android/apg/ui/KeyListFragment.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyListPublicActivity.java b/APG/src/org/thialfihar/android/apg/ui/KeyListPublicActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/KeyListPublicActivity.java rename to APG/src/org/thialfihar/android/apg/ui/KeyListPublicActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyListPublicFragment.java b/APG/src/org/thialfihar/android/apg/ui/KeyListPublicFragment.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/KeyListPublicFragment.java rename to APG/src/org/thialfihar/android/apg/ui/KeyListPublicFragment.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyListSecretActivity.java b/APG/src/org/thialfihar/android/apg/ui/KeyListSecretActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/KeyListSecretActivity.java rename to APG/src/org/thialfihar/android/apg/ui/KeyListSecretActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyListSecretFragment.java b/APG/src/org/thialfihar/android/apg/ui/KeyListSecretFragment.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/KeyListSecretFragment.java rename to APG/src/org/thialfihar/android/apg/ui/KeyListSecretFragment.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java b/APG/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java rename to APG/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyServerUploadActivity.java b/APG/src/org/thialfihar/android/apg/ui/KeyServerUploadActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/KeyServerUploadActivity.java rename to APG/src/org/thialfihar/android/apg/ui/KeyServerUploadActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java b/APG/src/org/thialfihar/android/apg/ui/MainActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java rename to APG/src/org/thialfihar/android/apg/ui/MainActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/PreferencesActivity.java b/APG/src/org/thialfihar/android/apg/ui/PreferencesActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/PreferencesActivity.java rename to APG/src/org/thialfihar/android/apg/ui/PreferencesActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/PreferencesKeyServerActivity.java b/APG/src/org/thialfihar/android/apg/ui/PreferencesKeyServerActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/PreferencesKeyServerActivity.java rename to APG/src/org/thialfihar/android/apg/ui/PreferencesKeyServerActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyActivity.java b/APG/src/org/thialfihar/android/apg/ui/SelectPublicKeyActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyActivity.java rename to APG/src/org/thialfihar/android/apg/ui/SelectPublicKeyActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyFragment.java b/APG/src/org/thialfihar/android/apg/ui/SelectPublicKeyFragment.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyFragment.java rename to APG/src/org/thialfihar/android/apg/ui/SelectPublicKeyFragment.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyActivity.java b/APG/src/org/thialfihar/android/apg/ui/SelectSecretKeyActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyActivity.java rename to APG/src/org/thialfihar/android/apg/ui/SelectSecretKeyActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyFragment.java b/APG/src/org/thialfihar/android/apg/ui/SelectSecretKeyFragment.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyFragment.java rename to APG/src/org/thialfihar/android/apg/ui/SelectSecretKeyFragment.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java b/APG/src/org/thialfihar/android/apg/ui/SignKeyActivity.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java rename to APG/src/org/thialfihar/android/apg/ui/SignKeyActivity.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/DeleteFileDialogFragment.java b/APG/src/org/thialfihar/android/apg/ui/dialog/DeleteFileDialogFragment.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/dialog/DeleteFileDialogFragment.java rename to APG/src/org/thialfihar/android/apg/ui/dialog/DeleteFileDialogFragment.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/DeleteKeyDialogFragment.java b/APG/src/org/thialfihar/android/apg/ui/dialog/DeleteKeyDialogFragment.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/dialog/DeleteKeyDialogFragment.java rename to APG/src/org/thialfihar/android/apg/ui/dialog/DeleteKeyDialogFragment.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/FileDialogFragment.java b/APG/src/org/thialfihar/android/apg/ui/dialog/FileDialogFragment.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/dialog/FileDialogFragment.java rename to APG/src/org/thialfihar/android/apg/ui/dialog/FileDialogFragment.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/LookupUnknownKeyDialogFragment.java b/APG/src/org/thialfihar/android/apg/ui/dialog/LookupUnknownKeyDialogFragment.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/dialog/LookupUnknownKeyDialogFragment.java rename to APG/src/org/thialfihar/android/apg/ui/dialog/LookupUnknownKeyDialogFragment.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/PassphraseDialogFragment.java b/APG/src/org/thialfihar/android/apg/ui/dialog/PassphraseDialogFragment.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/dialog/PassphraseDialogFragment.java rename to APG/src/org/thialfihar/android/apg/ui/dialog/PassphraseDialogFragment.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/ProgressDialogFragment.java b/APG/src/org/thialfihar/android/apg/ui/dialog/ProgressDialogFragment.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/dialog/ProgressDialogFragment.java rename to APG/src/org/thialfihar/android/apg/ui/dialog/ProgressDialogFragment.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/dialog/SetPassphraseDialogFragment.java b/APG/src/org/thialfihar/android/apg/ui/dialog/SetPassphraseDialogFragment.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/dialog/SetPassphraseDialogFragment.java rename to APG/src/org/thialfihar/android/apg/ui/dialog/SetPassphraseDialogFragment.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/DashboardLayout.java b/APG/src/org/thialfihar/android/apg/ui/widget/DashboardLayout.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/widget/DashboardLayout.java rename to APG/src/org/thialfihar/android/apg/ui/widget/DashboardLayout.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/Editor.java b/APG/src/org/thialfihar/android/apg/ui/widget/Editor.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/widget/Editor.java rename to APG/src/org/thialfihar/android/apg/ui/widget/Editor.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/ExpandableListFragment.java b/APG/src/org/thialfihar/android/apg/ui/widget/ExpandableListFragment.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/widget/ExpandableListFragment.java rename to APG/src/org/thialfihar/android/apg/ui/widget/ExpandableListFragment.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java b/APG/src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java rename to APG/src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java b/APG/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java rename to APG/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyListAdapter.java b/APG/src/org/thialfihar/android/apg/ui/widget/KeyListAdapter.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/widget/KeyListAdapter.java rename to APG/src/org/thialfihar/android/apg/ui/widget/KeyListAdapter.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyServerEditor.java b/APG/src/org/thialfihar/android/apg/ui/widget/KeyServerEditor.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/widget/KeyServerEditor.java rename to APG/src/org/thialfihar/android/apg/ui/widget/KeyServerEditor.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/SectionView.java b/APG/src/org/thialfihar/android/apg/ui/widget/SectionView.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/widget/SectionView.java rename to APG/src/org/thialfihar/android/apg/ui/widget/SectionView.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/SelectKeyCursorAdapter.java b/APG/src/org/thialfihar/android/apg/ui/widget/SelectKeyCursorAdapter.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/widget/SelectKeyCursorAdapter.java rename to APG/src/org/thialfihar/android/apg/ui/widget/SelectKeyCursorAdapter.java diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/UserIdEditor.java b/APG/src/org/thialfihar/android/apg/ui/widget/UserIdEditor.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/ui/widget/UserIdEditor.java rename to APG/src/org/thialfihar/android/apg/ui/widget/UserIdEditor.java diff --git a/org_apg/src/org/thialfihar/android/apg/util/Choice.java b/APG/src/org/thialfihar/android/apg/util/Choice.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/util/Choice.java rename to APG/src/org/thialfihar/android/apg/util/Choice.java diff --git a/org_apg/src/org/thialfihar/android/apg/util/Compatibility.java b/APG/src/org/thialfihar/android/apg/util/Compatibility.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/util/Compatibility.java rename to APG/src/org/thialfihar/android/apg/util/Compatibility.java diff --git a/org_apg/src/org/thialfihar/android/apg/util/HkpKeyServer.java b/APG/src/org/thialfihar/android/apg/util/HkpKeyServer.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/util/HkpKeyServer.java rename to APG/src/org/thialfihar/android/apg/util/HkpKeyServer.java diff --git a/org_apg/src/org/thialfihar/android/apg/util/InputData.java b/APG/src/org/thialfihar/android/apg/util/InputData.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/util/InputData.java rename to APG/src/org/thialfihar/android/apg/util/InputData.java diff --git a/org_apg/src/org/thialfihar/android/apg/util/IterableIterator.java b/APG/src/org/thialfihar/android/apg/util/IterableIterator.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/util/IterableIterator.java rename to APG/src/org/thialfihar/android/apg/util/IterableIterator.java diff --git a/org_apg/src/org/thialfihar/android/apg/util/KeyServer.java b/APG/src/org/thialfihar/android/apg/util/KeyServer.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/util/KeyServer.java rename to APG/src/org/thialfihar/android/apg/util/KeyServer.java diff --git a/org_apg/src/org/thialfihar/android/apg/util/Log.java b/APG/src/org/thialfihar/android/apg/util/Log.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/util/Log.java rename to APG/src/org/thialfihar/android/apg/util/Log.java diff --git a/org_apg/src/org/thialfihar/android/apg/util/PositionAwareInputStream.java b/APG/src/org/thialfihar/android/apg/util/PositionAwareInputStream.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/util/PositionAwareInputStream.java rename to APG/src/org/thialfihar/android/apg/util/PositionAwareInputStream.java diff --git a/org_apg/src/org/thialfihar/android/apg/util/Primes.java b/APG/src/org/thialfihar/android/apg/util/Primes.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/util/Primes.java rename to APG/src/org/thialfihar/android/apg/util/Primes.java diff --git a/org_apg/src/org/thialfihar/android/apg/util/ProgressDialogUpdater.java b/APG/src/org/thialfihar/android/apg/util/ProgressDialogUpdater.java similarity index 100% rename from org_apg/src/org/thialfihar/android/apg/util/ProgressDialogUpdater.java rename to APG/src/org/thialfihar/android/apg/util/ProgressDialogUpdater.java