diff --git a/OpenPGP-Keychain/.gitignore b/OpenPGP-Keychain/.gitignore
index afa9dfc45..aa8bb5760 100644
--- a/OpenPGP-Keychain/.gitignore
+++ b/OpenPGP-Keychain/.gitignore
@@ -2,7 +2,6 @@
 bin
 gen
 obj
-libs/armeabi
 lint.xml
 local.properties
 release.properties
@@ -14,9 +13,6 @@ ant.properties
 .gradle
 build
 gradle.properties
-gradlew
-gradlew.bat
-gradle
 
 #Maven
 target
diff --git a/OpenPGP-Keychain/build.gradle b/OpenPGP-Keychain/build.gradle
index b24d7a68c..cf58740e8 100644
--- a/OpenPGP-Keychain/build.gradle
+++ b/OpenPGP-Keychain/build.gradle
@@ -15,7 +15,6 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', includes: ['*.jar'], excludes: ['android-support-v4.jar'])
     compile 'com.android.support:support-v4:19.0.+' // already in actionbarsherlock
     compile project(':libraries:ActionBarSherlock')
     compile project(':libraries:HtmlTextView')
@@ -38,20 +37,6 @@ android {
         targetSdkVersion 19
     }
 
-    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:
      *
diff --git a/OpenPGP-Keychain/build.xml b/OpenPGP-Keychain/build.xml
deleted file mode 100644
index 211b7eb94..000000000
--- a/OpenPGP-Keychain/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Keychain" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/OpenPGP-Keychain/libs/android-support-v4.jar b/OpenPGP-Keychain/libs/android-support-v4.jar
deleted file mode 100644
index 9056828a0..000000000
Binary files a/OpenPGP-Keychain/libs/android-support-v4.jar and /dev/null differ
diff --git a/OpenPGP-Keychain/pom.xml b/OpenPGP-Keychain/pom.xml
deleted file mode 100644
index cadb2a38d..000000000
--- a/OpenPGP-Keychain/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<version>1.0.9-SNAPSHOT</version>
-	<groupId>org.thialfihar.android</groupId>
-	<artifactId>apg</artifactId>
-	<packaging>apk</packaging>
-	<name>APG</name>
-	<description>
-    </description>
-	<url>http://code.google.com/p/android-privacy-guard/</url>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<android.version>1.6_r2</android.version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>com.google.android</groupId>
-			<artifactId>android</artifactId>
-			<scope>provided</scope>
-			<version>1.6_r2</version>
-		</dependency>
-		<dependency>
-			<groupId>com.madgag</groupId>
-			<artifactId>scprov-jdk15</artifactId>
-			<version>1.46.99.4-UNOFFICIAL-ROBERTO-RELEASE-SNAPSHOT</version>
-			<type>jar</type>
-		</dependency>
-		<dependency>
-			<groupId>com.google.zxing</groupId>
-			<artifactId>android-integration</artifactId>
-			<version>1.6-SNAPSHOT</version>
-			<type>jar</type>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<testSourceDirectory>test</testSourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<target>1.6</target>
-					<source>1.6</source>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>android-maven-plugin</artifactId>
-				<version>3.0.0-alpha-11</version>
-				<configuration>
-					<sdk>
-						<path>${user.home}/android-sdk-linux_x86/</path>
-						<platform>4</platform>
-					</sdk>
-					<deleteConflictingFiles>true</deleteConflictingFiles>
-					<extractDuplicates>true</extractDuplicates>
-				</configuration>
-				<extensions>true</extensions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/OpenPGP-Keychain/proguard-project.txt b/OpenPGP-Keychain/proguard-project.txt
deleted file mode 100644
index f2fe1559a..000000000
--- a/OpenPGP-Keychain/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/OpenPGP-Keychain/project.properties b/OpenPGP-Keychain/project.properties
deleted file mode 100644
index 96546d84f..000000000
--- a/OpenPGP-Keychain/project.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-19
-android.library.reference.1=../libraries/ActionBarSherlock
-android.library.reference.2=../libraries/HtmlTextView
-android.library.reference.3=../libraries/StickyListHeaders/library
-android.library.reference.4=../libraries/zxing
-android.library.reference.5=../libraries/AndroidBootstrap
-android.library.reference.6=../libraries/zxing-android-integration
diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/src/main/AndroidManifest.xml
similarity index 100%
rename from OpenPGP-Keychain/AndroidManifest.xml
rename to OpenPGP-Keychain/src/main/AndroidManifest.xml
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpCallback.aidl b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/IOpenPgpCallback.aidl
similarity index 100%
rename from OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpCallback.aidl
rename to OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/IOpenPgpCallback.aidl
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpKeyIdsCallback.aidl b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/IOpenPgpKeyIdsCallback.aidl
similarity index 100%
rename from OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpKeyIdsCallback.aidl
rename to OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/IOpenPgpKeyIdsCallback.aidl
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpService.aidl b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/IOpenPgpService.aidl
similarity index 100%
rename from OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpService.aidl
rename to OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/IOpenPgpService.aidl
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.aidl b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/OpenPgpData.aidl
similarity index 100%
rename from OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.aidl
rename to OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/OpenPgpData.aidl
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpError.aidl b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/OpenPgpError.aidl
similarity index 100%
rename from OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpError.aidl
rename to OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/OpenPgpError.aidl
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.aidl b/OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/OpenPgpSignatureResult.aidl
similarity index 100%
rename from OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.aidl
rename to OpenPGP-Keychain/src/main/aidl/org/openintents/openpgp/OpenPgpSignatureResult.aidl
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/IExtendedApiCallback.aidl b/OpenPGP-Keychain/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiCallback.aidl
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/IExtendedApiCallback.aidl
rename to OpenPGP-Keychain/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiCallback.aidl
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/IExtendedApiService.aidl b/OpenPGP-Keychain/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiService.aidl
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/IExtendedApiService.aidl
rename to OpenPGP-Keychain/src/main/aidl/org/sufficientlysecure/keychain/service/remote/IExtendedApiService.aidl
diff --git a/OpenPGP-Keychain/assets/fontawesome-webfont.ttf b/OpenPGP-Keychain/src/main/assets/fontawesome-webfont.ttf
similarity index 100%
rename from OpenPGP-Keychain/assets/fontawesome-webfont.ttf
rename to OpenPGP-Keychain/src/main/assets/fontawesome-webfont.ttf
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpConstants.java b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpConstants.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpConstants.java
rename to OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpConstants.java
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpData.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpData.java
rename to OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpData.java
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpError.java b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpError.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpError.java
rename to OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpError.java
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpHelper.java b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpHelper.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpHelper.java
rename to OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpHelper.java
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpListPreference.java b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpListPreference.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpListPreference.java
rename to OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpListPreference.java
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpServiceConnection.java b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpServiceConnection.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpServiceConnection.java
rename to OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpServiceConnection.java
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java b/OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpSignatureResult.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java
rename to OpenPGP-Keychain/src/main/java/org/openintents/openpgp/OpenPgpSignatureResult.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Constants.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Constants.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Id.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Id.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Id.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Id.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/KeychainApplication.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/ActionBarHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/ExportHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/ExportHelper.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/FileHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/FileHelper.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/OtherHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/OtherHelper.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/OtherHelper.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/OtherHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/Preferences.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/Preferences.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpHelper.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpOperation.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpOperation.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpToX509.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpToX509.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/NoUserIdsException.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/NoUserIdsException.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/NoUserIdsException.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/NoUserIdsException.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/UserInteractionRequiredException.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/UserInteractionRequiredException.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/UserInteractionRequiredException.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/UserInteractionRequiredException.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/WrongPackageSignatureException.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/WrongPackageSignatureException.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/WrongPackageSignatureException.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/WrongPackageSignatureException.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/WrongPassphraseException.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/WrongPassphraseException.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/exception/WrongPassphraseException.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/exception/WrongPassphraseException.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettings.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettings.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettings.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettings.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettingsActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettingsActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettingsFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettingsFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/AppSettingsFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/ExtendedApiService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/ExtendedApiService.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/ExtendedApiService.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/ExtendedApiService.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RegisteredAppsAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsAdapter.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RegisteredAppsAdapter.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RegisteredAppsListFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RemoteService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteService.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RemoteService.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteService.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DrawerActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DrawerActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpFragmentAbout.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentAbout.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpFragmentAbout.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentAbout.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpFragmentHtml.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentHtml.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpFragmentHtml.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpFragmentHtml.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/Editor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/Editor.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/FixedListView.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/AlgorithmNames.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/AlgorithmNames.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Choice.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Choice.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/HkpKeyServer.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/HkpKeyServer.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/InputData.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/InputData.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/InputData.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/InputData.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/IterableIterator.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/IterableIterator.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/KeyServer.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/KeyServer.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Log.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Log.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PRNGFixes.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PRNGFixes.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Primes.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Primes.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/QrCodeUtils.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java
similarity index 100%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/QrCodeUtils.java
rename to OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java
diff --git a/OpenPGP-Keychain/res/anim/push_left_in.xml b/OpenPGP-Keychain/src/main/res/anim/push_left_in.xml
similarity index 100%
rename from OpenPGP-Keychain/res/anim/push_left_in.xml
rename to OpenPGP-Keychain/src/main/res/anim/push_left_in.xml
diff --git a/OpenPGP-Keychain/res/anim/push_left_out.xml b/OpenPGP-Keychain/src/main/res/anim/push_left_out.xml
similarity index 100%
rename from OpenPGP-Keychain/res/anim/push_left_out.xml
rename to OpenPGP-Keychain/src/main/res/anim/push_left_out.xml
diff --git a/OpenPGP-Keychain/res/anim/push_right_in.xml b/OpenPGP-Keychain/src/main/res/anim/push_right_in.xml
similarity index 100%
rename from OpenPGP-Keychain/res/anim/push_right_in.xml
rename to OpenPGP-Keychain/src/main/res/anim/push_right_in.xml
diff --git a/OpenPGP-Keychain/res/anim/push_right_out.xml b/OpenPGP-Keychain/src/main/res/anim/push_right_out.xml
similarity index 100%
rename from OpenPGP-Keychain/res/anim/push_right_out.xml
rename to OpenPGP-Keychain/src/main/res/anim/push_right_out.xml
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/certify_small.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/certify_small.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/certify_small.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/certify_small.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/drawer_shadow.9.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/drawer_shadow.9.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/drawer_shadow.9.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/encrypted_small.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/encrypted_small.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/encrypted_small.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/encrypted_small.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_add_person.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_add_person.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/ic_action_add_person.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_cancel.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cancel.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/ic_action_cancel.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cancel.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_discard.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_discard.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/ic_action_discard.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_done.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_done.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/ic_action_done.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_done.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_import_export.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_import_export.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/ic_action_import_export.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_share.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_share.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/ic_action_share.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_drawer.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_drawer.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/ic_drawer.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search_list.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search_list.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search_list.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search_list.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_next.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_next.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/ic_next.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_next.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_previous.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_previous.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/ic_previous.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_previous.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/icon.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/icon.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/icon.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/key_small.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/key_small.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/key_small.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/key_small.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/overlay_error.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_error.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/overlay_error.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_error.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/overlay_ok.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_ok.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/overlay_ok.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_ok.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/signed_large.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_large.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/signed_large.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_large.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/signed_small.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_small.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-hdpi/signed_small.png
rename to OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_small.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/encrypted_small.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/encrypted_small.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-ldpi/encrypted_small.png
rename to OpenPGP-Keychain/src/main/res/drawable-ldpi/encrypted_small.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/ic_next.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_next.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-ldpi/ic_next.png
rename to OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_next.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/ic_previous.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_previous.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-ldpi/ic_previous.png
rename to OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_previous.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/icon.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-ldpi/icon.png
rename to OpenPGP-Keychain/src/main/res/drawable-ldpi/icon.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/key_small.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/key_small.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-ldpi/key_small.png
rename to OpenPGP-Keychain/src/main/res/drawable-ldpi/key_small.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/overlay_error.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_error.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-ldpi/overlay_error.png
rename to OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_error.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/overlay_ok.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_ok.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-ldpi/overlay_ok.png
rename to OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_ok.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/signed_large.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_large.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-ldpi/signed_large.png
rename to OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_large.png
diff --git a/OpenPGP-Keychain/res/drawable-ldpi/signed_small.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_small.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-ldpi/signed_small.png
rename to OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_small.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/certify_small.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/certify_small.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/certify_small.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/certify_small.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/drawer_shadow.9.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/drawer_shadow.9.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/drawer_shadow.9.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/encrypted_small.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/encrypted_small.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/encrypted_small.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/encrypted_small.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_add_person.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_add_person.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/ic_action_add_person.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_cancel.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cancel.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/ic_action_cancel.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cancel.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_discard.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_discard.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/ic_action_discard.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_done.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_done.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/ic_action_done.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_done.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_import_export.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_import_export.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/ic_action_import_export.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_share.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_share.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/ic_action_share.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_drawer.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_drawer.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/ic_drawer.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search_list.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search_list.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search_list.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search_list.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_next.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_next.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/ic_next.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_next.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_previous.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_previous.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/ic_previous.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_previous.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/icon.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/icon.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/icon.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/key_small.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/key_small.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/key_small.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/key_small.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/overlay_error.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_error.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/overlay_error.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_error.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/overlay_ok.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_ok.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/overlay_ok.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_ok.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/signed_large.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_large.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/signed_large.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_large.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/signed_small.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_small.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-mdpi/signed_small.png
rename to OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_small.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/drawer_shadow.9.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/drawer_shadow.9.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xhdpi/drawer_shadow.9.png
rename to OpenPGP-Keychain/src/main/res/drawable-xhdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_add_person.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_add_person.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xhdpi/ic_action_add_person.png
rename to OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_cancel.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cancel.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xhdpi/ic_action_cancel.png
rename to OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cancel.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_discard.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_discard.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xhdpi/ic_action_discard.png
rename to OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_done.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_done.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xhdpi/ic_action_done.png
rename to OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_done.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_import_export.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_import_export.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xhdpi/ic_action_import_export.png
rename to OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_share.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_share.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xhdpi/ic_action_share.png
rename to OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_drawer.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_drawer.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xhdpi/ic_drawer.png
rename to OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search.png
rename to OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search_list.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search_list.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search_list.png
rename to OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search_list.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/icon.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xhdpi/icon.png
rename to OpenPGP-Keychain/src/main/res/drawable-xhdpi/icon.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/drawer_shadow.9.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/drawer_shadow.9.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xxhdpi/drawer_shadow.9.png
rename to OpenPGP-Keychain/src/main/res/drawable-xxhdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_add_person.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_add_person.png
rename to OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_discard.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_discard.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_discard.png
rename to OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_import_export.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_import_export.png
rename to OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_share.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_share.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_share.png
rename to OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_drawer.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_drawer.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xxhdpi/ic_drawer.png
rename to OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/icon.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xxhdpi/icon.png
rename to OpenPGP-Keychain/src/main/res/drawable-xxhdpi/icon.png
diff --git a/OpenPGP-Keychain/res/drawable-xxxhdpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-xxxhdpi/icon.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable-xxxhdpi/icon.png
rename to OpenPGP-Keychain/src/main/res/drawable-xxxhdpi/icon.png
diff --git a/OpenPGP-Keychain/res/drawable/certify_small.png b/OpenPGP-Keychain/src/main/res/drawable/certify_small.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable/certify_small.png
rename to OpenPGP-Keychain/src/main/res/drawable/certify_small.png
diff --git a/OpenPGP-Keychain/res/drawable/encrypted_small.png b/OpenPGP-Keychain/src/main/res/drawable/encrypted_small.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable/encrypted_small.png
rename to OpenPGP-Keychain/src/main/res/drawable/encrypted_small.png
diff --git a/OpenPGP-Keychain/res/drawable/ic_next.png b/OpenPGP-Keychain/src/main/res/drawable/ic_next.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable/ic_next.png
rename to OpenPGP-Keychain/src/main/res/drawable/ic_next.png
diff --git a/OpenPGP-Keychain/res/drawable/ic_previous.png b/OpenPGP-Keychain/src/main/res/drawable/ic_previous.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable/ic_previous.png
rename to OpenPGP-Keychain/src/main/res/drawable/ic_previous.png
diff --git a/OpenPGP-Keychain/res/drawable/key_small.png b/OpenPGP-Keychain/src/main/res/drawable/key_small.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable/key_small.png
rename to OpenPGP-Keychain/src/main/res/drawable/key_small.png
diff --git a/OpenPGP-Keychain/res/drawable/overlay_error.png b/OpenPGP-Keychain/src/main/res/drawable/overlay_error.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable/overlay_error.png
rename to OpenPGP-Keychain/src/main/res/drawable/overlay_error.png
diff --git a/OpenPGP-Keychain/res/drawable/overlay_ok.png b/OpenPGP-Keychain/src/main/res/drawable/overlay_ok.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable/overlay_ok.png
rename to OpenPGP-Keychain/src/main/res/drawable/overlay_ok.png
diff --git a/OpenPGP-Keychain/res/drawable/section_header.xml b/OpenPGP-Keychain/src/main/res/drawable/section_header.xml
similarity index 100%
rename from OpenPGP-Keychain/res/drawable/section_header.xml
rename to OpenPGP-Keychain/src/main/res/drawable/section_header.xml
diff --git a/OpenPGP-Keychain/res/drawable/signed_large.png b/OpenPGP-Keychain/src/main/res/drawable/signed_large.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable/signed_large.png
rename to OpenPGP-Keychain/src/main/res/drawable/signed_large.png
diff --git a/OpenPGP-Keychain/res/drawable/signed_small.png b/OpenPGP-Keychain/src/main/res/drawable/signed_small.png
similarity index 100%
rename from OpenPGP-Keychain/res/drawable/signed_small.png
rename to OpenPGP-Keychain/src/main/res/drawable/signed_small.png
diff --git a/OpenPGP-Keychain/res/layout/actionbar_custom_view_done.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/actionbar_custom_view_done.xml
rename to OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml
diff --git a/OpenPGP-Keychain/res/layout/actionbar_custom_view_done_cancel.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/actionbar_custom_view_done_cancel.xml
rename to OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
diff --git a/OpenPGP-Keychain/res/layout/actionbar_include_cancel_button.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/actionbar_include_cancel_button.xml
rename to OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml
diff --git a/OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml
rename to OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml
diff --git a/OpenPGP-Keychain/res/layout/api_app_error_message.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/api_app_error_message.xml
rename to OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml
diff --git a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/api_app_register_activity.xml
rename to OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/api_app_select_pub_keys_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_select_pub_keys_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/api_app_select_pub_keys_activity.xml
rename to OpenPGP-Keychain/src/main/res/layout/api_app_select_pub_keys_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
rename to OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml
rename to OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/api_apps_adapter_list_item.xml b/OpenPGP-Keychain/src/main/res/layout/api_apps_adapter_list_item.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/api_apps_adapter_list_item.xml
rename to OpenPGP-Keychain/src/main/res/layout/api_apps_adapter_list_item.xml
diff --git a/OpenPGP-Keychain/res/layout/api_apps_list_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/api_apps_list_activity.xml
rename to OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/create_key_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/create_key_dialog.xml
rename to OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml
diff --git a/OpenPGP-Keychain/res/layout/decrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/decrypt_activity.xml
rename to OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/drawer_list.xml b/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/drawer_list.xml
rename to OpenPGP-Keychain/src/main/res/layout/drawer_list.xml
diff --git a/OpenPGP-Keychain/res/layout/drawer_list_item.xml b/OpenPGP-Keychain/src/main/res/layout/drawer_list_item.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/drawer_list_item.xml
rename to OpenPGP-Keychain/src/main/res/layout/drawer_list_item.xml
diff --git a/OpenPGP-Keychain/res/layout/edit_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/edit_key_activity.xml
rename to OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/edit_key_key_item.xml
rename to OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml
diff --git a/OpenPGP-Keychain/res/layout/edit_key_section.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_section.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/edit_key_section.xml
rename to OpenPGP-Keychain/src/main/res/layout/edit_key_section.xml
diff --git a/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml
rename to OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml
diff --git a/OpenPGP-Keychain/res/layout/encrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/encrypt_activity.xml
rename to OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/file_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/file_dialog.xml
rename to OpenPGP-Keychain/src/main/res/layout/file_dialog.xml
diff --git a/OpenPGP-Keychain/res/layout/help_about_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/help_about_fragment.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/help_about_fragment.xml
rename to OpenPGP-Keychain/src/main/res/layout/help_about_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/help_activity.xml b/OpenPGP-Keychain/src/main/res/layout/help_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/help_activity.xml
rename to OpenPGP-Keychain/src/main/res/layout/help_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_activity.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/import_keys_activity.xml
rename to OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_clipboard_fragment.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml
rename to OpenPGP-Keychain/src/main/res/layout/import_keys_clipboard_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_file_fragment.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml
rename to OpenPGP-Keychain/src/main/res/layout/import_keys_file_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_keyserver_fragment.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml
rename to OpenPGP-Keychain/src/main/res/layout/import_keys_keyserver_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_list_entry.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/import_keys_list_entry.xml
rename to OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_list_entry_user_id.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry_user_id.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/import_keys_list_entry_user_id.xml
rename to OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry_user_id.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_nfc_fragment.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml
rename to OpenPGP-Keychain/src/main/res/layout/import_keys_nfc_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_qr_code_fragment.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml
rename to OpenPGP-Keychain/src/main/res/layout/import_keys_qr_code_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/key_list_item.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/key_list_item.xml
rename to OpenPGP-Keychain/src/main/res/layout/key_list_item.xml
diff --git a/OpenPGP-Keychain/res/layout/key_list_public_activity.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_public_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/key_list_public_activity.xml
rename to OpenPGP-Keychain/src/main/res/layout/key_list_public_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/key_list_public_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_public_fragment.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/key_list_public_fragment.xml
rename to OpenPGP-Keychain/src/main/res/layout/key_list_public_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/key_list_public_header.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_public_header.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/key_list_public_header.xml
rename to OpenPGP-Keychain/src/main/res/layout/key_list_public_header.xml
diff --git a/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_secret_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/key_list_secret_activity.xml
rename to OpenPGP-Keychain/src/main/res/layout/key_list_secret_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/key_server_editor.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/key_server_editor.xml
rename to OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml
diff --git a/OpenPGP-Keychain/res/layout/key_server_export.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_export.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/key_server_export.xml
rename to OpenPGP-Keychain/src/main/res/layout/key_server_export.xml
diff --git a/OpenPGP-Keychain/res/layout/key_server_preference.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/key_server_preference.xml
rename to OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
diff --git a/OpenPGP-Keychain/res/layout/key_server_query.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_query.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/key_server_query.xml
rename to OpenPGP-Keychain/src/main/res/layout/key_server_query.xml
diff --git a/OpenPGP-Keychain/res/layout/key_server_query_result_item.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_query_result_item.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/key_server_query_result_item.xml
rename to OpenPGP-Keychain/src/main/res/layout/key_server_query_result_item.xml
diff --git a/OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_query_result_user_id.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml
rename to OpenPGP-Keychain/src/main/res/layout/key_server_query_result_user_id.xml
diff --git a/OpenPGP-Keychain/res/layout/passphrase_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/passphrase_dialog.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/passphrase_dialog.xml
rename to OpenPGP-Keychain/src/main/res/layout/passphrase_dialog.xml
diff --git a/OpenPGP-Keychain/res/layout/passphrase_repeat_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/passphrase_repeat_dialog.xml
rename to OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml
diff --git a/OpenPGP-Keychain/res/layout/select_key_item.xml b/OpenPGP-Keychain/src/main/res/layout/select_key_item.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/select_key_item.xml
rename to OpenPGP-Keychain/src/main/res/layout/select_key_item.xml
diff --git a/OpenPGP-Keychain/res/layout/select_public_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/select_public_key_activity.xml
rename to OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/select_secret_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/select_secret_key_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/select_secret_key_activity.xml
rename to OpenPGP-Keychain/src/main/res/layout/select_secret_key_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/select_secret_key_layout_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/select_secret_key_layout_fragment.xml
rename to OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml
diff --git a/OpenPGP-Keychain/res/layout/share_qr_code_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/share_qr_code_dialog.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/share_qr_code_dialog.xml
rename to OpenPGP-Keychain/src/main/res/layout/share_qr_code_dialog.xml
diff --git a/OpenPGP-Keychain/res/layout/sign_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/sign_key_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/sign_key_activity.xml
rename to OpenPGP-Keychain/src/main/res/layout/sign_key_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/view_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/view_key_activity.xml
rename to OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml
diff --git a/OpenPGP-Keychain/res/layout/view_key_keys_item.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/view_key_keys_item.xml
rename to OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml
diff --git a/OpenPGP-Keychain/res/layout/view_key_userids_item.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml
similarity index 100%
rename from OpenPGP-Keychain/res/layout/view_key_userids_item.xml
rename to OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml
diff --git a/OpenPGP-Keychain/res/menu/api_app_settings.xml b/OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml
similarity index 100%
rename from OpenPGP-Keychain/res/menu/api_app_settings.xml
rename to OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml
diff --git a/OpenPGP-Keychain/res/menu/key_edit.xml b/OpenPGP-Keychain/src/main/res/menu/key_edit.xml
similarity index 100%
rename from OpenPGP-Keychain/res/menu/key_edit.xml
rename to OpenPGP-Keychain/src/main/res/menu/key_edit.xml
diff --git a/OpenPGP-Keychain/res/menu/key_list_public.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml
similarity index 100%
rename from OpenPGP-Keychain/res/menu/key_list_public.xml
rename to OpenPGP-Keychain/src/main/res/menu/key_list_public.xml
diff --git a/OpenPGP-Keychain/res/menu/key_list_public_multi.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_public_multi.xml
similarity index 100%
rename from OpenPGP-Keychain/res/menu/key_list_public_multi.xml
rename to OpenPGP-Keychain/src/main/res/menu/key_list_public_multi.xml
diff --git a/OpenPGP-Keychain/res/menu/key_list_secret.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
similarity index 100%
rename from OpenPGP-Keychain/res/menu/key_list_secret.xml
rename to OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
diff --git a/OpenPGP-Keychain/res/menu/key_list_secret_multi.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
similarity index 100%
rename from OpenPGP-Keychain/res/menu/key_list_secret_multi.xml
rename to OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
diff --git a/OpenPGP-Keychain/res/menu/key_view.xml b/OpenPGP-Keychain/src/main/res/menu/key_view.xml
similarity index 100%
rename from OpenPGP-Keychain/res/menu/key_view.xml
rename to OpenPGP-Keychain/src/main/res/menu/key_view.xml
diff --git a/OpenPGP-Keychain/res/raw-de/help_about.html b/OpenPGP-Keychain/src/main/res/raw-de/help_about.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-de/help_about.html
rename to OpenPGP-Keychain/src/main/res/raw-de/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-de/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-de/help_changelog.html
rename to OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-de/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-de/help_nfc_beam.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-de/help_nfc_beam.html
rename to OpenPGP-Keychain/src/main/res/raw-de/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-de/help_start.html b/OpenPGP-Keychain/src/main/res/raw-de/help_start.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-de/help_start.html
rename to OpenPGP-Keychain/src/main/res/raw-de/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-de/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-de/nfc_beam_share.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-de/nfc_beam_share.html
rename to OpenPGP-Keychain/src/main/res/raw-de/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-es-rCO/help_about.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-es-rCO/help_about.html
rename to OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-es-rCO/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-es-rCO/help_changelog.html
rename to OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-es-rCO/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_nfc_beam.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-es-rCO/help_nfc_beam.html
rename to OpenPGP-Keychain/src/main/res/raw-es-rCO/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-es-rCO/help_start.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-es-rCO/help_start.html
rename to OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-es-rCO/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/nfc_beam_share.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-es-rCO/nfc_beam_share.html
rename to OpenPGP-Keychain/src/main/res/raw-es-rCO/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-fr/help_about.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-fr/help_about.html
rename to OpenPGP-Keychain/src/main/res/raw-fr/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-fr/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-fr/help_changelog.html
rename to OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-fr/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_nfc_beam.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-fr/help_nfc_beam.html
rename to OpenPGP-Keychain/src/main/res/raw-fr/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-fr/help_start.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-fr/help_start.html
rename to OpenPGP-Keychain/src/main/res/raw-fr/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-fr/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-fr/nfc_beam_share.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-fr/nfc_beam_share.html
rename to OpenPGP-Keychain/src/main/res/raw-fr/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-it-rIT/help_about.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-it-rIT/help_about.html
rename to OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-it-rIT/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-it-rIT/help_changelog.html
rename to OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-it-rIT/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_nfc_beam.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-it-rIT/help_nfc_beam.html
rename to OpenPGP-Keychain/src/main/res/raw-it-rIT/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-it-rIT/help_start.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-it-rIT/help_start.html
rename to OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-it-rIT/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/nfc_beam_share.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-it-rIT/nfc_beam_share.html
rename to OpenPGP-Keychain/src/main/res/raw-it-rIT/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-nl-rNL/help_about.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-nl-rNL/help_about.html
rename to OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-nl-rNL/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-nl-rNL/help_changelog.html
rename to OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-nl-rNL/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_nfc_beam.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-nl-rNL/help_nfc_beam.html
rename to OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-nl-rNL/help_start.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-nl-rNL/help_start.html
rename to OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-nl-rNL/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/nfc_beam_share.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-nl-rNL/nfc_beam_share.html
rename to OpenPGP-Keychain/src/main/res/raw-nl-rNL/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-pt-rBR/help_about.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-pt-rBR/help_about.html
rename to OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-pt-rBR/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-pt-rBR/help_changelog.html
rename to OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-pt-rBR/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_nfc_beam.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-pt-rBR/help_nfc_beam.html
rename to OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-pt-rBR/help_start.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-pt-rBR/help_start.html
rename to OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-pt-rBR/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/nfc_beam_share.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-pt-rBR/nfc_beam_share.html
rename to OpenPGP-Keychain/src/main/res/raw-pt-rBR/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-ru/help_about.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-ru/help_about.html
rename to OpenPGP-Keychain/src/main/res/raw-ru/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-ru/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-ru/help_changelog.html
rename to OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-ru/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_nfc_beam.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-ru/help_nfc_beam.html
rename to OpenPGP-Keychain/src/main/res/raw-ru/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-ru/help_start.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-ru/help_start.html
rename to OpenPGP-Keychain/src/main/res/raw-ru/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-ru/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-ru/nfc_beam_share.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-ru/nfc_beam_share.html
rename to OpenPGP-Keychain/src/main/res/raw-ru/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-sl-rSI/help_about.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-sl-rSI/help_about.html
rename to OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-sl-rSI/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-sl-rSI/help_changelog.html
rename to OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-sl-rSI/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-sl-rSI/help_nfc_beam.html
rename to OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-sl-rSI/help_start.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-sl-rSI/help_start.html
rename to OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-sl-rSI/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-sl-rSI/nfc_beam_share.html
rename to OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-tr/help_about.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-tr/help_about.html
rename to OpenPGP-Keychain/src/main/res/raw-tr/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-tr/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-tr/help_changelog.html
rename to OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-tr/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_nfc_beam.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-tr/help_nfc_beam.html
rename to OpenPGP-Keychain/src/main/res/raw-tr/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-tr/help_start.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-tr/help_start.html
rename to OpenPGP-Keychain/src/main/res/raw-tr/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-tr/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-tr/nfc_beam_share.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-tr/nfc_beam_share.html
rename to OpenPGP-Keychain/src/main/res/raw-tr/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-uk/help_about.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-uk/help_about.html
rename to OpenPGP-Keychain/src/main/res/raw-uk/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-uk/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-uk/help_changelog.html
rename to OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-uk/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_nfc_beam.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-uk/help_nfc_beam.html
rename to OpenPGP-Keychain/src/main/res/raw-uk/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-uk/help_start.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-uk/help_start.html
rename to OpenPGP-Keychain/src/main/res/raw-uk/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-uk/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-uk/nfc_beam_share.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-uk/nfc_beam_share.html
rename to OpenPGP-Keychain/src/main/res/raw-uk/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw-zh/help_about.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-zh/help_about.html
rename to OpenPGP-Keychain/src/main/res/raw-zh/help_about.html
diff --git a/OpenPGP-Keychain/res/raw-zh/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-zh/help_changelog.html
rename to OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw-zh/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-zh/help_nfc_beam.html
rename to OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw-zh/help_start.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-zh/help_start.html
rename to OpenPGP-Keychain/src/main/res/raw-zh/help_start.html
diff --git a/OpenPGP-Keychain/res/raw-zh/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw-zh/nfc_beam_share.html
rename to OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/raw/help_about.html b/OpenPGP-Keychain/src/main/res/raw/help_about.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw/help_about.html
rename to OpenPGP-Keychain/src/main/res/raw/help_about.html
diff --git a/OpenPGP-Keychain/res/raw/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw/help_changelog.html
rename to OpenPGP-Keychain/src/main/res/raw/help_changelog.html
diff --git a/OpenPGP-Keychain/res/raw/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw/help_nfc_beam.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw/help_nfc_beam.html
rename to OpenPGP-Keychain/src/main/res/raw/help_nfc_beam.html
diff --git a/OpenPGP-Keychain/res/raw/help_start.html b/OpenPGP-Keychain/src/main/res/raw/help_start.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw/help_start.html
rename to OpenPGP-Keychain/src/main/res/raw/help_start.html
diff --git a/OpenPGP-Keychain/res/raw/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw/nfc_beam_share.html
similarity index 100%
rename from OpenPGP-Keychain/res/raw/nfc_beam_share.html
rename to OpenPGP-Keychain/src/main/res/raw/nfc_beam_share.html
diff --git a/OpenPGP-Keychain/res/values-de/strings.xml b/OpenPGP-Keychain/src/main/res/values-de/strings.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values-de/strings.xml
rename to OpenPGP-Keychain/src/main/res/values-de/strings.xml
diff --git a/OpenPGP-Keychain/res/values-es-rCO/strings.xml b/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values-es-rCO/strings.xml
rename to OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
diff --git a/OpenPGP-Keychain/res/values-fr/strings.xml b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values-fr/strings.xml
rename to OpenPGP-Keychain/src/main/res/values-fr/strings.xml
diff --git a/OpenPGP-Keychain/res/values-it-rIT/strings.xml b/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values-it-rIT/strings.xml
rename to OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml
diff --git a/OpenPGP-Keychain/res/values-nl-rNL/strings.xml b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values-nl-rNL/strings.xml
rename to OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
diff --git a/OpenPGP-Keychain/res/values-pt-rBR/strings.xml b/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values-pt-rBR/strings.xml
rename to OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml
diff --git a/OpenPGP-Keychain/res/values-ru/strings.xml b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values-ru/strings.xml
rename to OpenPGP-Keychain/src/main/res/values-ru/strings.xml
diff --git a/OpenPGP-Keychain/res/values-sl-rSI/strings.xml b/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values-sl-rSI/strings.xml
rename to OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml
diff --git a/OpenPGP-Keychain/res/values-tr/strings.xml b/OpenPGP-Keychain/src/main/res/values-tr/strings.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values-tr/strings.xml
rename to OpenPGP-Keychain/src/main/res/values-tr/strings.xml
diff --git a/OpenPGP-Keychain/res/values-uk/strings.xml b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values-uk/strings.xml
rename to OpenPGP-Keychain/src/main/res/values-uk/strings.xml
diff --git a/OpenPGP-Keychain/res/values-zh/strings.xml b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values-zh/strings.xml
rename to OpenPGP-Keychain/src/main/res/values-zh/strings.xml
diff --git a/OpenPGP-Keychain/res/values/arrays.xml b/OpenPGP-Keychain/src/main/res/values/arrays.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values/arrays.xml
rename to OpenPGP-Keychain/src/main/res/values/arrays.xml
diff --git a/OpenPGP-Keychain/res/values/colors.xml b/OpenPGP-Keychain/src/main/res/values/colors.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values/colors.xml
rename to OpenPGP-Keychain/src/main/res/values/colors.xml
diff --git a/OpenPGP-Keychain/res/values/static_strings.xml b/OpenPGP-Keychain/src/main/res/values/static_strings.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values/static_strings.xml
rename to OpenPGP-Keychain/src/main/res/values/static_strings.xml
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values/strings.xml
rename to OpenPGP-Keychain/src/main/res/values/strings.xml
diff --git a/OpenPGP-Keychain/res/values/styles.xml b/OpenPGP-Keychain/src/main/res/values/styles.xml
similarity index 100%
rename from OpenPGP-Keychain/res/values/styles.xml
rename to OpenPGP-Keychain/src/main/res/values/styles.xml
diff --git a/OpenPGP-Keychain/res/xml/preferences.xml b/OpenPGP-Keychain/src/main/res/xml/preferences.xml
similarity index 100%
rename from OpenPGP-Keychain/res/xml/preferences.xml
rename to OpenPGP-Keychain/src/main/res/xml/preferences.xml
diff --git a/OpenPGP-Keychain/res/xml/searchable_public_keys.xml b/OpenPGP-Keychain/src/main/res/xml/searchable_public_keys.xml
similarity index 100%
rename from OpenPGP-Keychain/res/xml/searchable_public_keys.xml
rename to OpenPGP-Keychain/src/main/res/xml/searchable_public_keys.xml
diff --git a/OpenPGP-Keychain/res/xml/searchable_secret_keys.xml b/OpenPGP-Keychain/src/main/res/xml/searchable_secret_keys.xml
similarity index 100%
rename from OpenPGP-Keychain/res/xml/searchable_secret_keys.xml
rename to OpenPGP-Keychain/src/main/res/xml/searchable_secret_keys.xml