diff --git a/botejars/custom_rules.xml b/app/botejars.xml
similarity index 85%
rename from botejars/custom_rules.xml
rename to app/botejars.xml
index 6731e12..b2ec8d2 100644
--- a/botejars/custom_rules.xml
+++ b/app/botejars.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="botejars-imported">
+    <property file="local.properties" />
+    <property name="jar.libs.dir" value="libs" />
 
     <!-- override with i2pbase=path/to/source in local.properties -->
     <property environment="env"/>
@@ -23,21 +25,17 @@
     </fail>
     <echo message="Using I2P-Bote source at ${botebase}" />
 
-    <target name="-pre-compile" depends="copyrouterlibs,copybotelibs" />
+    <target name="precompile" depends="copyrouterlibs,copybotelibs" />
 
-    <!--
-         Creates the output directories if they don't exist yet.
-    -->
-    <target name="-dirs">
-        <echo>Creating output directories if needed...</echo>
-        <mkdir dir="${resource.absolute.dir}" />
-        <mkdir dir="${gen.absolute.dir}" />
-        <mkdir dir="${out.absolute.dir}" />
-        <mkdir dir="${out.classes.absolute.dir}" />
-    </target>
-
-    <target name="-pre-clean">
-        <delete dir="${jar.libs.dir}" verbose="${verbose}" />
+    <target name="preclean">
+        <delete verbose="${verbose}">
+            <fileset dir="${jar.libs.dir}">
+                <exclude name="mail.jar" />
+                <exclude name="additionnal.jar" />
+                <exclude name="activation.jar" />
+                <exclude name="tokenautocomplete.jar" />
+            </fileset>
+        </delete>
         <ant dir="${botebase}" inheritall="false" useNativeBasedir="true" >
             <target name="clean" />
         </ant>
@@ -49,7 +47,7 @@
         <fail unless="i2pbase" message="The I2P environment variable is not set.${line.separator}It must point to an I2P installation. It is usually a path of the form ${line.separator}/xxx/yyy/i2p."/>
     </target>
 
-    <target name="copyrouterlibs" depends="-dirs,checki2pbase" >
+    <target name="copyrouterlibs" depends="checki2pbase" >
         <!-- core -->
         <!-- remove classes that are overridden -->
         <!-- lots of unneeded stuff could be deleted here -->
@@ -76,7 +74,7 @@
         </ant>
     </target>
 
-    <target name="copybotelibs" depends="-dirs,buildbote">
+    <target name="copybotelibs" depends="buildbote">
         <!-- bote -->
         <jar destfile="${jar.libs.dir}/i2pbote.jar" >
             <!-- remove classes that are overridden or stubbed out -->
diff --git a/Bote/build.gradle b/app/build.gradle
similarity index 71%
rename from Bote/build.gradle
rename to app/build.gradle
index bbe7dd9..d83cd93 100644
--- a/Bote/build.gradle
+++ b/app/build.gradle
@@ -17,10 +17,11 @@ android {
     }
 }
 
+ant.importBuild('botejars.xml')
+preBuild.dependsOn precompile
+clean.dependsOn preclean
+
 dependencies {
     compile 'com.android.support:appcompat-v7:+'
-    compile files('libs/mail.jar')
-    compile files('libs/additionnal.jar')
-    compile files('libs/activation.jar')
-    compile files('libs/tokenautocomplete.jar')
+    compile fileTree(dir: 'libs', include: '*.jar')
 }
