diff --git a/.gitignore b/.gitignore index a1fa2dab4..71c11b159 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,30 @@ +#Android specific +bin +gen +obj +libs/armeabi +lint.xml +local.properties +release.properties +ant.properties *.class *.apk -.metadata \ No newline at end of file + +#Gradle +.gradle +build +gradle.properties + +#Maven +target +pom.xml.* + +#Eclipse +.project +.classpath +.settings +.metadata + +#IntelliJ IDEA +.idea +*.iml diff --git a/OpenPGP-Keychain-API-Demo/.gitignore b/OpenPGP-Keychain-API-Demo/.gitignore index 2e423e1a3..71c11b159 100644 --- a/OpenPGP-Keychain-API-Demo/.gitignore +++ b/OpenPGP-Keychain-API-Demo/.gitignore @@ -1,23 +1,30 @@ -#Android generated +#Android specific bin gen obj libs/armeabi lint.xml local.properties +release.properties +ant.properties +*.class +*.apk + +#Gradle +.gradle +build +gradle.properties + +#Maven +target +pom.xml.* #Eclipse .project .classpath .settings +.metadata #IntelliJ IDEA .idea *.iml - -#Maven -target -release.properties - -#Mac -.DS_Store \ No newline at end of file diff --git a/OpenPGP-Keychain-API-Lib/.gitignore b/OpenPGP-Keychain-API-Lib/.gitignore index 2e423e1a3..71c11b159 100644 --- a/OpenPGP-Keychain-API-Lib/.gitignore +++ b/OpenPGP-Keychain-API-Lib/.gitignore @@ -1,23 +1,30 @@ -#Android generated +#Android specific bin gen obj libs/armeabi lint.xml local.properties +release.properties +ant.properties +*.class +*.apk + +#Gradle +.gradle +build +gradle.properties + +#Maven +target +pom.xml.* #Eclipse .project .classpath .settings +.metadata #IntelliJ IDEA .idea *.iml - -#Maven -target -release.properties - -#Mac -.DS_Store \ No newline at end of file diff --git a/OpenPGP-Keychain/.gitignore b/OpenPGP-Keychain/.gitignore index 1eb5cbeae..71c11b159 100644 --- a/OpenPGP-Keychain/.gitignore +++ b/OpenPGP-Keychain/.gitignore @@ -1,24 +1,30 @@ -#Android generated +#Android specific bin gen obj libs/armeabi lint.xml local.properties +release.properties ant.properties +*.class +*.apk + +#Gradle +.gradle +build +gradle.properties + +#Maven +target +pom.xml.* #Eclipse .project .classpath .settings +.metadata #IntelliJ IDEA .idea *.iml - -#Maven -target -release.properties - -#Mac -.DS_Store \ No newline at end of file diff --git a/OpenPGP-Keychain/build.gradle b/OpenPGP-Keychain/build.gradle new file mode 100644 index 000000000..b9720f405 --- /dev/null +++ b/OpenPGP-Keychain/build.gradle @@ -0,0 +1,63 @@ +buildscript { + repositories { + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:0.4' + } +} + +apply plugin: 'android' + +dependencies { + compile fileTree(dir: 'libs', includes: ['*.jar'], excludes: ['android-support-v4.jar']) + compile project(':libraries:ActionBarSherlock') +} + +android { + compileSdkVersion 17 + buildToolsVersion "17" + + defaultConfig { + minSdkVersion 8 + targetSdkVersion 17 + } + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + + instrumentTest.setRoot('tests') + } + + /* + * To sign release build, create file gradle.properties in .gradle/ with this content: + * + * signingStoreLocation=/home/key.store + * signingStorePassword=xxx + * signingKeyAlias=alias + * signingKeyPassword=xxx + */ + signingConfigs { + myConfig { + storeFile file(signingStoreLocation) + storePassword signingStorePassword + keyAlias signingKeyAlias + keyPassword signingKeyPassword + } + } + + buildTypes { + release { + signingConfig signingConfigs.myConfig + } + } +} diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/libs/android-support-v4.jar b/OpenPGP-Keychain/libs/android-support-v4.jar similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/libs/android-support-v4.jar rename to OpenPGP-Keychain/libs/android-support-v4.jar diff --git a/OpenPGP-Keychain/project.properties b/OpenPGP-Keychain/project.properties index 2267fbaf8..cfb577df7 100644 --- a/OpenPGP-Keychain/project.properties +++ b/OpenPGP-Keychain/project.properties @@ -9,4 +9,4 @@ # Project target. target=android-17 -android.library.reference.1=android-libs/ActionBarSherlock +android.library.reference.1=../libraries/ActionBarSherlock diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/.gitignore b/libraries/ActionBarSherlock/.gitignore similarity index 59% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/.gitignore rename to libraries/ActionBarSherlock/.gitignore index 2e423e1a3..71c11b159 100644 --- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/.gitignore +++ b/libraries/ActionBarSherlock/.gitignore @@ -1,23 +1,30 @@ -#Android generated +#Android specific bin gen obj libs/armeabi lint.xml local.properties +release.properties +ant.properties +*.class +*.apk + +#Gradle +.gradle +build +gradle.properties + +#Maven +target +pom.xml.* #Eclipse .project .classpath .settings +.metadata #IntelliJ IDEA .idea *.iml - -#Maven -target -release.properties - -#Mac -.DS_Store \ No newline at end of file diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/AndroidManifest.xml b/libraries/ActionBarSherlock/AndroidManifest.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/AndroidManifest.xml rename to libraries/ActionBarSherlock/AndroidManifest.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/README.md b/libraries/ActionBarSherlock/README.md similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/README.md rename to libraries/ActionBarSherlock/README.md diff --git a/libraries/ActionBarSherlock/build.gradle b/libraries/ActionBarSherlock/build.gradle new file mode 100644 index 000000000..102d66946 --- /dev/null +++ b/libraries/ActionBarSherlock/build.gradle @@ -0,0 +1,27 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.4.1' + } +} + +apply plugin: 'android-library' + +dependencies { + compile files('libs/android-support-v4.jar') +} + +android { + compileSdkVersion 17 + buildToolsVersion '17' + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + res.srcDirs = ['res'] + } + } +} diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/build.xml b/libraries/ActionBarSherlock/build.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/build.xml rename to libraries/ActionBarSherlock/build.xml diff --git a/libraries/ActionBarSherlock/libs/android-support-v4.jar b/libraries/ActionBarSherlock/libs/android-support-v4.jar new file mode 100644 index 000000000..99e063b33 Binary files /dev/null and b/libraries/ActionBarSherlock/libs/android-support-v4.jar differ diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/pom.xml b/libraries/ActionBarSherlock/pom.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/pom.xml rename to libraries/ActionBarSherlock/pom.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/proguard-project.txt b/libraries/ActionBarSherlock/proguard-project.txt similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/proguard-project.txt rename to libraries/ActionBarSherlock/proguard-project.txt diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/project.properties b/libraries/ActionBarSherlock/project.properties similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/project.properties rename to libraries/ActionBarSherlock/project.properties diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml b/libraries/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml rename to libraries/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml b/libraries/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml rename to libraries/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml b/libraries/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml rename to libraries/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml b/libraries/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml rename to libraries/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml b/libraries/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml rename to libraries/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png rename to libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml rename to libraries/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml rename to libraries/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml rename to libraries/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml rename to libraries/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear.xml b/libraries/ActionBarSherlock/res/drawable/abs__ic_clear.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear.xml rename to libraries/ActionBarSherlock/res/drawable/abs__ic_clear.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml rename to libraries/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml rename to libraries/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml rename to libraries/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml rename to libraries/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml rename to libraries/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml rename to libraries/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml rename to libraries/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml rename to libraries/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml rename to libraries/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml rename to libraries/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml rename to libraries/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml b/libraries/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml rename to libraries/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml rename to libraries/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml rename to libraries/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml rename to libraries/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml rename to libraries/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml b/libraries/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml rename to libraries/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml rename to libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml rename to libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml rename to libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml rename to libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml b/libraries/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml rename to libraries/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml b/libraries/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml rename to libraries/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml b/libraries/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml rename to libraries/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml b/libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml rename to libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml b/libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml rename to libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_home.xml b/libraries/ActionBarSherlock/res/layout/abs__action_bar_home.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_home.xml rename to libraries/ActionBarSherlock/res/layout/abs__action_bar_home.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab.xml b/libraries/ActionBarSherlock/res/layout/abs__action_bar_tab.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab.xml rename to libraries/ActionBarSherlock/res/layout/abs__action_bar_tab.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml b/libraries/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml rename to libraries/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml b/libraries/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml rename to libraries/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml b/libraries/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml rename to libraries/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_layout.xml b/libraries/ActionBarSherlock/res/layout/abs__action_menu_layout.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_layout.xml rename to libraries/ActionBarSherlock/res/layout/abs__action_menu_layout.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_bar.xml b/libraries/ActionBarSherlock/res/layout/abs__action_mode_bar.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_bar.xml rename to libraries/ActionBarSherlock/res/layout/abs__action_mode_bar.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml b/libraries/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml rename to libraries/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml b/libraries/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml rename to libraries/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml b/libraries/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml rename to libraries/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml b/libraries/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml rename to libraries/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml b/libraries/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml rename to libraries/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml b/libraries/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml rename to libraries/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml b/libraries/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml rename to libraries/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml b/libraries/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml rename to libraries/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml b/libraries/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml rename to libraries/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar.xml b/libraries/ActionBarSherlock/res/layout/abs__screen_action_bar.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar.xml rename to libraries/ActionBarSherlock/res/layout/abs__screen_action_bar.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml b/libraries/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml rename to libraries/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple.xml b/libraries/ActionBarSherlock/res/layout/abs__screen_simple.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple.xml rename to libraries/ActionBarSherlock/res/layout/abs__screen_simple.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml b/libraries/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml rename to libraries/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml b/libraries/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml rename to libraries/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_view.xml b/libraries/ActionBarSherlock/res/layout/abs__search_view.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_view.xml rename to libraries/ActionBarSherlock/res/layout/abs__search_view.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml b/libraries/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml rename to libraries/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml b/libraries/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml rename to libraries/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_item.xml b/libraries/ActionBarSherlock/res/layout/sherlock_spinner_item.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_item.xml rename to libraries/ActionBarSherlock/res/layout/sherlock_spinner_item.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-land/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-land/abs__dimens.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-land/abs__dimens.xml rename to libraries/ActionBarSherlock/res/values-land/abs__dimens.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml rename to libraries/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml rename to libraries/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml rename to libraries/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml rename to libraries/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-large/abs__dimens.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large/abs__dimens.xml rename to libraries/ActionBarSherlock/res/values-large/abs__dimens.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__bools.xml b/libraries/ActionBarSherlock/res/values-sw600dp/abs__bools.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__bools.xml rename to libraries/ActionBarSherlock/res/values-sw600dp/abs__bools.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml rename to libraries/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v11/abs__themes.xml b/libraries/ActionBarSherlock/res/values-v11/abs__themes.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v11/abs__themes.xml rename to libraries/ActionBarSherlock/res/values-v11/abs__themes.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__styles.xml b/libraries/ActionBarSherlock/res/values-v14/abs__styles.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__styles.xml rename to libraries/ActionBarSherlock/res/values-v14/abs__styles.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__themes.xml b/libraries/ActionBarSherlock/res/values-v14/abs__themes.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__themes.xml rename to libraries/ActionBarSherlock/res/values-v14/abs__themes.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w360dp/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-w360dp/abs__dimens.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w360dp/abs__dimens.xml rename to libraries/ActionBarSherlock/res/values-w360dp/abs__dimens.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__bools.xml b/libraries/ActionBarSherlock/res/values-w480dp/abs__bools.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__bools.xml rename to libraries/ActionBarSherlock/res/values-w480dp/abs__bools.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__config.xml b/libraries/ActionBarSherlock/res/values-w480dp/abs__config.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__config.xml rename to libraries/ActionBarSherlock/res/values-w480dp/abs__config.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w500dp/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-w500dp/abs__dimens.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w500dp/abs__dimens.xml rename to libraries/ActionBarSherlock/res/values-w500dp/abs__dimens.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w600dp/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-w600dp/abs__dimens.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w600dp/abs__dimens.xml rename to libraries/ActionBarSherlock/res/values-w600dp/abs__dimens.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-xlarge/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-xlarge/abs__dimens.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-xlarge/abs__dimens.xml rename to libraries/ActionBarSherlock/res/values-xlarge/abs__dimens.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__attrs.xml b/libraries/ActionBarSherlock/res/values/abs__attrs.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__attrs.xml rename to libraries/ActionBarSherlock/res/values/abs__attrs.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__bools.xml b/libraries/ActionBarSherlock/res/values/abs__bools.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__bools.xml rename to libraries/ActionBarSherlock/res/values/abs__bools.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__colors.xml b/libraries/ActionBarSherlock/res/values/abs__colors.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__colors.xml rename to libraries/ActionBarSherlock/res/values/abs__colors.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__config.xml b/libraries/ActionBarSherlock/res/values/abs__config.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__config.xml rename to libraries/ActionBarSherlock/res/values/abs__config.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__dimens.xml b/libraries/ActionBarSherlock/res/values/abs__dimens.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__dimens.xml rename to libraries/ActionBarSherlock/res/values/abs__dimens.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__ids.xml b/libraries/ActionBarSherlock/res/values/abs__ids.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__ids.xml rename to libraries/ActionBarSherlock/res/values/abs__ids.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__strings.xml b/libraries/ActionBarSherlock/res/values/abs__strings.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__strings.xml rename to libraries/ActionBarSherlock/res/values/abs__strings.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__styles.xml b/libraries/ActionBarSherlock/res/values/abs__styles.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__styles.xml rename to libraries/ActionBarSherlock/res/values/abs__styles.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__themes.xml b/libraries/ActionBarSherlock/res/values/abs__themes.xml similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__themes.xml rename to libraries/ActionBarSherlock/res/values/abs__themes.xml diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/android/support/v4/app/Watson.java b/libraries/ActionBarSherlock/src/android/support/v4/app/Watson.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/android/support/v4/app/Watson.java rename to libraries/ActionBarSherlock/src/android/support/v4/app/Watson.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java rename to libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java b/libraries/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java similarity index 100% rename from OpenPGP-Keychain/android-libs/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java rename to libraries/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..9df383b2a --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':OpenPGP-Keychain', ':libraries:ActionBarSherlock'