diff --git a/libs/activation.jar b/Bote/libs/activation.jar
similarity index 100%
rename from libs/activation.jar
rename to Bote/libs/activation.jar
diff --git a/libs/additionnal.jar b/Bote/libs/additionnal.jar
similarity index 100%
rename from libs/additionnal.jar
rename to Bote/libs/additionnal.jar
diff --git a/libs/mail.jar b/Bote/libs/mail.jar
similarity index 100%
rename from libs/mail.jar
rename to Bote/libs/mail.jar
diff --git a/libs/tokenautocomplete.jar b/Bote/libs/tokenautocomplete.jar
similarity index 100%
rename from libs/tokenautocomplete.jar
rename to Bote/libs/tokenautocomplete.jar
diff --git a/AndroidManifest.xml b/Bote/src/main/AndroidManifest.xml
similarity index 100%
rename from AndroidManifest.xml
rename to Bote/src/main/AndroidManifest.xml
diff --git a/src/net/i2p/android/router/service/IRouterState.aidl b/Bote/src/main/aidl/net/i2p/android/router/service/IRouterState.aidl
similarity index 100%
rename from src/net/i2p/android/router/service/IRouterState.aidl
rename to Bote/src/main/aidl/net/i2p/android/router/service/IRouterState.aidl
diff --git a/src/net/i2p/android/router/service/IRouterStateCallback.aidl b/Bote/src/main/aidl/net/i2p/android/router/service/IRouterStateCallback.aidl
similarity index 100%
rename from src/net/i2p/android/router/service/IRouterStateCallback.aidl
rename to Bote/src/main/aidl/net/i2p/android/router/service/IRouterStateCallback.aidl
diff --git a/src/i2p/bote/android/EmailListActivity.java b/Bote/src/main/java/i2p/bote/android/EmailListActivity.java
similarity index 100%
rename from src/i2p/bote/android/EmailListActivity.java
rename to Bote/src/main/java/i2p/bote/android/EmailListActivity.java
diff --git a/src/i2p/bote/android/EmailListAdapter.java b/Bote/src/main/java/i2p/bote/android/EmailListAdapter.java
similarity index 100%
rename from src/i2p/bote/android/EmailListAdapter.java
rename to Bote/src/main/java/i2p/bote/android/EmailListAdapter.java
diff --git a/src/i2p/bote/android/EmailListFragment.java b/Bote/src/main/java/i2p/bote/android/EmailListFragment.java
similarity index 100%
rename from src/i2p/bote/android/EmailListFragment.java
rename to Bote/src/main/java/i2p/bote/android/EmailListFragment.java
diff --git a/src/i2p/bote/android/FolderListAdapter.java b/Bote/src/main/java/i2p/bote/android/FolderListAdapter.java
similarity index 100%
rename from src/i2p/bote/android/FolderListAdapter.java
rename to Bote/src/main/java/i2p/bote/android/FolderListAdapter.java
diff --git a/src/i2p/bote/android/NetworkInfoActivity.java b/Bote/src/main/java/i2p/bote/android/NetworkInfoActivity.java
similarity index 100%
rename from src/i2p/bote/android/NetworkInfoActivity.java
rename to Bote/src/main/java/i2p/bote/android/NetworkInfoActivity.java
diff --git a/src/i2p/bote/android/NetworkInfoFragment.java b/Bote/src/main/java/i2p/bote/android/NetworkInfoFragment.java
similarity index 100%
rename from src/i2p/bote/android/NetworkInfoFragment.java
rename to Bote/src/main/java/i2p/bote/android/NetworkInfoFragment.java
diff --git a/src/i2p/bote/android/NewEmailActivity.java b/Bote/src/main/java/i2p/bote/android/NewEmailActivity.java
similarity index 100%
rename from src/i2p/bote/android/NewEmailActivity.java
rename to Bote/src/main/java/i2p/bote/android/NewEmailActivity.java
diff --git a/src/i2p/bote/android/NewEmailFragment.java b/Bote/src/main/java/i2p/bote/android/NewEmailFragment.java
similarity index 100%
rename from src/i2p/bote/android/NewEmailFragment.java
rename to Bote/src/main/java/i2p/bote/android/NewEmailFragment.java
diff --git a/src/i2p/bote/android/ViewEmailActivity.java b/Bote/src/main/java/i2p/bote/android/ViewEmailActivity.java
similarity index 100%
rename from src/i2p/bote/android/ViewEmailActivity.java
rename to Bote/src/main/java/i2p/bote/android/ViewEmailActivity.java
diff --git a/src/i2p/bote/android/ViewEmailFragment.java b/Bote/src/main/java/i2p/bote/android/ViewEmailFragment.java
similarity index 100%
rename from src/i2p/bote/android/ViewEmailFragment.java
rename to Bote/src/main/java/i2p/bote/android/ViewEmailFragment.java
diff --git a/src/i2p/bote/android/addressbook/AddressBookActivity.java b/Bote/src/main/java/i2p/bote/android/addressbook/AddressBookActivity.java
similarity index 100%
rename from src/i2p/bote/android/addressbook/AddressBookActivity.java
rename to Bote/src/main/java/i2p/bote/android/addressbook/AddressBookActivity.java
diff --git a/src/i2p/bote/android/addressbook/AddressBookFragment.java b/Bote/src/main/java/i2p/bote/android/addressbook/AddressBookFragment.java
similarity index 100%
rename from src/i2p/bote/android/addressbook/AddressBookFragment.java
rename to Bote/src/main/java/i2p/bote/android/addressbook/AddressBookFragment.java
diff --git a/src/i2p/bote/android/addressbook/ContactAdapter.java b/Bote/src/main/java/i2p/bote/android/addressbook/ContactAdapter.java
similarity index 100%
rename from src/i2p/bote/android/addressbook/ContactAdapter.java
rename to Bote/src/main/java/i2p/bote/android/addressbook/ContactAdapter.java
diff --git a/src/i2p/bote/android/addressbook/EditContactActivity.java b/Bote/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java
similarity index 100%
rename from src/i2p/bote/android/addressbook/EditContactActivity.java
rename to Bote/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java
diff --git a/src/i2p/bote/android/addressbook/EditContactFragment.java b/Bote/src/main/java/i2p/bote/android/addressbook/EditContactFragment.java
similarity index 100%
rename from src/i2p/bote/android/addressbook/EditContactFragment.java
rename to Bote/src/main/java/i2p/bote/android/addressbook/EditContactFragment.java
diff --git a/src/i2p/bote/android/config/EditIdentityActivity.java b/Bote/src/main/java/i2p/bote/android/config/EditIdentityActivity.java
similarity index 100%
rename from src/i2p/bote/android/config/EditIdentityActivity.java
rename to Bote/src/main/java/i2p/bote/android/config/EditIdentityActivity.java
diff --git a/src/i2p/bote/android/config/EditIdentityFragment.java b/Bote/src/main/java/i2p/bote/android/config/EditIdentityFragment.java
similarity index 100%
rename from src/i2p/bote/android/config/EditIdentityFragment.java
rename to Bote/src/main/java/i2p/bote/android/config/EditIdentityFragment.java
diff --git a/src/i2p/bote/android/config/SetPasswordActivity.java b/Bote/src/main/java/i2p/bote/android/config/SetPasswordActivity.java
similarity index 100%
rename from src/i2p/bote/android/config/SetPasswordActivity.java
rename to Bote/src/main/java/i2p/bote/android/config/SetPasswordActivity.java
diff --git a/src/i2p/bote/android/config/SetPasswordFragment.java b/Bote/src/main/java/i2p/bote/android/config/SetPasswordFragment.java
similarity index 100%
rename from src/i2p/bote/android/config/SetPasswordFragment.java
rename to Bote/src/main/java/i2p/bote/android/config/SetPasswordFragment.java
diff --git a/src/i2p/bote/android/config/SettingsActivity.java b/Bote/src/main/java/i2p/bote/android/config/SettingsActivity.java
similarity index 100%
rename from src/i2p/bote/android/config/SettingsActivity.java
rename to Bote/src/main/java/i2p/bote/android/config/SettingsActivity.java
diff --git a/src/i2p/bote/android/config/ViewIdentityActivity.java b/Bote/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java
similarity index 100%
rename from src/i2p/bote/android/config/ViewIdentityActivity.java
rename to Bote/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java
diff --git a/src/i2p/bote/android/config/ViewIdentityFragment.java b/Bote/src/main/java/i2p/bote/android/config/ViewIdentityFragment.java
similarity index 100%
rename from src/i2p/bote/android/config/ViewIdentityFragment.java
rename to Bote/src/main/java/i2p/bote/android/config/ViewIdentityFragment.java
diff --git a/src/i2p/bote/android/service/BoteService.java b/Bote/src/main/java/i2p/bote/android/service/BoteService.java
similarity index 100%
rename from src/i2p/bote/android/service/BoteService.java
rename to Bote/src/main/java/i2p/bote/android/service/BoteService.java
diff --git a/src/i2p/bote/android/service/Init.java b/Bote/src/main/java/i2p/bote/android/service/Init.java
similarity index 100%
rename from src/i2p/bote/android/service/Init.java
rename to Bote/src/main/java/i2p/bote/android/service/Init.java
diff --git a/src/i2p/bote/android/util/BetterAsyncTaskLoader.java b/Bote/src/main/java/i2p/bote/android/util/BetterAsyncTaskLoader.java
similarity index 100%
rename from src/i2p/bote/android/util/BetterAsyncTaskLoader.java
rename to Bote/src/main/java/i2p/bote/android/util/BetterAsyncTaskLoader.java
diff --git a/src/i2p/bote/android/util/BoteHelper.java b/Bote/src/main/java/i2p/bote/android/util/BoteHelper.java
similarity index 100%
rename from src/i2p/bote/android/util/BoteHelper.java
rename to Bote/src/main/java/i2p/bote/android/util/BoteHelper.java
diff --git a/src/i2p/bote/android/util/ContactsCompletionView.java b/Bote/src/main/java/i2p/bote/android/util/ContactsCompletionView.java
similarity index 100%
rename from src/i2p/bote/android/util/ContactsCompletionView.java
rename to Bote/src/main/java/i2p/bote/android/util/ContactsCompletionView.java
diff --git a/src/i2p/bote/android/util/EditPictureFragment.java b/Bote/src/main/java/i2p/bote/android/util/EditPictureFragment.java
similarity index 100%
rename from src/i2p/bote/android/util/EditPictureFragment.java
rename to Bote/src/main/java/i2p/bote/android/util/EditPictureFragment.java
diff --git a/src/i2p/bote/android/util/IntEditTextPreference.java b/Bote/src/main/java/i2p/bote/android/util/IntEditTextPreference.java
similarity index 100%
rename from src/i2p/bote/android/util/IntEditTextPreference.java
rename to Bote/src/main/java/i2p/bote/android/util/IntEditTextPreference.java
diff --git a/src/i2p/bote/android/util/MoveToDialogFragment.java b/Bote/src/main/java/i2p/bote/android/util/MoveToDialogFragment.java
similarity index 100%
rename from src/i2p/bote/android/util/MoveToDialogFragment.java
rename to Bote/src/main/java/i2p/bote/android/util/MoveToDialogFragment.java
diff --git a/src/i2p/bote/android/util/Person.java b/Bote/src/main/java/i2p/bote/android/util/Person.java
similarity index 100%
rename from src/i2p/bote/android/util/Person.java
rename to Bote/src/main/java/i2p/bote/android/util/Person.java
diff --git a/src/i2p/bote/android/util/RobustAsyncTask.java b/Bote/src/main/java/i2p/bote/android/util/RobustAsyncTask.java
similarity index 100%
rename from src/i2p/bote/android/util/RobustAsyncTask.java
rename to Bote/src/main/java/i2p/bote/android/util/RobustAsyncTask.java
diff --git a/src/i2p/bote/android/util/SummaryEditTextPreference.java b/Bote/src/main/java/i2p/bote/android/util/SummaryEditTextPreference.java
similarity index 100%
rename from src/i2p/bote/android/util/SummaryEditTextPreference.java
rename to Bote/src/main/java/i2p/bote/android/util/SummaryEditTextPreference.java
diff --git a/src/i2p/bote/android/util/TaskFragment.java b/Bote/src/main/java/i2p/bote/android/util/TaskFragment.java
similarity index 100%
rename from src/i2p/bote/android/util/TaskFragment.java
rename to Bote/src/main/java/i2p/bote/android/util/TaskFragment.java
diff --git a/src/i2p/bote/imap/ImapService.java b/Bote/src/main/java/i2p/bote/imap/ImapService.java
similarity index 100%
rename from src/i2p/bote/imap/ImapService.java
rename to Bote/src/main/java/i2p/bote/imap/ImapService.java
diff --git a/src/i2p/bote/service/seedless/SeedlessInitializer.java b/Bote/src/main/java/i2p/bote/service/seedless/SeedlessInitializer.java
similarity index 100%
rename from src/i2p/bote/service/seedless/SeedlessInitializer.java
rename to Bote/src/main/java/i2p/bote/service/seedless/SeedlessInitializer.java
diff --git a/src/i2p/bote/smtp/SmtpService.java b/Bote/src/main/java/i2p/bote/smtp/SmtpService.java
similarity index 100%
rename from src/i2p/bote/smtp/SmtpService.java
rename to Bote/src/main/java/i2p/bote/smtp/SmtpService.java
diff --git a/src/net/i2p/util/LogWriter.java b/Bote/src/main/java/net/i2p/util/LogWriter.java
similarity index 100%
rename from src/net/i2p/util/LogWriter.java
rename to Bote/src/main/java/net/i2p/util/LogWriter.java
diff --git a/libs/armeabi/libscrypt.so b/Bote/src/main/jniLibs/armeabi/libscrypt.so
similarity index 100%
rename from libs/armeabi/libscrypt.so
rename to Bote/src/main/jniLibs/armeabi/libscrypt.so
diff --git a/res/drawable-hdpi/drawer_shadow.9.png b/Bote/src/main/res/drawable-hdpi/drawer_shadow.9.png
similarity index 100%
rename from res/drawable-hdpi/drawer_shadow.9.png
rename to Bote/src/main/res/drawable-hdpi/drawer_shadow.9.png
diff --git a/res/drawable-hdpi/ic_collections_collection.png b/Bote/src/main/res/drawable-hdpi/ic_collections_collection.png
similarity index 100%
rename from res/drawable-hdpi/ic_collections_collection.png
rename to Bote/src/main/res/drawable-hdpi/ic_collections_collection.png
diff --git a/res/drawable-hdpi/ic_contact_picture.png b/Bote/src/main/res/drawable-hdpi/ic_contact_picture.png
similarity index 100%
rename from res/drawable-hdpi/ic_contact_picture.png
rename to Bote/src/main/res/drawable-hdpi/ic_contact_picture.png
diff --git a/res/drawable-hdpi/ic_content_attachment.png b/Bote/src/main/res/drawable-hdpi/ic_content_attachment.png
similarity index 100%
rename from res/drawable-hdpi/ic_content_attachment.png
rename to Bote/src/main/res/drawable-hdpi/ic_content_attachment.png
diff --git a/res/drawable-hdpi/ic_content_discard.png b/Bote/src/main/res/drawable-hdpi/ic_content_discard.png
similarity index 100%
rename from res/drawable-hdpi/ic_content_discard.png
rename to Bote/src/main/res/drawable-hdpi/ic_content_discard.png
diff --git a/res/drawable-hdpi/ic_content_edit.png b/Bote/src/main/res/drawable-hdpi/ic_content_edit.png
similarity index 100%
rename from res/drawable-hdpi/ic_content_edit.png
rename to Bote/src/main/res/drawable-hdpi/ic_content_edit.png
diff --git a/res/drawable-hdpi/ic_content_new_email.png b/Bote/src/main/res/drawable-hdpi/ic_content_new_email.png
similarity index 100%
rename from res/drawable-hdpi/ic_content_new_email.png
rename to Bote/src/main/res/drawable-hdpi/ic_content_new_email.png
diff --git a/res/drawable-hdpi/ic_content_read.png b/Bote/src/main/res/drawable-hdpi/ic_content_read.png
similarity index 100%
rename from res/drawable-hdpi/ic_content_read.png
rename to Bote/src/main/res/drawable-hdpi/ic_content_read.png
diff --git a/res/drawable-hdpi/ic_content_save.png b/Bote/src/main/res/drawable-hdpi/ic_content_save.png
similarity index 100%
rename from res/drawable-hdpi/ic_content_save.png
rename to Bote/src/main/res/drawable-hdpi/ic_content_save.png
diff --git a/res/drawable-hdpi/ic_content_unread.png b/Bote/src/main/res/drawable-hdpi/ic_content_unread.png
similarity index 100%
rename from res/drawable-hdpi/ic_content_unread.png
rename to Bote/src/main/res/drawable-hdpi/ic_content_unread.png
diff --git a/res/drawable-hdpi/ic_device_access_new_account.png b/Bote/src/main/res/drawable-hdpi/ic_device_access_new_account.png
similarity index 100%
rename from res/drawable-hdpi/ic_device_access_new_account.png
rename to Bote/src/main/res/drawable-hdpi/ic_device_access_new_account.png
diff --git a/res/drawable-hdpi/ic_drawer.png b/Bote/src/main/res/drawable-hdpi/ic_drawer.png
similarity index 100%
rename from res/drawable-hdpi/ic_drawer.png
rename to Bote/src/main/res/drawable-hdpi/ic_drawer.png
diff --git a/res/drawable-hdpi/ic_launcher.png b/Bote/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher.png
rename to Bote/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/res/drawable-hdpi/ic_navigation_accept.png b/Bote/src/main/res/drawable-hdpi/ic_navigation_accept.png
similarity index 100%
rename from res/drawable-hdpi/ic_navigation_accept.png
rename to Bote/src/main/res/drawable-hdpi/ic_navigation_accept.png
diff --git a/res/drawable-hdpi/ic_social_add_person.png b/Bote/src/main/res/drawable-hdpi/ic_social_add_person.png
similarity index 100%
rename from res/drawable-hdpi/ic_social_add_person.png
rename to Bote/src/main/res/drawable-hdpi/ic_social_add_person.png
diff --git a/res/drawable-hdpi/ic_social_reply.png b/Bote/src/main/res/drawable-hdpi/ic_social_reply.png
similarity index 100%
rename from res/drawable-hdpi/ic_social_reply.png
rename to Bote/src/main/res/drawable-hdpi/ic_social_reply.png
diff --git a/res/drawable-hdpi/ic_social_send_now.png b/Bote/src/main/res/drawable-hdpi/ic_social_send_now.png
similarity index 100%
rename from res/drawable-hdpi/ic_social_send_now.png
rename to Bote/src/main/res/drawable-hdpi/ic_social_send_now.png
diff --git a/res/drawable-mdpi/drawer_shadow.9.png b/Bote/src/main/res/drawable-mdpi/drawer_shadow.9.png
similarity index 100%
rename from res/drawable-mdpi/drawer_shadow.9.png
rename to Bote/src/main/res/drawable-mdpi/drawer_shadow.9.png
diff --git a/res/drawable-mdpi/ic_collections_collection.png b/Bote/src/main/res/drawable-mdpi/ic_collections_collection.png
similarity index 100%
rename from res/drawable-mdpi/ic_collections_collection.png
rename to Bote/src/main/res/drawable-mdpi/ic_collections_collection.png
diff --git a/res/drawable-mdpi/ic_contact_picture.png b/Bote/src/main/res/drawable-mdpi/ic_contact_picture.png
similarity index 100%
rename from res/drawable-mdpi/ic_contact_picture.png
rename to Bote/src/main/res/drawable-mdpi/ic_contact_picture.png
diff --git a/res/drawable-mdpi/ic_content_attachment.png b/Bote/src/main/res/drawable-mdpi/ic_content_attachment.png
similarity index 100%
rename from res/drawable-mdpi/ic_content_attachment.png
rename to Bote/src/main/res/drawable-mdpi/ic_content_attachment.png
diff --git a/res/drawable-mdpi/ic_content_discard.png b/Bote/src/main/res/drawable-mdpi/ic_content_discard.png
similarity index 100%
rename from res/drawable-mdpi/ic_content_discard.png
rename to Bote/src/main/res/drawable-mdpi/ic_content_discard.png
diff --git a/res/drawable-mdpi/ic_content_edit.png b/Bote/src/main/res/drawable-mdpi/ic_content_edit.png
similarity index 100%
rename from res/drawable-mdpi/ic_content_edit.png
rename to Bote/src/main/res/drawable-mdpi/ic_content_edit.png
diff --git a/res/drawable-mdpi/ic_content_new_email.png b/Bote/src/main/res/drawable-mdpi/ic_content_new_email.png
similarity index 100%
rename from res/drawable-mdpi/ic_content_new_email.png
rename to Bote/src/main/res/drawable-mdpi/ic_content_new_email.png
diff --git a/res/drawable-mdpi/ic_content_read.png b/Bote/src/main/res/drawable-mdpi/ic_content_read.png
similarity index 100%
rename from res/drawable-mdpi/ic_content_read.png
rename to Bote/src/main/res/drawable-mdpi/ic_content_read.png
diff --git a/res/drawable-mdpi/ic_content_save.png b/Bote/src/main/res/drawable-mdpi/ic_content_save.png
similarity index 100%
rename from res/drawable-mdpi/ic_content_save.png
rename to Bote/src/main/res/drawable-mdpi/ic_content_save.png
diff --git a/res/drawable-mdpi/ic_content_unread.png b/Bote/src/main/res/drawable-mdpi/ic_content_unread.png
similarity index 100%
rename from res/drawable-mdpi/ic_content_unread.png
rename to Bote/src/main/res/drawable-mdpi/ic_content_unread.png
diff --git a/res/drawable-mdpi/ic_device_access_new_account.png b/Bote/src/main/res/drawable-mdpi/ic_device_access_new_account.png
similarity index 100%
rename from res/drawable-mdpi/ic_device_access_new_account.png
rename to Bote/src/main/res/drawable-mdpi/ic_device_access_new_account.png
diff --git a/res/drawable-mdpi/ic_drawer.png b/Bote/src/main/res/drawable-mdpi/ic_drawer.png
similarity index 100%
rename from res/drawable-mdpi/ic_drawer.png
rename to Bote/src/main/res/drawable-mdpi/ic_drawer.png
diff --git a/res/drawable-mdpi/ic_launcher.png b/Bote/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher.png
rename to Bote/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/res/drawable-mdpi/ic_navigation_accept.png b/Bote/src/main/res/drawable-mdpi/ic_navigation_accept.png
similarity index 100%
rename from res/drawable-mdpi/ic_navigation_accept.png
rename to Bote/src/main/res/drawable-mdpi/ic_navigation_accept.png
diff --git a/res/drawable-mdpi/ic_social_add_person.png b/Bote/src/main/res/drawable-mdpi/ic_social_add_person.png
similarity index 100%
rename from res/drawable-mdpi/ic_social_add_person.png
rename to Bote/src/main/res/drawable-mdpi/ic_social_add_person.png
diff --git a/res/drawable-mdpi/ic_social_reply.png b/Bote/src/main/res/drawable-mdpi/ic_social_reply.png
similarity index 100%
rename from res/drawable-mdpi/ic_social_reply.png
rename to Bote/src/main/res/drawable-mdpi/ic_social_reply.png
diff --git a/res/drawable-mdpi/ic_social_send_now.png b/Bote/src/main/res/drawable-mdpi/ic_social_send_now.png
similarity index 100%
rename from res/drawable-mdpi/ic_social_send_now.png
rename to Bote/src/main/res/drawable-mdpi/ic_social_send_now.png
diff --git a/res/drawable-xhdpi/drawer_shadow.9.png b/Bote/src/main/res/drawable-xhdpi/drawer_shadow.9.png
similarity index 100%
rename from res/drawable-xhdpi/drawer_shadow.9.png
rename to Bote/src/main/res/drawable-xhdpi/drawer_shadow.9.png
diff --git a/res/drawable-xhdpi/ic_collections_collection.png b/Bote/src/main/res/drawable-xhdpi/ic_collections_collection.png
similarity index 100%
rename from res/drawable-xhdpi/ic_collections_collection.png
rename to Bote/src/main/res/drawable-xhdpi/ic_collections_collection.png
diff --git a/res/drawable-xhdpi/ic_contact_picture.png b/Bote/src/main/res/drawable-xhdpi/ic_contact_picture.png
similarity index 100%
rename from res/drawable-xhdpi/ic_contact_picture.png
rename to Bote/src/main/res/drawable-xhdpi/ic_contact_picture.png
diff --git a/res/drawable-xhdpi/ic_content_attachment.png b/Bote/src/main/res/drawable-xhdpi/ic_content_attachment.png
similarity index 100%
rename from res/drawable-xhdpi/ic_content_attachment.png
rename to Bote/src/main/res/drawable-xhdpi/ic_content_attachment.png
diff --git a/res/drawable-xhdpi/ic_content_discard.png b/Bote/src/main/res/drawable-xhdpi/ic_content_discard.png
similarity index 100%
rename from res/drawable-xhdpi/ic_content_discard.png
rename to Bote/src/main/res/drawable-xhdpi/ic_content_discard.png
diff --git a/res/drawable-xhdpi/ic_content_edit.png b/Bote/src/main/res/drawable-xhdpi/ic_content_edit.png
similarity index 100%
rename from res/drawable-xhdpi/ic_content_edit.png
rename to Bote/src/main/res/drawable-xhdpi/ic_content_edit.png
diff --git a/res/drawable-xhdpi/ic_content_new_email.png b/Bote/src/main/res/drawable-xhdpi/ic_content_new_email.png
similarity index 100%
rename from res/drawable-xhdpi/ic_content_new_email.png
rename to Bote/src/main/res/drawable-xhdpi/ic_content_new_email.png
diff --git a/res/drawable-xhdpi/ic_content_read.png b/Bote/src/main/res/drawable-xhdpi/ic_content_read.png
similarity index 100%
rename from res/drawable-xhdpi/ic_content_read.png
rename to Bote/src/main/res/drawable-xhdpi/ic_content_read.png
diff --git a/res/drawable-xhdpi/ic_content_save.png b/Bote/src/main/res/drawable-xhdpi/ic_content_save.png
similarity index 100%
rename from res/drawable-xhdpi/ic_content_save.png
rename to Bote/src/main/res/drawable-xhdpi/ic_content_save.png
diff --git a/res/drawable-xhdpi/ic_content_unread.png b/Bote/src/main/res/drawable-xhdpi/ic_content_unread.png
similarity index 100%
rename from res/drawable-xhdpi/ic_content_unread.png
rename to Bote/src/main/res/drawable-xhdpi/ic_content_unread.png
diff --git a/res/drawable-xhdpi/ic_device_access_new_account.png b/Bote/src/main/res/drawable-xhdpi/ic_device_access_new_account.png
similarity index 100%
rename from res/drawable-xhdpi/ic_device_access_new_account.png
rename to Bote/src/main/res/drawable-xhdpi/ic_device_access_new_account.png
diff --git a/res/drawable-xhdpi/ic_drawer.png b/Bote/src/main/res/drawable-xhdpi/ic_drawer.png
similarity index 100%
rename from res/drawable-xhdpi/ic_drawer.png
rename to Bote/src/main/res/drawable-xhdpi/ic_drawer.png
diff --git a/res/drawable-xhdpi/ic_launcher.png b/Bote/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-xhdpi/ic_launcher.png
rename to Bote/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/res/drawable-xhdpi/ic_navigation_accept.png b/Bote/src/main/res/drawable-xhdpi/ic_navigation_accept.png
similarity index 100%
rename from res/drawable-xhdpi/ic_navigation_accept.png
rename to Bote/src/main/res/drawable-xhdpi/ic_navigation_accept.png
diff --git a/res/drawable-xhdpi/ic_social_add_person.png b/Bote/src/main/res/drawable-xhdpi/ic_social_add_person.png
similarity index 100%
rename from res/drawable-xhdpi/ic_social_add_person.png
rename to Bote/src/main/res/drawable-xhdpi/ic_social_add_person.png
diff --git a/res/drawable-xhdpi/ic_social_reply.png b/Bote/src/main/res/drawable-xhdpi/ic_social_reply.png
similarity index 100%
rename from res/drawable-xhdpi/ic_social_reply.png
rename to Bote/src/main/res/drawable-xhdpi/ic_social_reply.png
diff --git a/res/drawable-xhdpi/ic_social_send_now.png b/Bote/src/main/res/drawable-xhdpi/ic_social_send_now.png
similarity index 100%
rename from res/drawable-xhdpi/ic_social_send_now.png
rename to Bote/src/main/res/drawable-xhdpi/ic_social_send_now.png
diff --git a/res/drawable/folder_activated_background.xml b/Bote/src/main/res/drawable/folder_activated_background.xml
similarity index 100%
rename from res/drawable/folder_activated_background.xml
rename to Bote/src/main/res/drawable/folder_activated_background.xml
diff --git a/res/drawable/token_background.xml b/Bote/src/main/res/drawable/token_background.xml
similarity index 100%
rename from res/drawable/token_background.xml
rename to Bote/src/main/res/drawable/token_background.xml
diff --git a/res/layout/activity_edit_identity.xml b/Bote/src/main/res/layout/activity_edit_identity.xml
similarity index 100%
rename from res/layout/activity_edit_identity.xml
rename to Bote/src/main/res/layout/activity_edit_identity.xml
diff --git a/res/layout/activity_main.xml b/Bote/src/main/res/layout/activity_main.xml
similarity index 100%
rename from res/layout/activity_main.xml
rename to Bote/src/main/res/layout/activity_main.xml
diff --git a/res/layout/activity_set_password.xml b/Bote/src/main/res/layout/activity_set_password.xml
similarity index 100%
rename from res/layout/activity_set_password.xml
rename to Bote/src/main/res/layout/activity_set_password.xml
diff --git a/res/layout/activity_view_email.xml b/Bote/src/main/res/layout/activity_view_email.xml
similarity index 100%
rename from res/layout/activity_view_email.xml
rename to Bote/src/main/res/layout/activity_view_email.xml
diff --git a/res/layout/contact_token.xml b/Bote/src/main/res/layout/contact_token.xml
similarity index 100%
rename from res/layout/contact_token.xml
rename to Bote/src/main/res/layout/contact_token.xml
diff --git a/res/layout/dialog_password.xml b/Bote/src/main/res/layout/dialog_password.xml
similarity index 100%
rename from res/layout/dialog_password.xml
rename to Bote/src/main/res/layout/dialog_password.xml
diff --git a/res/layout/dialog_status.xml b/Bote/src/main/res/layout/dialog_status.xml
similarity index 100%
rename from res/layout/dialog_status.xml
rename to Bote/src/main/res/layout/dialog_status.xml
diff --git a/res/layout/fragment_edit_contact.xml b/Bote/src/main/res/layout/fragment_edit_contact.xml
similarity index 100%
rename from res/layout/fragment_edit_contact.xml
rename to Bote/src/main/res/layout/fragment_edit_contact.xml
diff --git a/res/layout/fragment_edit_identity.xml b/Bote/src/main/res/layout/fragment_edit_identity.xml
similarity index 100%
rename from res/layout/fragment_edit_identity.xml
rename to Bote/src/main/res/layout/fragment_edit_identity.xml
diff --git a/res/layout/fragment_network_info.xml b/Bote/src/main/res/layout/fragment_network_info.xml
similarity index 100%
rename from res/layout/fragment_network_info.xml
rename to Bote/src/main/res/layout/fragment_network_info.xml
diff --git a/res/layout/fragment_new_email.xml b/Bote/src/main/res/layout/fragment_new_email.xml
similarity index 100%
rename from res/layout/fragment_new_email.xml
rename to Bote/src/main/res/layout/fragment_new_email.xml
diff --git a/res/layout/fragment_set_password.xml b/Bote/src/main/res/layout/fragment_set_password.xml
similarity index 100%
rename from res/layout/fragment_set_password.xml
rename to Bote/src/main/res/layout/fragment_set_password.xml
diff --git a/res/layout/fragment_view_email.xml b/Bote/src/main/res/layout/fragment_view_email.xml
similarity index 100%
rename from res/layout/fragment_view_email.xml
rename to Bote/src/main/res/layout/fragment_view_email.xml
diff --git a/res/layout/fragment_view_identity.xml b/Bote/src/main/res/layout/fragment_view_identity.xml
similarity index 100%
rename from res/layout/fragment_view_identity.xml
rename to Bote/src/main/res/layout/fragment_view_identity.xml
diff --git a/res/layout/listitem_contact.xml b/Bote/src/main/res/layout/listitem_contact.xml
similarity index 100%
rename from res/layout/listitem_contact.xml
rename to Bote/src/main/res/layout/listitem_contact.xml
diff --git a/res/layout/listitem_email.xml b/Bote/src/main/res/layout/listitem_email.xml
similarity index 100%
rename from res/layout/listitem_email.xml
rename to Bote/src/main/res/layout/listitem_email.xml
diff --git a/res/layout/listitem_folder.xml b/Bote/src/main/res/layout/listitem_folder.xml
similarity index 100%
rename from res/layout/listitem_folder.xml
rename to Bote/src/main/res/layout/listitem_folder.xml
diff --git a/res/layout/preference_header_item.xml b/Bote/src/main/res/layout/preference_header_item.xml
similarity index 100%
rename from res/layout/preference_header_item.xml
rename to Bote/src/main/res/layout/preference_header_item.xml
diff --git a/res/menu/address_book_list.xml b/Bote/src/main/res/menu/address_book_list.xml
similarity index 100%
rename from res/menu/address_book_list.xml
rename to Bote/src/main/res/menu/address_book_list.xml
diff --git a/res/menu/edit_contact.xml b/Bote/src/main/res/menu/edit_contact.xml
similarity index 100%
rename from res/menu/edit_contact.xml
rename to Bote/src/main/res/menu/edit_contact.xml
diff --git a/res/menu/edit_identity.xml b/Bote/src/main/res/menu/edit_identity.xml
similarity index 100%
rename from res/menu/edit_identity.xml
rename to Bote/src/main/res/menu/edit_identity.xml
diff --git a/res/menu/email_list.xml b/Bote/src/main/res/menu/email_list.xml
similarity index 100%
rename from res/menu/email_list.xml
rename to Bote/src/main/res/menu/email_list.xml
diff --git a/res/menu/email_list_context.xml b/Bote/src/main/res/menu/email_list_context.xml
similarity index 100%
rename from res/menu/email_list_context.xml
rename to Bote/src/main/res/menu/email_list_context.xml
diff --git a/res/menu/main.xml b/Bote/src/main/res/menu/main.xml
similarity index 100%
rename from res/menu/main.xml
rename to Bote/src/main/res/menu/main.xml
diff --git a/res/menu/new_email.xml b/Bote/src/main/res/menu/new_email.xml
similarity index 100%
rename from res/menu/new_email.xml
rename to Bote/src/main/res/menu/new_email.xml
diff --git a/res/menu/set_password.xml b/Bote/src/main/res/menu/set_password.xml
similarity index 100%
rename from res/menu/set_password.xml
rename to Bote/src/main/res/menu/set_password.xml
diff --git a/res/menu/view_email.xml b/Bote/src/main/res/menu/view_email.xml
similarity index 100%
rename from res/menu/view_email.xml
rename to Bote/src/main/res/menu/view_email.xml
diff --git a/res/menu/view_identity.xml b/Bote/src/main/res/menu/view_identity.xml
similarity index 100%
rename from res/menu/view_identity.xml
rename to Bote/src/main/res/menu/view_identity.xml
diff --git a/res/values/arrays.xml b/Bote/src/main/res/values/arrays.xml
similarity index 100%
rename from res/values/arrays.xml
rename to Bote/src/main/res/values/arrays.xml
diff --git a/res/values/colors.xml b/Bote/src/main/res/values/colors.xml
similarity index 100%
rename from res/values/colors.xml
rename to Bote/src/main/res/values/colors.xml
diff --git a/res/values/strings.xml b/Bote/src/main/res/values/strings.xml
similarity index 100%
rename from res/values/strings.xml
rename to Bote/src/main/res/values/strings.xml
diff --git a/res/values/styles.xml b/Bote/src/main/res/values/styles.xml
similarity index 100%
rename from res/values/styles.xml
rename to Bote/src/main/res/values/styles.xml
diff --git a/res/xml/settings_general.xml b/Bote/src/main/res/xml/settings_general.xml
similarity index 100%
rename from res/xml/settings_general.xml
rename to Bote/src/main/res/xml/settings_general.xml
diff --git a/res/xml/settings_headers.xml b/Bote/src/main/res/xml/settings_headers.xml
similarity index 100%
rename from res/xml/settings_headers.xml
rename to Bote/src/main/res/xml/settings_headers.xml
diff --git a/res/xml/settings_headers_legacy.xml b/Bote/src/main/res/xml/settings_headers_legacy.xml
similarity index 100%
rename from res/xml/settings_headers_legacy.xml
rename to Bote/src/main/res/xml/settings_headers_legacy.xml