diff --git a/Bote/libs/activation.jar b/app/libs/activation.jar
similarity index 100%
rename from Bote/libs/activation.jar
rename to app/libs/activation.jar
diff --git a/Bote/libs/additionnal.jar b/app/libs/additionnal.jar
similarity index 100%
rename from Bote/libs/additionnal.jar
rename to app/libs/additionnal.jar
diff --git a/Bote/libs/mail.jar b/app/libs/mail.jar
similarity index 100%
rename from Bote/libs/mail.jar
rename to app/libs/mail.jar
diff --git a/Bote/libs/tokenautocomplete.jar b/app/libs/tokenautocomplete.jar
similarity index 100%
rename from Bote/libs/tokenautocomplete.jar
rename to app/libs/tokenautocomplete.jar
diff --git a/Bote/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 100%
rename from Bote/src/main/AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
diff --git a/Bote/src/main/aidl/net/i2p/android/router/service/IRouterState.aidl b/app/src/main/aidl/net/i2p/android/router/service/IRouterState.aidl
similarity index 100%
rename from Bote/src/main/aidl/net/i2p/android/router/service/IRouterState.aidl
rename to app/src/main/aidl/net/i2p/android/router/service/IRouterState.aidl
diff --git a/Bote/src/main/aidl/net/i2p/android/router/service/IRouterStateCallback.aidl b/app/src/main/aidl/net/i2p/android/router/service/IRouterStateCallback.aidl
similarity index 100%
rename from Bote/src/main/aidl/net/i2p/android/router/service/IRouterStateCallback.aidl
rename to app/src/main/aidl/net/i2p/android/router/service/IRouterStateCallback.aidl
diff --git a/Bote/src/main/java/i2p/bote/android/EmailListActivity.java b/app/src/main/java/i2p/bote/android/EmailListActivity.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/EmailListActivity.java
rename to app/src/main/java/i2p/bote/android/EmailListActivity.java
diff --git a/Bote/src/main/java/i2p/bote/android/EmailListAdapter.java b/app/src/main/java/i2p/bote/android/EmailListAdapter.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/EmailListAdapter.java
rename to app/src/main/java/i2p/bote/android/EmailListAdapter.java
diff --git a/Bote/src/main/java/i2p/bote/android/EmailListFragment.java b/app/src/main/java/i2p/bote/android/EmailListFragment.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/EmailListFragment.java
rename to app/src/main/java/i2p/bote/android/EmailListFragment.java
diff --git a/Bote/src/main/java/i2p/bote/android/FolderListAdapter.java b/app/src/main/java/i2p/bote/android/FolderListAdapter.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/FolderListAdapter.java
rename to app/src/main/java/i2p/bote/android/FolderListAdapter.java
diff --git a/Bote/src/main/java/i2p/bote/android/NetworkInfoActivity.java b/app/src/main/java/i2p/bote/android/NetworkInfoActivity.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/NetworkInfoActivity.java
rename to app/src/main/java/i2p/bote/android/NetworkInfoActivity.java
diff --git a/Bote/src/main/java/i2p/bote/android/NetworkInfoFragment.java b/app/src/main/java/i2p/bote/android/NetworkInfoFragment.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/NetworkInfoFragment.java
rename to app/src/main/java/i2p/bote/android/NetworkInfoFragment.java
diff --git a/Bote/src/main/java/i2p/bote/android/NewEmailActivity.java b/app/src/main/java/i2p/bote/android/NewEmailActivity.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/NewEmailActivity.java
rename to app/src/main/java/i2p/bote/android/NewEmailActivity.java
diff --git a/Bote/src/main/java/i2p/bote/android/NewEmailFragment.java b/app/src/main/java/i2p/bote/android/NewEmailFragment.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/NewEmailFragment.java
rename to app/src/main/java/i2p/bote/android/NewEmailFragment.java
diff --git a/Bote/src/main/java/i2p/bote/android/ViewEmailActivity.java b/app/src/main/java/i2p/bote/android/ViewEmailActivity.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/ViewEmailActivity.java
rename to app/src/main/java/i2p/bote/android/ViewEmailActivity.java
diff --git a/Bote/src/main/java/i2p/bote/android/ViewEmailFragment.java b/app/src/main/java/i2p/bote/android/ViewEmailFragment.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/ViewEmailFragment.java
rename to app/src/main/java/i2p/bote/android/ViewEmailFragment.java
diff --git a/Bote/src/main/java/i2p/bote/android/addressbook/AddressBookActivity.java b/app/src/main/java/i2p/bote/android/addressbook/AddressBookActivity.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/addressbook/AddressBookActivity.java
rename to app/src/main/java/i2p/bote/android/addressbook/AddressBookActivity.java
diff --git a/Bote/src/main/java/i2p/bote/android/addressbook/AddressBookFragment.java b/app/src/main/java/i2p/bote/android/addressbook/AddressBookFragment.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/addressbook/AddressBookFragment.java
rename to app/src/main/java/i2p/bote/android/addressbook/AddressBookFragment.java
diff --git a/Bote/src/main/java/i2p/bote/android/addressbook/ContactAdapter.java b/app/src/main/java/i2p/bote/android/addressbook/ContactAdapter.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/addressbook/ContactAdapter.java
rename to app/src/main/java/i2p/bote/android/addressbook/ContactAdapter.java
diff --git a/Bote/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java b/app/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java
rename to app/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java
diff --git a/Bote/src/main/java/i2p/bote/android/addressbook/EditContactFragment.java b/app/src/main/java/i2p/bote/android/addressbook/EditContactFragment.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/addressbook/EditContactFragment.java
rename to app/src/main/java/i2p/bote/android/addressbook/EditContactFragment.java
diff --git a/Bote/src/main/java/i2p/bote/android/config/EditIdentityActivity.java b/app/src/main/java/i2p/bote/android/config/EditIdentityActivity.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/config/EditIdentityActivity.java
rename to app/src/main/java/i2p/bote/android/config/EditIdentityActivity.java
diff --git a/Bote/src/main/java/i2p/bote/android/config/EditIdentityFragment.java b/app/src/main/java/i2p/bote/android/config/EditIdentityFragment.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/config/EditIdentityFragment.java
rename to app/src/main/java/i2p/bote/android/config/EditIdentityFragment.java
diff --git a/Bote/src/main/java/i2p/bote/android/config/SetPasswordActivity.java b/app/src/main/java/i2p/bote/android/config/SetPasswordActivity.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/config/SetPasswordActivity.java
rename to app/src/main/java/i2p/bote/android/config/SetPasswordActivity.java
diff --git a/Bote/src/main/java/i2p/bote/android/config/SetPasswordFragment.java b/app/src/main/java/i2p/bote/android/config/SetPasswordFragment.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/config/SetPasswordFragment.java
rename to app/src/main/java/i2p/bote/android/config/SetPasswordFragment.java
diff --git a/Bote/src/main/java/i2p/bote/android/config/SettingsActivity.java b/app/src/main/java/i2p/bote/android/config/SettingsActivity.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/config/SettingsActivity.java
rename to app/src/main/java/i2p/bote/android/config/SettingsActivity.java
diff --git a/Bote/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java b/app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java
rename to app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java
diff --git a/Bote/src/main/java/i2p/bote/android/config/ViewIdentityFragment.java b/app/src/main/java/i2p/bote/android/config/ViewIdentityFragment.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/config/ViewIdentityFragment.java
rename to app/src/main/java/i2p/bote/android/config/ViewIdentityFragment.java
diff --git a/Bote/src/main/java/i2p/bote/android/service/BoteService.java b/app/src/main/java/i2p/bote/android/service/BoteService.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/service/BoteService.java
rename to app/src/main/java/i2p/bote/android/service/BoteService.java
diff --git a/Bote/src/main/java/i2p/bote/android/service/Init.java b/app/src/main/java/i2p/bote/android/service/Init.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/service/Init.java
rename to app/src/main/java/i2p/bote/android/service/Init.java
diff --git a/Bote/src/main/java/i2p/bote/android/util/BetterAsyncTaskLoader.java b/app/src/main/java/i2p/bote/android/util/BetterAsyncTaskLoader.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/util/BetterAsyncTaskLoader.java
rename to app/src/main/java/i2p/bote/android/util/BetterAsyncTaskLoader.java
diff --git a/Bote/src/main/java/i2p/bote/android/util/BoteHelper.java b/app/src/main/java/i2p/bote/android/util/BoteHelper.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/util/BoteHelper.java
rename to app/src/main/java/i2p/bote/android/util/BoteHelper.java
diff --git a/Bote/src/main/java/i2p/bote/android/util/ContactsCompletionView.java b/app/src/main/java/i2p/bote/android/util/ContactsCompletionView.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/util/ContactsCompletionView.java
rename to app/src/main/java/i2p/bote/android/util/ContactsCompletionView.java
diff --git a/Bote/src/main/java/i2p/bote/android/util/EditPictureFragment.java b/app/src/main/java/i2p/bote/android/util/EditPictureFragment.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/util/EditPictureFragment.java
rename to app/src/main/java/i2p/bote/android/util/EditPictureFragment.java
diff --git a/Bote/src/main/java/i2p/bote/android/util/IntEditTextPreference.java b/app/src/main/java/i2p/bote/android/util/IntEditTextPreference.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/util/IntEditTextPreference.java
rename to app/src/main/java/i2p/bote/android/util/IntEditTextPreference.java
diff --git a/Bote/src/main/java/i2p/bote/android/util/MoveToDialogFragment.java b/app/src/main/java/i2p/bote/android/util/MoveToDialogFragment.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/util/MoveToDialogFragment.java
rename to app/src/main/java/i2p/bote/android/util/MoveToDialogFragment.java
diff --git a/Bote/src/main/java/i2p/bote/android/util/Person.java b/app/src/main/java/i2p/bote/android/util/Person.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/util/Person.java
rename to app/src/main/java/i2p/bote/android/util/Person.java
diff --git a/Bote/src/main/java/i2p/bote/android/util/RobustAsyncTask.java b/app/src/main/java/i2p/bote/android/util/RobustAsyncTask.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/util/RobustAsyncTask.java
rename to app/src/main/java/i2p/bote/android/util/RobustAsyncTask.java
diff --git a/Bote/src/main/java/i2p/bote/android/util/SummaryEditTextPreference.java b/app/src/main/java/i2p/bote/android/util/SummaryEditTextPreference.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/util/SummaryEditTextPreference.java
rename to app/src/main/java/i2p/bote/android/util/SummaryEditTextPreference.java
diff --git a/Bote/src/main/java/i2p/bote/android/util/TaskFragment.java b/app/src/main/java/i2p/bote/android/util/TaskFragment.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/android/util/TaskFragment.java
rename to app/src/main/java/i2p/bote/android/util/TaskFragment.java
diff --git a/Bote/src/main/java/i2p/bote/imap/ImapService.java b/app/src/main/java/i2p/bote/imap/ImapService.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/imap/ImapService.java
rename to app/src/main/java/i2p/bote/imap/ImapService.java
diff --git a/Bote/src/main/java/i2p/bote/service/seedless/SeedlessInitializer.java b/app/src/main/java/i2p/bote/service/seedless/SeedlessInitializer.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/service/seedless/SeedlessInitializer.java
rename to app/src/main/java/i2p/bote/service/seedless/SeedlessInitializer.java
diff --git a/Bote/src/main/java/i2p/bote/smtp/SmtpService.java b/app/src/main/java/i2p/bote/smtp/SmtpService.java
similarity index 100%
rename from Bote/src/main/java/i2p/bote/smtp/SmtpService.java
rename to app/src/main/java/i2p/bote/smtp/SmtpService.java
diff --git a/Bote/src/main/java/net/i2p/util/LogWriter.java b/app/src/main/java/net/i2p/util/LogWriter.java
similarity index 100%
rename from Bote/src/main/java/net/i2p/util/LogWriter.java
rename to app/src/main/java/net/i2p/util/LogWriter.java
diff --git a/Bote/src/main/jniLibs/armeabi/libscrypt.so b/app/src/main/jniLibs/armeabi/libscrypt.so
similarity index 100%
rename from Bote/src/main/jniLibs/armeabi/libscrypt.so
rename to app/src/main/jniLibs/armeabi/libscrypt.so
diff --git a/Bote/src/main/res/drawable-hdpi/drawer_shadow.9.png b/app/src/main/res/drawable-hdpi/drawer_shadow.9.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/drawer_shadow.9.png
rename to app/src/main/res/drawable-hdpi/drawer_shadow.9.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_collections_collection.png b/app/src/main/res/drawable-hdpi/ic_collections_collection.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_collections_collection.png
rename to app/src/main/res/drawable-hdpi/ic_collections_collection.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_contact_picture.png b/app/src/main/res/drawable-hdpi/ic_contact_picture.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_contact_picture.png
rename to app/src/main/res/drawable-hdpi/ic_contact_picture.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_content_attachment.png b/app/src/main/res/drawable-hdpi/ic_content_attachment.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_content_attachment.png
rename to app/src/main/res/drawable-hdpi/ic_content_attachment.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_content_discard.png b/app/src/main/res/drawable-hdpi/ic_content_discard.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_content_discard.png
rename to app/src/main/res/drawable-hdpi/ic_content_discard.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_content_edit.png b/app/src/main/res/drawable-hdpi/ic_content_edit.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_content_edit.png
rename to app/src/main/res/drawable-hdpi/ic_content_edit.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_content_new_email.png b/app/src/main/res/drawable-hdpi/ic_content_new_email.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_content_new_email.png
rename to app/src/main/res/drawable-hdpi/ic_content_new_email.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_content_read.png b/app/src/main/res/drawable-hdpi/ic_content_read.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_content_read.png
rename to app/src/main/res/drawable-hdpi/ic_content_read.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_content_save.png b/app/src/main/res/drawable-hdpi/ic_content_save.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_content_save.png
rename to app/src/main/res/drawable-hdpi/ic_content_save.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_content_unread.png b/app/src/main/res/drawable-hdpi/ic_content_unread.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_content_unread.png
rename to app/src/main/res/drawable-hdpi/ic_content_unread.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_device_access_new_account.png b/app/src/main/res/drawable-hdpi/ic_device_access_new_account.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_device_access_new_account.png
rename to app/src/main/res/drawable-hdpi/ic_device_access_new_account.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_drawer.png b/app/src/main/res/drawable-hdpi/ic_drawer.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_drawer.png
rename to app/src/main/res/drawable-hdpi/ic_drawer.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_launcher.png
rename to app/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_navigation_accept.png b/app/src/main/res/drawable-hdpi/ic_navigation_accept.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_navigation_accept.png
rename to app/src/main/res/drawable-hdpi/ic_navigation_accept.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_social_add_person.png b/app/src/main/res/drawable-hdpi/ic_social_add_person.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_social_add_person.png
rename to app/src/main/res/drawable-hdpi/ic_social_add_person.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_social_reply.png b/app/src/main/res/drawable-hdpi/ic_social_reply.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_social_reply.png
rename to app/src/main/res/drawable-hdpi/ic_social_reply.png
diff --git a/Bote/src/main/res/drawable-hdpi/ic_social_send_now.png b/app/src/main/res/drawable-hdpi/ic_social_send_now.png
similarity index 100%
rename from Bote/src/main/res/drawable-hdpi/ic_social_send_now.png
rename to app/src/main/res/drawable-hdpi/ic_social_send_now.png
diff --git a/Bote/src/main/res/drawable-mdpi/drawer_shadow.9.png b/app/src/main/res/drawable-mdpi/drawer_shadow.9.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/drawer_shadow.9.png
rename to app/src/main/res/drawable-mdpi/drawer_shadow.9.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_collections_collection.png b/app/src/main/res/drawable-mdpi/ic_collections_collection.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_collections_collection.png
rename to app/src/main/res/drawable-mdpi/ic_collections_collection.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_contact_picture.png b/app/src/main/res/drawable-mdpi/ic_contact_picture.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_contact_picture.png
rename to app/src/main/res/drawable-mdpi/ic_contact_picture.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_content_attachment.png b/app/src/main/res/drawable-mdpi/ic_content_attachment.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_content_attachment.png
rename to app/src/main/res/drawable-mdpi/ic_content_attachment.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_content_discard.png b/app/src/main/res/drawable-mdpi/ic_content_discard.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_content_discard.png
rename to app/src/main/res/drawable-mdpi/ic_content_discard.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_content_edit.png b/app/src/main/res/drawable-mdpi/ic_content_edit.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_content_edit.png
rename to app/src/main/res/drawable-mdpi/ic_content_edit.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_content_new_email.png b/app/src/main/res/drawable-mdpi/ic_content_new_email.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_content_new_email.png
rename to app/src/main/res/drawable-mdpi/ic_content_new_email.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_content_read.png b/app/src/main/res/drawable-mdpi/ic_content_read.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_content_read.png
rename to app/src/main/res/drawable-mdpi/ic_content_read.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_content_save.png b/app/src/main/res/drawable-mdpi/ic_content_save.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_content_save.png
rename to app/src/main/res/drawable-mdpi/ic_content_save.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_content_unread.png b/app/src/main/res/drawable-mdpi/ic_content_unread.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_content_unread.png
rename to app/src/main/res/drawable-mdpi/ic_content_unread.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_device_access_new_account.png b/app/src/main/res/drawable-mdpi/ic_device_access_new_account.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_device_access_new_account.png
rename to app/src/main/res/drawable-mdpi/ic_device_access_new_account.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_drawer.png b/app/src/main/res/drawable-mdpi/ic_drawer.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_drawer.png
rename to app/src/main/res/drawable-mdpi/ic_drawer.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_launcher.png
rename to app/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_navigation_accept.png b/app/src/main/res/drawable-mdpi/ic_navigation_accept.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_navigation_accept.png
rename to app/src/main/res/drawable-mdpi/ic_navigation_accept.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_social_add_person.png b/app/src/main/res/drawable-mdpi/ic_social_add_person.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_social_add_person.png
rename to app/src/main/res/drawable-mdpi/ic_social_add_person.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_social_reply.png b/app/src/main/res/drawable-mdpi/ic_social_reply.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_social_reply.png
rename to app/src/main/res/drawable-mdpi/ic_social_reply.png
diff --git a/Bote/src/main/res/drawable-mdpi/ic_social_send_now.png b/app/src/main/res/drawable-mdpi/ic_social_send_now.png
similarity index 100%
rename from Bote/src/main/res/drawable-mdpi/ic_social_send_now.png
rename to app/src/main/res/drawable-mdpi/ic_social_send_now.png
diff --git a/Bote/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/drawer_shadow.9.png
rename to app/src/main/res/drawable-xhdpi/drawer_shadow.9.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_collections_collection.png b/app/src/main/res/drawable-xhdpi/ic_collections_collection.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_collections_collection.png
rename to app/src/main/res/drawable-xhdpi/ic_collections_collection.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_contact_picture.png b/app/src/main/res/drawable-xhdpi/ic_contact_picture.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_contact_picture.png
rename to app/src/main/res/drawable-xhdpi/ic_contact_picture.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_content_attachment.png b/app/src/main/res/drawable-xhdpi/ic_content_attachment.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_content_attachment.png
rename to app/src/main/res/drawable-xhdpi/ic_content_attachment.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_content_discard.png b/app/src/main/res/drawable-xhdpi/ic_content_discard.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_content_discard.png
rename to app/src/main/res/drawable-xhdpi/ic_content_discard.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_content_edit.png b/app/src/main/res/drawable-xhdpi/ic_content_edit.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_content_edit.png
rename to app/src/main/res/drawable-xhdpi/ic_content_edit.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_content_new_email.png b/app/src/main/res/drawable-xhdpi/ic_content_new_email.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_content_new_email.png
rename to app/src/main/res/drawable-xhdpi/ic_content_new_email.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_content_read.png b/app/src/main/res/drawable-xhdpi/ic_content_read.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_content_read.png
rename to app/src/main/res/drawable-xhdpi/ic_content_read.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_content_save.png b/app/src/main/res/drawable-xhdpi/ic_content_save.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_content_save.png
rename to app/src/main/res/drawable-xhdpi/ic_content_save.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_content_unread.png b/app/src/main/res/drawable-xhdpi/ic_content_unread.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_content_unread.png
rename to app/src/main/res/drawable-xhdpi/ic_content_unread.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_device_access_new_account.png b/app/src/main/res/drawable-xhdpi/ic_device_access_new_account.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_device_access_new_account.png
rename to app/src/main/res/drawable-xhdpi/ic_device_access_new_account.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_drawer.png b/app/src/main/res/drawable-xhdpi/ic_drawer.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_drawer.png
rename to app/src/main/res/drawable-xhdpi/ic_drawer.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_launcher.png
rename to app/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_navigation_accept.png b/app/src/main/res/drawable-xhdpi/ic_navigation_accept.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_navigation_accept.png
rename to app/src/main/res/drawable-xhdpi/ic_navigation_accept.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_social_add_person.png b/app/src/main/res/drawable-xhdpi/ic_social_add_person.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_social_add_person.png
rename to app/src/main/res/drawable-xhdpi/ic_social_add_person.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_social_reply.png b/app/src/main/res/drawable-xhdpi/ic_social_reply.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_social_reply.png
rename to app/src/main/res/drawable-xhdpi/ic_social_reply.png
diff --git a/Bote/src/main/res/drawable-xhdpi/ic_social_send_now.png b/app/src/main/res/drawable-xhdpi/ic_social_send_now.png
similarity index 100%
rename from Bote/src/main/res/drawable-xhdpi/ic_social_send_now.png
rename to app/src/main/res/drawable-xhdpi/ic_social_send_now.png
diff --git a/Bote/src/main/res/drawable/folder_activated_background.xml b/app/src/main/res/drawable/folder_activated_background.xml
similarity index 100%
rename from Bote/src/main/res/drawable/folder_activated_background.xml
rename to app/src/main/res/drawable/folder_activated_background.xml
diff --git a/Bote/src/main/res/drawable/token_background.xml b/app/src/main/res/drawable/token_background.xml
similarity index 100%
rename from Bote/src/main/res/drawable/token_background.xml
rename to app/src/main/res/drawable/token_background.xml
diff --git a/Bote/src/main/res/layout/activity_edit_identity.xml b/app/src/main/res/layout/activity_edit_identity.xml
similarity index 100%
rename from Bote/src/main/res/layout/activity_edit_identity.xml
rename to app/src/main/res/layout/activity_edit_identity.xml
diff --git a/Bote/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from Bote/src/main/res/layout/activity_main.xml
rename to app/src/main/res/layout/activity_main.xml
diff --git a/Bote/src/main/res/layout/activity_set_password.xml b/app/src/main/res/layout/activity_set_password.xml
similarity index 100%
rename from Bote/src/main/res/layout/activity_set_password.xml
rename to app/src/main/res/layout/activity_set_password.xml
diff --git a/Bote/src/main/res/layout/activity_view_email.xml b/app/src/main/res/layout/activity_view_email.xml
similarity index 100%
rename from Bote/src/main/res/layout/activity_view_email.xml
rename to app/src/main/res/layout/activity_view_email.xml
diff --git a/Bote/src/main/res/layout/contact_token.xml b/app/src/main/res/layout/contact_token.xml
similarity index 100%
rename from Bote/src/main/res/layout/contact_token.xml
rename to app/src/main/res/layout/contact_token.xml
diff --git a/Bote/src/main/res/layout/dialog_password.xml b/app/src/main/res/layout/dialog_password.xml
similarity index 100%
rename from Bote/src/main/res/layout/dialog_password.xml
rename to app/src/main/res/layout/dialog_password.xml
diff --git a/Bote/src/main/res/layout/dialog_status.xml b/app/src/main/res/layout/dialog_status.xml
similarity index 100%
rename from Bote/src/main/res/layout/dialog_status.xml
rename to app/src/main/res/layout/dialog_status.xml
diff --git a/Bote/src/main/res/layout/fragment_edit_contact.xml b/app/src/main/res/layout/fragment_edit_contact.xml
similarity index 100%
rename from Bote/src/main/res/layout/fragment_edit_contact.xml
rename to app/src/main/res/layout/fragment_edit_contact.xml
diff --git a/Bote/src/main/res/layout/fragment_edit_identity.xml b/app/src/main/res/layout/fragment_edit_identity.xml
similarity index 100%
rename from Bote/src/main/res/layout/fragment_edit_identity.xml
rename to app/src/main/res/layout/fragment_edit_identity.xml
diff --git a/Bote/src/main/res/layout/fragment_network_info.xml b/app/src/main/res/layout/fragment_network_info.xml
similarity index 100%
rename from Bote/src/main/res/layout/fragment_network_info.xml
rename to app/src/main/res/layout/fragment_network_info.xml
diff --git a/Bote/src/main/res/layout/fragment_new_email.xml b/app/src/main/res/layout/fragment_new_email.xml
similarity index 100%
rename from Bote/src/main/res/layout/fragment_new_email.xml
rename to app/src/main/res/layout/fragment_new_email.xml
diff --git a/Bote/src/main/res/layout/fragment_set_password.xml b/app/src/main/res/layout/fragment_set_password.xml
similarity index 100%
rename from Bote/src/main/res/layout/fragment_set_password.xml
rename to app/src/main/res/layout/fragment_set_password.xml
diff --git a/Bote/src/main/res/layout/fragment_view_email.xml b/app/src/main/res/layout/fragment_view_email.xml
similarity index 100%
rename from Bote/src/main/res/layout/fragment_view_email.xml
rename to app/src/main/res/layout/fragment_view_email.xml
diff --git a/Bote/src/main/res/layout/fragment_view_identity.xml b/app/src/main/res/layout/fragment_view_identity.xml
similarity index 100%
rename from Bote/src/main/res/layout/fragment_view_identity.xml
rename to app/src/main/res/layout/fragment_view_identity.xml
diff --git a/Bote/src/main/res/layout/listitem_contact.xml b/app/src/main/res/layout/listitem_contact.xml
similarity index 100%
rename from Bote/src/main/res/layout/listitem_contact.xml
rename to app/src/main/res/layout/listitem_contact.xml
diff --git a/Bote/src/main/res/layout/listitem_email.xml b/app/src/main/res/layout/listitem_email.xml
similarity index 100%
rename from Bote/src/main/res/layout/listitem_email.xml
rename to app/src/main/res/layout/listitem_email.xml
diff --git a/Bote/src/main/res/layout/listitem_folder.xml b/app/src/main/res/layout/listitem_folder.xml
similarity index 100%
rename from Bote/src/main/res/layout/listitem_folder.xml
rename to app/src/main/res/layout/listitem_folder.xml
diff --git a/Bote/src/main/res/layout/preference_header_item.xml b/app/src/main/res/layout/preference_header_item.xml
similarity index 100%
rename from Bote/src/main/res/layout/preference_header_item.xml
rename to app/src/main/res/layout/preference_header_item.xml
diff --git a/Bote/src/main/res/menu/address_book_list.xml b/app/src/main/res/menu/address_book_list.xml
similarity index 100%
rename from Bote/src/main/res/menu/address_book_list.xml
rename to app/src/main/res/menu/address_book_list.xml
diff --git a/Bote/src/main/res/menu/edit_contact.xml b/app/src/main/res/menu/edit_contact.xml
similarity index 100%
rename from Bote/src/main/res/menu/edit_contact.xml
rename to app/src/main/res/menu/edit_contact.xml
diff --git a/Bote/src/main/res/menu/edit_identity.xml b/app/src/main/res/menu/edit_identity.xml
similarity index 100%
rename from Bote/src/main/res/menu/edit_identity.xml
rename to app/src/main/res/menu/edit_identity.xml
diff --git a/Bote/src/main/res/menu/email_list.xml b/app/src/main/res/menu/email_list.xml
similarity index 100%
rename from Bote/src/main/res/menu/email_list.xml
rename to app/src/main/res/menu/email_list.xml
diff --git a/Bote/src/main/res/menu/email_list_context.xml b/app/src/main/res/menu/email_list_context.xml
similarity index 100%
rename from Bote/src/main/res/menu/email_list_context.xml
rename to app/src/main/res/menu/email_list_context.xml
diff --git a/Bote/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
similarity index 100%
rename from Bote/src/main/res/menu/main.xml
rename to app/src/main/res/menu/main.xml
diff --git a/Bote/src/main/res/menu/new_email.xml b/app/src/main/res/menu/new_email.xml
similarity index 100%
rename from Bote/src/main/res/menu/new_email.xml
rename to app/src/main/res/menu/new_email.xml
diff --git a/Bote/src/main/res/menu/set_password.xml b/app/src/main/res/menu/set_password.xml
similarity index 100%
rename from Bote/src/main/res/menu/set_password.xml
rename to app/src/main/res/menu/set_password.xml
diff --git a/Bote/src/main/res/menu/view_email.xml b/app/src/main/res/menu/view_email.xml
similarity index 100%
rename from Bote/src/main/res/menu/view_email.xml
rename to app/src/main/res/menu/view_email.xml
diff --git a/Bote/src/main/res/menu/view_identity.xml b/app/src/main/res/menu/view_identity.xml
similarity index 100%
rename from Bote/src/main/res/menu/view_identity.xml
rename to app/src/main/res/menu/view_identity.xml
diff --git a/Bote/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
similarity index 100%
rename from Bote/src/main/res/values/arrays.xml
rename to app/src/main/res/values/arrays.xml
diff --git a/Bote/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from Bote/src/main/res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/Bote/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 100%
rename from Bote/src/main/res/values/strings.xml
rename to app/src/main/res/values/strings.xml
diff --git a/Bote/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from Bote/src/main/res/values/styles.xml
rename to app/src/main/res/values/styles.xml
diff --git a/Bote/src/main/res/xml/settings_general.xml b/app/src/main/res/xml/settings_general.xml
similarity index 100%
rename from Bote/src/main/res/xml/settings_general.xml
rename to app/src/main/res/xml/settings_general.xml
diff --git a/Bote/src/main/res/xml/settings_headers.xml b/app/src/main/res/xml/settings_headers.xml
similarity index 100%
rename from Bote/src/main/res/xml/settings_headers.xml
rename to app/src/main/res/xml/settings_headers.xml
diff --git a/Bote/src/main/res/xml/settings_headers_legacy.xml b/app/src/main/res/xml/settings_headers_legacy.xml
similarity index 100%
rename from Bote/src/main/res/xml/settings_headers_legacy.xml
rename to app/src/main/res/xml/settings_headers_legacy.xml
diff --git a/botejars/AndroidManifest.xml b/botejars/AndroidManifest.xml
deleted file mode 100644
index 4bbdc6c..0000000
--- a/botejars/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="i2p.bote"
-      android:versionCode="1"
-      android:versionName="0.1"
-      android:installLocation="auto"
-      >
-
-    <uses-sdk android:minSdkVersion="9" />
-
-</manifest>
diff --git a/botejars/build.xml b/botejars/build.xml
deleted file mode 100644
index d2e35d1..0000000
--- a/botejars/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="botejars" 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/botejars/proguard-project.txt b/botejars/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/botejars/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/botejars/project.properties b/botejars/project.properties
deleted file mode 100644
index 61afc8f..0000000
--- a/botejars/project.properties
+++ /dev/null
@@ -1,15 +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 edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-android.library=true
-# Project target.
-target=android-19
diff --git a/botejars/src/README.txt b/botejars/src/README.txt
deleted file mode 100644
index 3852f54..0000000
--- a/botejars/src/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This directory is intentionally blank.
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 33370ef..0000000
--- a/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="I2PBote" 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/custom_rules.xml b/custom_rules.xml
deleted file mode 100644
index 3315351..0000000
--- a/custom_rules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="imported">
-    <target name="-pre-build" depends="clean">
-        <ant dir="botejars" inheritall="false" useNativeBasedir="true" >
-            <target name="${build.target}" />
-        </ant>
-    </target>
-</project>
diff --git a/proguard-project.txt b/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/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/project.properties b/project.properties
deleted file mode 100644
index 83a67be..0000000
--- a/project.properties
+++ /dev/null
@@ -1,21 +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 edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-19
-# Bote libs
-android.library.reference.1=./botejars
-# Android Support Library
-# If the relative path differs in your local environment,
-# override this in the base local.properties
-# (not botejars/local.properties)
-android.library.reference.2=../android-sdk-linux/extras/android/support/v7/appcompat
diff --git a/settings.gradle b/settings.gradle
index 4bfd13b..e7b4def 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':Bote'
+include ':app'