From 2dc56d57d41e48cfe72dd6886e067c49744d9c3e Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 27 Jun 2014 11:42:20 +0000
Subject: [PATCH] Reorganized files

---
 ant.properties                                |   4 -
 {libs => app/libs}/androidplot-core-0.6.0.jar | Bin
 .../src/main/AndroidManifest.xml              |   0
 .../android/router/service/IRouterState.aidl  |   0
 .../router/service/IRouterStateCallback.aidl  |   0
 .../android/preference/SeekBarPreference.java |   0
 .../net/i2p/android/apps/EepGetFetcher.java   |   0
 .../net/i2p/android/apps/NewsFetcher.java     |   0
 .../i2ptunnel/TunnelDetailActivity.java       |   0
 .../i2ptunnel/TunnelDetailFragment.java       |   0
 .../i2p/android/i2ptunnel/TunnelEntry.java    |   0
 .../android/i2ptunnel/TunnelEntryAdapter.java |   0
 .../android/i2ptunnel/TunnelEntryLoader.java  |   0
 .../android/i2ptunnel/TunnelListActivity.java |   0
 .../android/i2ptunnel/TunnelListFragment.java |   0
 .../i2ptunnel/TunnelWizardActivity.java       |   0
 .../android/i2ptunnel/TunnelWizardModel.java  |   0
 .../android/i2ptunnel/util/TunnelConfig.java  |   0
 .../android/i2ptunnel/util/TunnelUtil.java    |   0
 .../net/i2p/android/router/HelpActivity.java  |   0
 .../i2p/android/router/I2PActivityBase.java   |   0
 .../i2p/android/router/I2PFragmentBase.java   |   0
 .../i2p/android/router/InitActivities.java    |   0
 .../i2p/android/router/LicenseActivity.java   |   0
 .../i2p/android/router/LicenseFragment.java   |   0
 .../net/i2p/android/router/MainActivity.java  |   0
 .../net/i2p/android/router/MainFragment.java  |   0
 .../net/i2p/android/router/NewsActivity.java  |   0
 .../net/i2p/android/router/NewsFragment.java  |   0
 .../i2p/android/router/SettingsActivity.java  |   0
 .../router/addressbook/AddressEntry.java      |   0
 .../addressbook/AddressEntryAdapter.java      |   0
 .../addressbook/AddressEntryLoader.java       |   0
 .../addressbook/AddressbookActivity.java      |   0
 .../AddressbookAddWizardActivity.java         |   0
 .../AddressbookAddWizardModel.java            |   0
 .../addressbook/AddressbookFragment.java      |   0
 .../AddressbookSettingsActivity.java          |   0
 .../android/router/dialog/AboutDialog.java    |   0
 .../router/dialog/FirstStartDialog.java       |   0
 .../router/dialog/TextResourceDialog.java     |   0
 .../android/router/dialog/VersionDialog.java  |   0
 .../i2p/android/router/log/LogActivity.java   |   0
 .../i2p/android/router/log/LogAdapter.java    |   0
 .../android/router/log/LogDetailActivity.java |   0
 .../android/router/log/LogDetailFragment.java |   0
 .../i2p/android/router/log/LogFragment.java   |   0
 .../net/i2p/android/router/log/LogLoader.java |   0
 .../android/router/netdb/NetDbActivity.java   |   0
 .../router/netdb/NetDbDetailActivity.java     |   0
 .../router/netdb/NetDbDetailFragment.java     |   0
 .../i2p/android/router/netdb/NetDbEntry.java  |   0
 .../router/netdb/NetDbEntryAdapter.java       |   0
 .../router/netdb/NetDbEntryLoader.java        |   0
 .../router/netdb/NetDbListFragment.java       |   0
 .../router/netdb/NetDbStatsLoader.java        |   0
 .../netdb/NetDbSummaryPagerFragment.java      |   0
 .../netdb/NetDbSummaryTableFragment.java      |   0
 .../router/provider/CacheProvider.java        |   0
 .../android/router/receiver/I2PReceiver.java  |   0
 .../net/i2p/android/router/service/Init.java  |   0
 .../router/service/LoadClientsJob.java        |   0
 .../android/router/service/RouterBinder.java  |   0
 .../android/router/service/RouterService.java |   0
 .../router/service/StatSummarizer.java        |   0
 .../i2p/android/router/service/StatusBar.java |   0
 .../router/service/SummaryListener.java       |   0
 .../android/router/stats/PeersActivity.java   |   0
 .../android/router/stats/PeersFragment.java   |   0
 .../router/stats/RateGraphActivity.java       |   0
 .../router/stats/RateGraphFragment.java       |   0
 .../net/i2p/android/router/util/AppCache.java |   0
 .../i2p/android/router/util/I2Patterns.java   |   0
 .../android/router/util/LongToggleButton.java |   0
 .../router/util/NamingServiceUtil.java        |   0
 .../android/router/util/Notifications.java    |   0
 .../net/i2p/android/router/util/Util.java     |   0
 .../android/router/web/I2PWebViewClient.java  |   0
 .../i2p/android/router/web/WebActivity.java   |   0
 .../i2p/android/router/web/WebFragment.java   |   0
 .../wizard/model/AbstractWizardModel.java     |   0
 .../i2p/android/wizard/model/BranchPage.java  |   0
 .../i2p/android/wizard/model/Conditional.java |   0
 .../wizard/model/I2PB64DestinationPage.java   |   0
 .../wizard/model/I2PDestinationPage.java      |   0
 .../android/wizard/model/ModelCallbacks.java  |   0
 .../wizard/model/MultipleFixedChoicePage.java |   0
 .../net/i2p/android/wizard/model/Page.java    |   0
 .../i2p/android/wizard/model/PageList.java    |   0
 .../android/wizard/model/PageTreeNode.java    |   0
 .../i2p/android/wizard/model/ReviewItem.java  |   0
 .../wizard/model/SingleFixedBooleanPage.java  |   0
 .../wizard/model/SingleFixedChoicePage.java   |   0
 .../wizard/model/SingleTextFieldPage.java     |   0
 .../wizard/ui/AbstractWizardActivity.java     |   0
 .../wizard/ui/I2PB64DestinationFragment.java  |   0
 .../wizard/ui/I2PDestinationFragment.java     |   0
 .../wizard/ui/MultipleChoiceFragment.java     |   0
 .../wizard/ui/PageFragmentCallbacks.java      |   0
 .../i2p/android/wizard/ui/ReviewFragment.java |   0
 .../wizard/ui/SingleBooleanFragment.java      |   0
 .../wizard/ui/SingleChoiceFragment.java       |   0
 .../wizard/ui/SingleTextFieldFragment.java    |   0
 .../i2p/android/wizard/ui/StepPagerStrip.java |   0
 .../java}/net/i2p/i2ptunnel/I2PTunnelGUI.java |   0
 .../main/java}/net/i2p/util/LogWriter.java    |   0
 .../java}/net/i2p/util/SecureDirectory.java   |   0
 .../main/java}/net/i2p/util/SecureFile.java   |   0
 .../net/i2p/util/SecureFileOutputStream.java  |   0
 .../res}/drawable-hdpi/drawer_shadow.9.png    | Bin
 .../res}/drawable-hdpi/ic_action_search.png   | Bin
 .../main/res}/drawable-hdpi/ic_av_play.png    | Bin
 .../main/res}/drawable-hdpi/ic_av_stop.png    | Bin
 .../res}/drawable-hdpi/ic_content_discard.png | Bin
 .../res}/drawable-hdpi/ic_content_edit.png    | Bin
 .../res}/drawable-hdpi/ic_content_new.png     | Bin
 .../src/main/res}/drawable-hdpi/ic_drawer.png | Bin
 .../drawable-hdpi/ic_launcher_itoopie.png     | Bin
 .../drawable-hdpi/ic_navigation_refresh.png   | Bin
 .../drawable-hdpi/ic_stat_router_active.png   | Bin
 .../drawable-hdpi/ic_stat_router_running.png  | Bin
 .../ic_stat_router_shutting_down.png          | Bin
 .../drawable-hdpi/ic_stat_router_starting.png | Bin
 .../drawable-hdpi/ic_stat_router_stopping.png | Bin
 .../ic_stat_router_waiting_network.png        | Bin
 .../res}/drawable-mdpi/drawer_shadow.9.png    | Bin
 .../res}/drawable-mdpi/ic_action_search.png   | Bin
 .../main/res}/drawable-mdpi/ic_av_play.png    | Bin
 .../main/res}/drawable-mdpi/ic_av_stop.png    | Bin
 .../res}/drawable-mdpi/ic_content_discard.png | Bin
 .../res}/drawable-mdpi/ic_content_edit.png    | Bin
 .../res}/drawable-mdpi/ic_content_new.png     | Bin
 .../src/main/res}/drawable-mdpi/ic_drawer.png | Bin
 .../drawable-mdpi/ic_launcher_itoopie.png     | Bin
 .../drawable-mdpi/ic_navigation_refresh.png   | Bin
 .../drawable-mdpi/ic_stat_router_active.png   | Bin
 .../drawable-mdpi/ic_stat_router_running.png  | Bin
 .../ic_stat_router_shutting_down.png          | Bin
 .../drawable-mdpi/ic_stat_router_starting.png | Bin
 .../drawable-mdpi/ic_stat_router_stopping.png | Bin
 .../ic_stat_router_waiting_network.png        | Bin
 .../res}/drawable-xhdpi/drawer_shadow.9.png   | Bin
 .../res}/drawable-xhdpi/ic_action_search.png  | Bin
 .../main/res}/drawable-xhdpi/ic_av_play.png   | Bin
 .../main/res}/drawable-xhdpi/ic_av_stop.png   | Bin
 .../drawable-xhdpi/ic_content_discard.png     | Bin
 .../res}/drawable-xhdpi/ic_content_edit.png   | Bin
 .../res}/drawable-xhdpi/ic_content_new.png    | Bin
 .../main/res}/drawable-xhdpi/ic_drawer.png    | Bin
 .../drawable-xhdpi/ic_launcher_itoopie.png    | Bin
 .../drawable-xhdpi/ic_navigation_refresh.png  | Bin
 .../drawable-xhdpi/ic_stat_router_active.png  | Bin
 .../drawable-xhdpi/ic_stat_router_running.png | Bin
 .../ic_stat_router_shutting_down.png          | Bin
 .../ic_stat_router_starting.png               | Bin
 .../ic_stat_router_stopping.png               | Bin
 .../ic_stat_router_waiting_network.png        | Bin
 {res => app/src/main/res}/drawable/client.png | Bin
 .../src/main/res}/drawable/itoopie_sm.png     | Bin
 .../src/main/res}/drawable/local_down.png     | Bin
 .../main/res}/drawable/local_inprogress.png   | Bin
 .../src/main/res}/drawable/local_up.png       | Bin
 .../src/main/res}/drawable/routerled_g.png    | Bin
 .../src/main/res}/drawable/routerled_r.png    | Bin
 .../src/main/res}/drawable/routerled_ry.xml   |   0
 .../src/main/res}/drawable/routerled_ry_1.png | Bin
 .../src/main/res}/drawable/routerled_ry_2.png | Bin
 .../src/main/res}/drawable/routerled_ry_3.png | Bin
 .../src/main/res}/drawable/routerled_ry_4.png | Bin
 .../src/main/res}/drawable/routerled_ry_5.png | Bin
 .../src/main/res}/drawable/routerled_y.png    | Bin
 .../src/main/res}/drawable/routerlogo_0.png   | Bin
 .../src/main/res}/drawable/routerlogo_1.png   | Bin
 .../src/main/res}/drawable/routerlogo_2.png   | Bin
 .../src/main/res}/drawable/routerlogo_3.png   | Bin
 .../src/main/res}/drawable/routerlogo_4.png   | Bin
 {res => app/src/main/res}/drawable/server.png | Bin
 .../main/res}/layout-land/fragment_main.xml   |   0
 .../layout/activity_addressbook_settings.xml  |   0
 .../layout/activity_navdrawer_onepane.xml     |   0
 .../layout/activity_navdrawer_twopane.xml     |   0
 .../layout/activity_navdrawer_viewpager.xml   |   0
 .../src/main/res}/layout/activity_wizard.xml  |   0
 .../res}/layout/addressbook_list_item.xml     |   0
 .../res}/layout/fragment_dialog_about.xml     |   0
 .../layout/fragment_dialog_first_start.xml    |   0
 .../layout/fragment_dialog_text_resource.xml  |   0
 .../src/main/res}/layout/fragment_graph.xml   |   0
 .../res}/layout/fragment_i2ptunnel_detail.xml |   0
 .../main/res}/layout/fragment_log_entry.xml   |   0
 .../src/main/res}/layout/fragment_main.xml    |   0
 .../layout/fragment_netdb_leaseset_detail.xml |   0
 .../layout/fragment_netdb_router_detail.xml   |   0
 .../src/main/res}/layout/fragment_news.xml    |   0
 .../src/main/res}/layout/fragment_table.xml   |   0
 .../main/res}/layout/fragment_wizard_page.xml |   0
 .../fragment_wizard_page_single_boolean.xml   |   0
 ...fragment_wizard_page_single_text_field.xml |   0
 ...t_wizard_page_single_text_field_picker.xml |   0
 .../main/res}/layout/listitem_i2ptunnel.xml   |   0
 .../main/res}/layout/listitem_leaseset.xml    |   0
 .../src/main/res}/layout/listitem_logs.xml    |   0
 .../main/res}/layout/listitem_routerinfo.xml  |   0
 .../res}/layout/listitem_wizard_review.xml    |   0
 .../src/main/res}/layout/logs_header.xml      |   0
 .../res}/layout/parentfragment_viewpager.xml  |   0
 {res => app/src/main/res}/layout/peers.xml    |   0
 {res => app/src/main/res}/layout/web.xml      |   0
 .../menu/activity_addressbook_actions.xml     |   0
 .../menu/activity_addressbook_settings.xml    |   0
 .../main/res}/menu/activity_base_actions.xml  |   0
 .../main/res}/menu/activity_help_actions.xml  |   0
 .../main/res}/menu/activity_main_actions.xml  |   0
 .../menu/fragment_addressbook_actions.xml     |   0
 .../fragment_i2ptunnel_detail_actions.xml     |   0
 .../menu/fragment_i2ptunnel_list_actions.xml  |   0
 .../res}/menu/fragment_netdb_list_actions.xml |   0
 .../main/res}/menu/fragment_web_actions.xml   |   0
 .../src/main/res}/raw/addressbook_config_txt  |   0
 .../main/res}/raw/ahelper_conflict_header_ht  |   0
 .../src/main/res}/raw/ahelper_new_header_ht   |   0
 {res => app/src/main/res}/raw/android_css     |   0
 {res => app/src/main/res}/raw/auth_header_ht  |   0
 .../src/main/res}/raw/denied_header_ht        |   0
 {res => app/src/main/res}/raw/dnf_header_ht   |   0
 {res => app/src/main/res}/raw/dnfb_header_ht  |   0
 {res => app/src/main/res}/raw/dnfh_header_ht  |   0
 {res => app/src/main/res}/raw/dnfp_header_ht  |   0
 .../src/main/res}/raw/i2ptunnel_config        |   0
 .../src/main/res}/raw/initialnews_html        |   0
 .../src/main/res}/raw/license_addressbook_txt |   0
 {res => app/src/main/res}/raw/licenses_txt    |   0
 .../src/main/res}/raw/localhost_header_ht     |   0
 {res => app/src/main/res}/raw/logger_config   |   0
 {res => app/src/main/res}/raw/more_hosts_txt  |   0
 .../src/main/res}/raw/noproxy_header_ht       |   0
 .../src/main/res}/raw/protocol_header_ht      |   0
 .../src/main/res}/raw/releasenotes_txt        |   0
 {res => app/src/main/res}/raw/router_config   |   0
 .../src/main/res}/raw/subscriptions_txt       |   0
 {res => app/src/main/res}/raw/welcome_html    |   0
 .../src/main/res}/values-ca/strings.xml       |   0
 .../src/main/res}/values-de/strings.xml       |   0
 .../src/main/res}/values-es/strings.xml       |   0
 .../src/main/res}/values-fr/strings.xml       |   0
 .../src/main/res}/values-it/strings.xml       |   0
 .../src/main/res}/values-ja/strings.xml       |   0
 .../src/main/res}/values-ko/strings.xml       |   0
 .../src/main/res}/values-large/refs.xml       |   0
 .../src/main/res}/values-nb/strings.xml       |   0
 .../src/main/res}/values-nl/strings.xml       |   0
 .../src/main/res}/values-pl/strings.xml       |   0
 .../src/main/res}/values-pt-rBR/strings.xml   |   0
 .../src/main/res}/values-pt/strings.xml       |   0
 .../src/main/res}/values-ro/strings.xml       |   0
 .../src/main/res}/values-ru/strings.xml       |   0
 .../src/main/res}/values-sk/strings.xml       |   0
 .../src/main/res}/values-sv/strings.xml       |   0
 .../src/main/res}/values-sw600dp/refs.xml     |   0
 .../src/main/res}/values-tr/strings.xml       |   0
 .../src/main/res}/values-vi/strings.xml       |   0
 .../src/main/res}/values-zh/strings.xml       |   0
 {res => app/src/main/res}/values/arrays.xml   |   0
 {res => app/src/main/res}/values/colors.xml   |   0
 {res => app/src/main/res}/values/dimens.xml   |   0
 {res => app/src/main/res}/values/integers.xml |   0
 {res => app/src/main/res}/values/refs.xml     |   0
 {res => app/src/main/res}/values/strings.xml  |   0
 {res => app/src/main/res}/values/styles.xml   |   0
 .../main/res}/xml/searchable_addressbook.xml  |   0
 .../src/main/res}/xml/settings_advanced.xml   |   0
 .../src/main/res}/xml/settings_graphs.xml     |   0
 .../src/main/res}/xml/settings_headers.xml    |   0
 .../main/res}/xml/settings_headers_legacy.xml |   0
 .../src/main/res}/xml/settings_logging.xml    |   0
 .../src/main/res}/xml/settings_net.xml        |   0
 build.xml                                     |  83 ------------------
 proguard-project.txt                          |  20 -----
 project.properties                            |  20 -----
 routerjars/ant.properties                     |  18 ----
 routerjars/build.xml                          |  83 ------------------
 routerjars/custom_rules.xml                   |  18 +---
 routerjars/proguard-project.txt               |  20 -----
 routerjars/project.properties                 |  12 ---
 routerjars/src/README.txt                     |   1 -
 .../main/AndroidManifest.xml}                 |   2 +-
 .../main/jniLibs/armeabi}/build.sh            |   0
 .../main/jniLibs/armeabi}/libjbigi.so         | Bin
 288 files changed, 4 insertions(+), 277 deletions(-)
 delete mode 100644 ant.properties
 rename {libs => app/libs}/androidplot-core-0.6.0.jar (100%)
 rename AndroidManifest.xml.in => app/src/main/AndroidManifest.xml (100%)
 rename {src => app/src/main/aidl}/net/i2p/android/router/service/IRouterState.aidl (100%)
 rename {src => app/src/main/aidl}/net/i2p/android/router/service/IRouterStateCallback.aidl (100%)
 rename {src => app/src/main/java}/com/hlidskialf/android/preference/SeekBarPreference.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/apps/EepGetFetcher.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/apps/NewsFetcher.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/i2ptunnel/TunnelDetailActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/i2ptunnel/TunnelDetailFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/i2ptunnel/TunnelEntry.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/i2ptunnel/TunnelEntryAdapter.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/i2ptunnel/TunnelEntryLoader.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/i2ptunnel/TunnelListActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/i2ptunnel/TunnelListFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/i2ptunnel/TunnelWizardActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/i2ptunnel/TunnelWizardModel.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/i2ptunnel/util/TunnelConfig.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/i2ptunnel/util/TunnelUtil.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/HelpActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/I2PActivityBase.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/I2PFragmentBase.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/InitActivities.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/LicenseActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/LicenseFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/MainActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/MainFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/NewsActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/NewsFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/SettingsActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/addressbook/AddressEntry.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/addressbook/AddressEntryAdapter.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/addressbook/AddressEntryLoader.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/addressbook/AddressbookActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/addressbook/AddressbookAddWizardActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/addressbook/AddressbookAddWizardModel.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/addressbook/AddressbookFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/addressbook/AddressbookSettingsActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/dialog/AboutDialog.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/dialog/FirstStartDialog.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/dialog/TextResourceDialog.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/dialog/VersionDialog.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/log/LogActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/log/LogAdapter.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/log/LogDetailActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/log/LogDetailFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/log/LogFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/log/LogLoader.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/netdb/NetDbActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/netdb/NetDbDetailActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/netdb/NetDbDetailFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/netdb/NetDbEntry.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/netdb/NetDbEntryAdapter.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/netdb/NetDbEntryLoader.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/netdb/NetDbListFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/netdb/NetDbStatsLoader.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/netdb/NetDbSummaryPagerFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/netdb/NetDbSummaryTableFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/provider/CacheProvider.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/receiver/I2PReceiver.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/service/Init.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/service/LoadClientsJob.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/service/RouterBinder.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/service/RouterService.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/service/StatSummarizer.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/service/StatusBar.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/service/SummaryListener.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/stats/PeersActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/stats/PeersFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/stats/RateGraphActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/stats/RateGraphFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/util/AppCache.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/util/I2Patterns.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/util/LongToggleButton.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/util/NamingServiceUtil.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/util/Notifications.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/util/Util.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/web/I2PWebViewClient.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/web/WebActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/router/web/WebFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/model/AbstractWizardModel.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/model/BranchPage.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/model/Conditional.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/model/I2PB64DestinationPage.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/model/I2PDestinationPage.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/model/ModelCallbacks.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/model/MultipleFixedChoicePage.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/model/Page.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/model/PageList.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/model/PageTreeNode.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/model/ReviewItem.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/model/SingleFixedBooleanPage.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/model/SingleFixedChoicePage.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/model/SingleTextFieldPage.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/ui/AbstractWizardActivity.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/ui/I2PB64DestinationFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/ui/I2PDestinationFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/ui/MultipleChoiceFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/ui/PageFragmentCallbacks.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/ui/ReviewFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/ui/SingleBooleanFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/ui/SingleChoiceFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/ui/SingleTextFieldFragment.java (100%)
 rename {src => app/src/main/java}/net/i2p/android/wizard/ui/StepPagerStrip.java (100%)
 rename {src => app/src/main/java}/net/i2p/i2ptunnel/I2PTunnelGUI.java (100%)
 rename {src => app/src/main/java}/net/i2p/util/LogWriter.java (100%)
 rename {src => app/src/main/java}/net/i2p/util/SecureDirectory.java (100%)
 rename {src => app/src/main/java}/net/i2p/util/SecureFile.java (100%)
 rename {src => app/src/main/java}/net/i2p/util/SecureFileOutputStream.java (100%)
 rename {res => app/src/main/res}/drawable-hdpi/drawer_shadow.9.png (100%)
 rename {res => app/src/main/res}/drawable-hdpi/ic_action_search.png (100%)
 rename {res => app/src/main/res}/drawable-hdpi/ic_av_play.png (100%)
 rename {res => app/src/main/res}/drawable-hdpi/ic_av_stop.png (100%)
 rename {res => app/src/main/res}/drawable-hdpi/ic_content_discard.png (100%)
 rename {res => app/src/main/res}/drawable-hdpi/ic_content_edit.png (100%)
 rename {res => app/src/main/res}/drawable-hdpi/ic_content_new.png (100%)
 rename {res => app/src/main/res}/drawable-hdpi/ic_drawer.png (100%)
 rename {res => app/src/main/res}/drawable-hdpi/ic_launcher_itoopie.png (100%)
 rename {res => app/src/main/res}/drawable-hdpi/ic_navigation_refresh.png (100%)
 rename {res => app/src/main/res}/drawable-hdpi/ic_stat_router_active.png (100%)
 rename {res => app/src/main/res}/drawable-hdpi/ic_stat_router_running.png (100%)
 rename {res => app/src/main/res}/drawable-hdpi/ic_stat_router_shutting_down.png (100%)
 rename {res => app/src/main/res}/drawable-hdpi/ic_stat_router_starting.png (100%)
 rename {res => app/src/main/res}/drawable-hdpi/ic_stat_router_stopping.png (100%)
 rename {res => app/src/main/res}/drawable-hdpi/ic_stat_router_waiting_network.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/drawer_shadow.9.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/ic_action_search.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/ic_av_play.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/ic_av_stop.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/ic_content_discard.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/ic_content_edit.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/ic_content_new.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/ic_drawer.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/ic_launcher_itoopie.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/ic_navigation_refresh.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/ic_stat_router_active.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/ic_stat_router_running.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/ic_stat_router_shutting_down.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/ic_stat_router_starting.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/ic_stat_router_stopping.png (100%)
 rename {res => app/src/main/res}/drawable-mdpi/ic_stat_router_waiting_network.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/drawer_shadow.9.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/ic_action_search.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/ic_av_play.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/ic_av_stop.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/ic_content_discard.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/ic_content_edit.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/ic_content_new.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/ic_drawer.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/ic_launcher_itoopie.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/ic_navigation_refresh.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/ic_stat_router_active.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/ic_stat_router_running.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/ic_stat_router_shutting_down.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/ic_stat_router_starting.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/ic_stat_router_stopping.png (100%)
 rename {res => app/src/main/res}/drawable-xhdpi/ic_stat_router_waiting_network.png (100%)
 rename {res => app/src/main/res}/drawable/client.png (100%)
 rename {res => app/src/main/res}/drawable/itoopie_sm.png (100%)
 rename {res => app/src/main/res}/drawable/local_down.png (100%)
 rename {res => app/src/main/res}/drawable/local_inprogress.png (100%)
 rename {res => app/src/main/res}/drawable/local_up.png (100%)
 rename {res => app/src/main/res}/drawable/routerled_g.png (100%)
 rename {res => app/src/main/res}/drawable/routerled_r.png (100%)
 rename {res => app/src/main/res}/drawable/routerled_ry.xml (100%)
 rename {res => app/src/main/res}/drawable/routerled_ry_1.png (100%)
 rename {res => app/src/main/res}/drawable/routerled_ry_2.png (100%)
 rename {res => app/src/main/res}/drawable/routerled_ry_3.png (100%)
 rename {res => app/src/main/res}/drawable/routerled_ry_4.png (100%)
 rename {res => app/src/main/res}/drawable/routerled_ry_5.png (100%)
 rename {res => app/src/main/res}/drawable/routerled_y.png (100%)
 rename {res => app/src/main/res}/drawable/routerlogo_0.png (100%)
 rename {res => app/src/main/res}/drawable/routerlogo_1.png (100%)
 rename {res => app/src/main/res}/drawable/routerlogo_2.png (100%)
 rename {res => app/src/main/res}/drawable/routerlogo_3.png (100%)
 rename {res => app/src/main/res}/drawable/routerlogo_4.png (100%)
 rename {res => app/src/main/res}/drawable/server.png (100%)
 rename {res => app/src/main/res}/layout-land/fragment_main.xml (100%)
 rename {res => app/src/main/res}/layout/activity_addressbook_settings.xml (100%)
 rename {res => app/src/main/res}/layout/activity_navdrawer_onepane.xml (100%)
 rename {res => app/src/main/res}/layout/activity_navdrawer_twopane.xml (100%)
 rename {res => app/src/main/res}/layout/activity_navdrawer_viewpager.xml (100%)
 rename {res => app/src/main/res}/layout/activity_wizard.xml (100%)
 rename {res => app/src/main/res}/layout/addressbook_list_item.xml (100%)
 rename {res => app/src/main/res}/layout/fragment_dialog_about.xml (100%)
 rename {res => app/src/main/res}/layout/fragment_dialog_first_start.xml (100%)
 rename {res => app/src/main/res}/layout/fragment_dialog_text_resource.xml (100%)
 rename {res => app/src/main/res}/layout/fragment_graph.xml (100%)
 rename {res => app/src/main/res}/layout/fragment_i2ptunnel_detail.xml (100%)
 rename {res => app/src/main/res}/layout/fragment_log_entry.xml (100%)
 rename {res => app/src/main/res}/layout/fragment_main.xml (100%)
 rename {res => app/src/main/res}/layout/fragment_netdb_leaseset_detail.xml (100%)
 rename {res => app/src/main/res}/layout/fragment_netdb_router_detail.xml (100%)
 rename {res => app/src/main/res}/layout/fragment_news.xml (100%)
 rename {res => app/src/main/res}/layout/fragment_table.xml (100%)
 rename {res => app/src/main/res}/layout/fragment_wizard_page.xml (100%)
 rename {res => app/src/main/res}/layout/fragment_wizard_page_single_boolean.xml (100%)
 rename {res => app/src/main/res}/layout/fragment_wizard_page_single_text_field.xml (100%)
 rename {res => app/src/main/res}/layout/fragment_wizard_page_single_text_field_picker.xml (100%)
 rename {res => app/src/main/res}/layout/listitem_i2ptunnel.xml (100%)
 rename {res => app/src/main/res}/layout/listitem_leaseset.xml (100%)
 rename {res => app/src/main/res}/layout/listitem_logs.xml (100%)
 rename {res => app/src/main/res}/layout/listitem_routerinfo.xml (100%)
 rename {res => app/src/main/res}/layout/listitem_wizard_review.xml (100%)
 rename {res => app/src/main/res}/layout/logs_header.xml (100%)
 rename {res => app/src/main/res}/layout/parentfragment_viewpager.xml (100%)
 rename {res => app/src/main/res}/layout/peers.xml (100%)
 rename {res => app/src/main/res}/layout/web.xml (100%)
 rename {res => app/src/main/res}/menu/activity_addressbook_actions.xml (100%)
 rename {res => app/src/main/res}/menu/activity_addressbook_settings.xml (100%)
 rename {res => app/src/main/res}/menu/activity_base_actions.xml (100%)
 rename {res => app/src/main/res}/menu/activity_help_actions.xml (100%)
 rename {res => app/src/main/res}/menu/activity_main_actions.xml (100%)
 rename {res => app/src/main/res}/menu/fragment_addressbook_actions.xml (100%)
 rename {res => app/src/main/res}/menu/fragment_i2ptunnel_detail_actions.xml (100%)
 rename {res => app/src/main/res}/menu/fragment_i2ptunnel_list_actions.xml (100%)
 rename {res => app/src/main/res}/menu/fragment_netdb_list_actions.xml (100%)
 rename {res => app/src/main/res}/menu/fragment_web_actions.xml (100%)
 rename {res => app/src/main/res}/raw/addressbook_config_txt (100%)
 rename {res => app/src/main/res}/raw/ahelper_conflict_header_ht (100%)
 rename {res => app/src/main/res}/raw/ahelper_new_header_ht (100%)
 rename {res => app/src/main/res}/raw/android_css (100%)
 rename {res => app/src/main/res}/raw/auth_header_ht (100%)
 rename {res => app/src/main/res}/raw/denied_header_ht (100%)
 rename {res => app/src/main/res}/raw/dnf_header_ht (100%)
 rename {res => app/src/main/res}/raw/dnfb_header_ht (100%)
 rename {res => app/src/main/res}/raw/dnfh_header_ht (100%)
 rename {res => app/src/main/res}/raw/dnfp_header_ht (100%)
 rename {res => app/src/main/res}/raw/i2ptunnel_config (100%)
 rename {res => app/src/main/res}/raw/initialnews_html (100%)
 rename {res => app/src/main/res}/raw/license_addressbook_txt (100%)
 rename {res => app/src/main/res}/raw/licenses_txt (100%)
 rename {res => app/src/main/res}/raw/localhost_header_ht (100%)
 rename {res => app/src/main/res}/raw/logger_config (100%)
 rename {res => app/src/main/res}/raw/more_hosts_txt (100%)
 rename {res => app/src/main/res}/raw/noproxy_header_ht (100%)
 rename {res => app/src/main/res}/raw/protocol_header_ht (100%)
 rename {res => app/src/main/res}/raw/releasenotes_txt (100%)
 rename {res => app/src/main/res}/raw/router_config (100%)
 rename {res => app/src/main/res}/raw/subscriptions_txt (100%)
 rename {res => app/src/main/res}/raw/welcome_html (100%)
 rename {res => app/src/main/res}/values-ca/strings.xml (100%)
 rename {res => app/src/main/res}/values-de/strings.xml (100%)
 rename {res => app/src/main/res}/values-es/strings.xml (100%)
 rename {res => app/src/main/res}/values-fr/strings.xml (100%)
 rename {res => app/src/main/res}/values-it/strings.xml (100%)
 rename {res => app/src/main/res}/values-ja/strings.xml (100%)
 rename {res => app/src/main/res}/values-ko/strings.xml (100%)
 rename {res => app/src/main/res}/values-large/refs.xml (100%)
 rename {res => app/src/main/res}/values-nb/strings.xml (100%)
 rename {res => app/src/main/res}/values-nl/strings.xml (100%)
 rename {res => app/src/main/res}/values-pl/strings.xml (100%)
 rename {res => app/src/main/res}/values-pt-rBR/strings.xml (100%)
 rename {res => app/src/main/res}/values-pt/strings.xml (100%)
 rename {res => app/src/main/res}/values-ro/strings.xml (100%)
 rename {res => app/src/main/res}/values-ru/strings.xml (100%)
 rename {res => app/src/main/res}/values-sk/strings.xml (100%)
 rename {res => app/src/main/res}/values-sv/strings.xml (100%)
 rename {res => app/src/main/res}/values-sw600dp/refs.xml (100%)
 rename {res => app/src/main/res}/values-tr/strings.xml (100%)
 rename {res => app/src/main/res}/values-vi/strings.xml (100%)
 rename {res => app/src/main/res}/values-zh/strings.xml (100%)
 rename {res => app/src/main/res}/values/arrays.xml (100%)
 rename {res => app/src/main/res}/values/colors.xml (100%)
 rename {res => app/src/main/res}/values/dimens.xml (100%)
 rename {res => app/src/main/res}/values/integers.xml (100%)
 rename {res => app/src/main/res}/values/refs.xml (100%)
 rename {res => app/src/main/res}/values/strings.xml (100%)
 rename {res => app/src/main/res}/values/styles.xml (100%)
 rename {res => app/src/main/res}/xml/searchable_addressbook.xml (100%)
 rename {res => app/src/main/res}/xml/settings_advanced.xml (100%)
 rename {res => app/src/main/res}/xml/settings_graphs.xml (100%)
 rename {res => app/src/main/res}/xml/settings_headers.xml (100%)
 rename {res => app/src/main/res}/xml/settings_headers_legacy.xml (100%)
 rename {res => app/src/main/res}/xml/settings_logging.xml (100%)
 rename {res => app/src/main/res}/xml/settings_net.xml (100%)
 delete mode 100644 build.xml
 delete mode 100644 proguard-project.txt
 delete mode 100644 project.properties
 delete mode 100644 routerjars/ant.properties
 delete mode 100644 routerjars/build.xml
 delete mode 100644 routerjars/proguard-project.txt
 delete mode 100644 routerjars/project.properties
 delete mode 100644 routerjars/src/README.txt
 rename routerjars/{AndroidManifest.xml.in => src/main/AndroidManifest.xml} (86%)
 rename routerjars/{jni => src/main/jniLibs/armeabi}/build.sh (100%)
 rename routerjars/{jni => src/main/jniLibs/armeabi}/libjbigi.so (100%)

diff --git a/ant.properties b/ant.properties
deleted file mode 100644
index eb3aeb5e7..000000000
--- a/ant.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-application-package=net.i2p.router
-key.store=${user.home}/.android/${application-package}.keystore
-key.alias=${application-package}
-key.store.password=android
diff --git a/libs/androidplot-core-0.6.0.jar b/app/libs/androidplot-core-0.6.0.jar
similarity index 100%
rename from libs/androidplot-core-0.6.0.jar
rename to app/libs/androidplot-core-0.6.0.jar
diff --git a/AndroidManifest.xml.in b/app/src/main/AndroidManifest.xml
similarity index 100%
rename from AndroidManifest.xml.in
rename to app/src/main/AndroidManifest.xml
diff --git a/src/net/i2p/android/router/service/IRouterState.aidl b/app/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 app/src/main/aidl/net/i2p/android/router/service/IRouterState.aidl
diff --git a/src/net/i2p/android/router/service/IRouterStateCallback.aidl b/app/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 app/src/main/aidl/net/i2p/android/router/service/IRouterStateCallback.aidl
diff --git a/src/com/hlidskialf/android/preference/SeekBarPreference.java b/app/src/main/java/com/hlidskialf/android/preference/SeekBarPreference.java
similarity index 100%
rename from src/com/hlidskialf/android/preference/SeekBarPreference.java
rename to app/src/main/java/com/hlidskialf/android/preference/SeekBarPreference.java
diff --git a/src/net/i2p/android/apps/EepGetFetcher.java b/app/src/main/java/net/i2p/android/apps/EepGetFetcher.java
similarity index 100%
rename from src/net/i2p/android/apps/EepGetFetcher.java
rename to app/src/main/java/net/i2p/android/apps/EepGetFetcher.java
diff --git a/src/net/i2p/android/apps/NewsFetcher.java b/app/src/main/java/net/i2p/android/apps/NewsFetcher.java
similarity index 100%
rename from src/net/i2p/android/apps/NewsFetcher.java
rename to app/src/main/java/net/i2p/android/apps/NewsFetcher.java
diff --git a/src/net/i2p/android/i2ptunnel/TunnelDetailActivity.java b/app/src/main/java/net/i2p/android/i2ptunnel/TunnelDetailActivity.java
similarity index 100%
rename from src/net/i2p/android/i2ptunnel/TunnelDetailActivity.java
rename to app/src/main/java/net/i2p/android/i2ptunnel/TunnelDetailActivity.java
diff --git a/src/net/i2p/android/i2ptunnel/TunnelDetailFragment.java b/app/src/main/java/net/i2p/android/i2ptunnel/TunnelDetailFragment.java
similarity index 100%
rename from src/net/i2p/android/i2ptunnel/TunnelDetailFragment.java
rename to app/src/main/java/net/i2p/android/i2ptunnel/TunnelDetailFragment.java
diff --git a/src/net/i2p/android/i2ptunnel/TunnelEntry.java b/app/src/main/java/net/i2p/android/i2ptunnel/TunnelEntry.java
similarity index 100%
rename from src/net/i2p/android/i2ptunnel/TunnelEntry.java
rename to app/src/main/java/net/i2p/android/i2ptunnel/TunnelEntry.java
diff --git a/src/net/i2p/android/i2ptunnel/TunnelEntryAdapter.java b/app/src/main/java/net/i2p/android/i2ptunnel/TunnelEntryAdapter.java
similarity index 100%
rename from src/net/i2p/android/i2ptunnel/TunnelEntryAdapter.java
rename to app/src/main/java/net/i2p/android/i2ptunnel/TunnelEntryAdapter.java
diff --git a/src/net/i2p/android/i2ptunnel/TunnelEntryLoader.java b/app/src/main/java/net/i2p/android/i2ptunnel/TunnelEntryLoader.java
similarity index 100%
rename from src/net/i2p/android/i2ptunnel/TunnelEntryLoader.java
rename to app/src/main/java/net/i2p/android/i2ptunnel/TunnelEntryLoader.java
diff --git a/src/net/i2p/android/i2ptunnel/TunnelListActivity.java b/app/src/main/java/net/i2p/android/i2ptunnel/TunnelListActivity.java
similarity index 100%
rename from src/net/i2p/android/i2ptunnel/TunnelListActivity.java
rename to app/src/main/java/net/i2p/android/i2ptunnel/TunnelListActivity.java
diff --git a/src/net/i2p/android/i2ptunnel/TunnelListFragment.java b/app/src/main/java/net/i2p/android/i2ptunnel/TunnelListFragment.java
similarity index 100%
rename from src/net/i2p/android/i2ptunnel/TunnelListFragment.java
rename to app/src/main/java/net/i2p/android/i2ptunnel/TunnelListFragment.java
diff --git a/src/net/i2p/android/i2ptunnel/TunnelWizardActivity.java b/app/src/main/java/net/i2p/android/i2ptunnel/TunnelWizardActivity.java
similarity index 100%
rename from src/net/i2p/android/i2ptunnel/TunnelWizardActivity.java
rename to app/src/main/java/net/i2p/android/i2ptunnel/TunnelWizardActivity.java
diff --git a/src/net/i2p/android/i2ptunnel/TunnelWizardModel.java b/app/src/main/java/net/i2p/android/i2ptunnel/TunnelWizardModel.java
similarity index 100%
rename from src/net/i2p/android/i2ptunnel/TunnelWizardModel.java
rename to app/src/main/java/net/i2p/android/i2ptunnel/TunnelWizardModel.java
diff --git a/src/net/i2p/android/i2ptunnel/util/TunnelConfig.java b/app/src/main/java/net/i2p/android/i2ptunnel/util/TunnelConfig.java
similarity index 100%
rename from src/net/i2p/android/i2ptunnel/util/TunnelConfig.java
rename to app/src/main/java/net/i2p/android/i2ptunnel/util/TunnelConfig.java
diff --git a/src/net/i2p/android/i2ptunnel/util/TunnelUtil.java b/app/src/main/java/net/i2p/android/i2ptunnel/util/TunnelUtil.java
similarity index 100%
rename from src/net/i2p/android/i2ptunnel/util/TunnelUtil.java
rename to app/src/main/java/net/i2p/android/i2ptunnel/util/TunnelUtil.java
diff --git a/src/net/i2p/android/router/HelpActivity.java b/app/src/main/java/net/i2p/android/router/HelpActivity.java
similarity index 100%
rename from src/net/i2p/android/router/HelpActivity.java
rename to app/src/main/java/net/i2p/android/router/HelpActivity.java
diff --git a/src/net/i2p/android/router/I2PActivityBase.java b/app/src/main/java/net/i2p/android/router/I2PActivityBase.java
similarity index 100%
rename from src/net/i2p/android/router/I2PActivityBase.java
rename to app/src/main/java/net/i2p/android/router/I2PActivityBase.java
diff --git a/src/net/i2p/android/router/I2PFragmentBase.java b/app/src/main/java/net/i2p/android/router/I2PFragmentBase.java
similarity index 100%
rename from src/net/i2p/android/router/I2PFragmentBase.java
rename to app/src/main/java/net/i2p/android/router/I2PFragmentBase.java
diff --git a/src/net/i2p/android/router/InitActivities.java b/app/src/main/java/net/i2p/android/router/InitActivities.java
similarity index 100%
rename from src/net/i2p/android/router/InitActivities.java
rename to app/src/main/java/net/i2p/android/router/InitActivities.java
diff --git a/src/net/i2p/android/router/LicenseActivity.java b/app/src/main/java/net/i2p/android/router/LicenseActivity.java
similarity index 100%
rename from src/net/i2p/android/router/LicenseActivity.java
rename to app/src/main/java/net/i2p/android/router/LicenseActivity.java
diff --git a/src/net/i2p/android/router/LicenseFragment.java b/app/src/main/java/net/i2p/android/router/LicenseFragment.java
similarity index 100%
rename from src/net/i2p/android/router/LicenseFragment.java
rename to app/src/main/java/net/i2p/android/router/LicenseFragment.java
diff --git a/src/net/i2p/android/router/MainActivity.java b/app/src/main/java/net/i2p/android/router/MainActivity.java
similarity index 100%
rename from src/net/i2p/android/router/MainActivity.java
rename to app/src/main/java/net/i2p/android/router/MainActivity.java
diff --git a/src/net/i2p/android/router/MainFragment.java b/app/src/main/java/net/i2p/android/router/MainFragment.java
similarity index 100%
rename from src/net/i2p/android/router/MainFragment.java
rename to app/src/main/java/net/i2p/android/router/MainFragment.java
diff --git a/src/net/i2p/android/router/NewsActivity.java b/app/src/main/java/net/i2p/android/router/NewsActivity.java
similarity index 100%
rename from src/net/i2p/android/router/NewsActivity.java
rename to app/src/main/java/net/i2p/android/router/NewsActivity.java
diff --git a/src/net/i2p/android/router/NewsFragment.java b/app/src/main/java/net/i2p/android/router/NewsFragment.java
similarity index 100%
rename from src/net/i2p/android/router/NewsFragment.java
rename to app/src/main/java/net/i2p/android/router/NewsFragment.java
diff --git a/src/net/i2p/android/router/SettingsActivity.java b/app/src/main/java/net/i2p/android/router/SettingsActivity.java
similarity index 100%
rename from src/net/i2p/android/router/SettingsActivity.java
rename to app/src/main/java/net/i2p/android/router/SettingsActivity.java
diff --git a/src/net/i2p/android/router/addressbook/AddressEntry.java b/app/src/main/java/net/i2p/android/router/addressbook/AddressEntry.java
similarity index 100%
rename from src/net/i2p/android/router/addressbook/AddressEntry.java
rename to app/src/main/java/net/i2p/android/router/addressbook/AddressEntry.java
diff --git a/src/net/i2p/android/router/addressbook/AddressEntryAdapter.java b/app/src/main/java/net/i2p/android/router/addressbook/AddressEntryAdapter.java
similarity index 100%
rename from src/net/i2p/android/router/addressbook/AddressEntryAdapter.java
rename to app/src/main/java/net/i2p/android/router/addressbook/AddressEntryAdapter.java
diff --git a/src/net/i2p/android/router/addressbook/AddressEntryLoader.java b/app/src/main/java/net/i2p/android/router/addressbook/AddressEntryLoader.java
similarity index 100%
rename from src/net/i2p/android/router/addressbook/AddressEntryLoader.java
rename to app/src/main/java/net/i2p/android/router/addressbook/AddressEntryLoader.java
diff --git a/src/net/i2p/android/router/addressbook/AddressbookActivity.java b/app/src/main/java/net/i2p/android/router/addressbook/AddressbookActivity.java
similarity index 100%
rename from src/net/i2p/android/router/addressbook/AddressbookActivity.java
rename to app/src/main/java/net/i2p/android/router/addressbook/AddressbookActivity.java
diff --git a/src/net/i2p/android/router/addressbook/AddressbookAddWizardActivity.java b/app/src/main/java/net/i2p/android/router/addressbook/AddressbookAddWizardActivity.java
similarity index 100%
rename from src/net/i2p/android/router/addressbook/AddressbookAddWizardActivity.java
rename to app/src/main/java/net/i2p/android/router/addressbook/AddressbookAddWizardActivity.java
diff --git a/src/net/i2p/android/router/addressbook/AddressbookAddWizardModel.java b/app/src/main/java/net/i2p/android/router/addressbook/AddressbookAddWizardModel.java
similarity index 100%
rename from src/net/i2p/android/router/addressbook/AddressbookAddWizardModel.java
rename to app/src/main/java/net/i2p/android/router/addressbook/AddressbookAddWizardModel.java
diff --git a/src/net/i2p/android/router/addressbook/AddressbookFragment.java b/app/src/main/java/net/i2p/android/router/addressbook/AddressbookFragment.java
similarity index 100%
rename from src/net/i2p/android/router/addressbook/AddressbookFragment.java
rename to app/src/main/java/net/i2p/android/router/addressbook/AddressbookFragment.java
diff --git a/src/net/i2p/android/router/addressbook/AddressbookSettingsActivity.java b/app/src/main/java/net/i2p/android/router/addressbook/AddressbookSettingsActivity.java
similarity index 100%
rename from src/net/i2p/android/router/addressbook/AddressbookSettingsActivity.java
rename to app/src/main/java/net/i2p/android/router/addressbook/AddressbookSettingsActivity.java
diff --git a/src/net/i2p/android/router/dialog/AboutDialog.java b/app/src/main/java/net/i2p/android/router/dialog/AboutDialog.java
similarity index 100%
rename from src/net/i2p/android/router/dialog/AboutDialog.java
rename to app/src/main/java/net/i2p/android/router/dialog/AboutDialog.java
diff --git a/src/net/i2p/android/router/dialog/FirstStartDialog.java b/app/src/main/java/net/i2p/android/router/dialog/FirstStartDialog.java
similarity index 100%
rename from src/net/i2p/android/router/dialog/FirstStartDialog.java
rename to app/src/main/java/net/i2p/android/router/dialog/FirstStartDialog.java
diff --git a/src/net/i2p/android/router/dialog/TextResourceDialog.java b/app/src/main/java/net/i2p/android/router/dialog/TextResourceDialog.java
similarity index 100%
rename from src/net/i2p/android/router/dialog/TextResourceDialog.java
rename to app/src/main/java/net/i2p/android/router/dialog/TextResourceDialog.java
diff --git a/src/net/i2p/android/router/dialog/VersionDialog.java b/app/src/main/java/net/i2p/android/router/dialog/VersionDialog.java
similarity index 100%
rename from src/net/i2p/android/router/dialog/VersionDialog.java
rename to app/src/main/java/net/i2p/android/router/dialog/VersionDialog.java
diff --git a/src/net/i2p/android/router/log/LogActivity.java b/app/src/main/java/net/i2p/android/router/log/LogActivity.java
similarity index 100%
rename from src/net/i2p/android/router/log/LogActivity.java
rename to app/src/main/java/net/i2p/android/router/log/LogActivity.java
diff --git a/src/net/i2p/android/router/log/LogAdapter.java b/app/src/main/java/net/i2p/android/router/log/LogAdapter.java
similarity index 100%
rename from src/net/i2p/android/router/log/LogAdapter.java
rename to app/src/main/java/net/i2p/android/router/log/LogAdapter.java
diff --git a/src/net/i2p/android/router/log/LogDetailActivity.java b/app/src/main/java/net/i2p/android/router/log/LogDetailActivity.java
similarity index 100%
rename from src/net/i2p/android/router/log/LogDetailActivity.java
rename to app/src/main/java/net/i2p/android/router/log/LogDetailActivity.java
diff --git a/src/net/i2p/android/router/log/LogDetailFragment.java b/app/src/main/java/net/i2p/android/router/log/LogDetailFragment.java
similarity index 100%
rename from src/net/i2p/android/router/log/LogDetailFragment.java
rename to app/src/main/java/net/i2p/android/router/log/LogDetailFragment.java
diff --git a/src/net/i2p/android/router/log/LogFragment.java b/app/src/main/java/net/i2p/android/router/log/LogFragment.java
similarity index 100%
rename from src/net/i2p/android/router/log/LogFragment.java
rename to app/src/main/java/net/i2p/android/router/log/LogFragment.java
diff --git a/src/net/i2p/android/router/log/LogLoader.java b/app/src/main/java/net/i2p/android/router/log/LogLoader.java
similarity index 100%
rename from src/net/i2p/android/router/log/LogLoader.java
rename to app/src/main/java/net/i2p/android/router/log/LogLoader.java
diff --git a/src/net/i2p/android/router/netdb/NetDbActivity.java b/app/src/main/java/net/i2p/android/router/netdb/NetDbActivity.java
similarity index 100%
rename from src/net/i2p/android/router/netdb/NetDbActivity.java
rename to app/src/main/java/net/i2p/android/router/netdb/NetDbActivity.java
diff --git a/src/net/i2p/android/router/netdb/NetDbDetailActivity.java b/app/src/main/java/net/i2p/android/router/netdb/NetDbDetailActivity.java
similarity index 100%
rename from src/net/i2p/android/router/netdb/NetDbDetailActivity.java
rename to app/src/main/java/net/i2p/android/router/netdb/NetDbDetailActivity.java
diff --git a/src/net/i2p/android/router/netdb/NetDbDetailFragment.java b/app/src/main/java/net/i2p/android/router/netdb/NetDbDetailFragment.java
similarity index 100%
rename from src/net/i2p/android/router/netdb/NetDbDetailFragment.java
rename to app/src/main/java/net/i2p/android/router/netdb/NetDbDetailFragment.java
diff --git a/src/net/i2p/android/router/netdb/NetDbEntry.java b/app/src/main/java/net/i2p/android/router/netdb/NetDbEntry.java
similarity index 100%
rename from src/net/i2p/android/router/netdb/NetDbEntry.java
rename to app/src/main/java/net/i2p/android/router/netdb/NetDbEntry.java
diff --git a/src/net/i2p/android/router/netdb/NetDbEntryAdapter.java b/app/src/main/java/net/i2p/android/router/netdb/NetDbEntryAdapter.java
similarity index 100%
rename from src/net/i2p/android/router/netdb/NetDbEntryAdapter.java
rename to app/src/main/java/net/i2p/android/router/netdb/NetDbEntryAdapter.java
diff --git a/src/net/i2p/android/router/netdb/NetDbEntryLoader.java b/app/src/main/java/net/i2p/android/router/netdb/NetDbEntryLoader.java
similarity index 100%
rename from src/net/i2p/android/router/netdb/NetDbEntryLoader.java
rename to app/src/main/java/net/i2p/android/router/netdb/NetDbEntryLoader.java
diff --git a/src/net/i2p/android/router/netdb/NetDbListFragment.java b/app/src/main/java/net/i2p/android/router/netdb/NetDbListFragment.java
similarity index 100%
rename from src/net/i2p/android/router/netdb/NetDbListFragment.java
rename to app/src/main/java/net/i2p/android/router/netdb/NetDbListFragment.java
diff --git a/src/net/i2p/android/router/netdb/NetDbStatsLoader.java b/app/src/main/java/net/i2p/android/router/netdb/NetDbStatsLoader.java
similarity index 100%
rename from src/net/i2p/android/router/netdb/NetDbStatsLoader.java
rename to app/src/main/java/net/i2p/android/router/netdb/NetDbStatsLoader.java
diff --git a/src/net/i2p/android/router/netdb/NetDbSummaryPagerFragment.java b/app/src/main/java/net/i2p/android/router/netdb/NetDbSummaryPagerFragment.java
similarity index 100%
rename from src/net/i2p/android/router/netdb/NetDbSummaryPagerFragment.java
rename to app/src/main/java/net/i2p/android/router/netdb/NetDbSummaryPagerFragment.java
diff --git a/src/net/i2p/android/router/netdb/NetDbSummaryTableFragment.java b/app/src/main/java/net/i2p/android/router/netdb/NetDbSummaryTableFragment.java
similarity index 100%
rename from src/net/i2p/android/router/netdb/NetDbSummaryTableFragment.java
rename to app/src/main/java/net/i2p/android/router/netdb/NetDbSummaryTableFragment.java
diff --git a/src/net/i2p/android/router/provider/CacheProvider.java b/app/src/main/java/net/i2p/android/router/provider/CacheProvider.java
similarity index 100%
rename from src/net/i2p/android/router/provider/CacheProvider.java
rename to app/src/main/java/net/i2p/android/router/provider/CacheProvider.java
diff --git a/src/net/i2p/android/router/receiver/I2PReceiver.java b/app/src/main/java/net/i2p/android/router/receiver/I2PReceiver.java
similarity index 100%
rename from src/net/i2p/android/router/receiver/I2PReceiver.java
rename to app/src/main/java/net/i2p/android/router/receiver/I2PReceiver.java
diff --git a/src/net/i2p/android/router/service/Init.java b/app/src/main/java/net/i2p/android/router/service/Init.java
similarity index 100%
rename from src/net/i2p/android/router/service/Init.java
rename to app/src/main/java/net/i2p/android/router/service/Init.java
diff --git a/src/net/i2p/android/router/service/LoadClientsJob.java b/app/src/main/java/net/i2p/android/router/service/LoadClientsJob.java
similarity index 100%
rename from src/net/i2p/android/router/service/LoadClientsJob.java
rename to app/src/main/java/net/i2p/android/router/service/LoadClientsJob.java
diff --git a/src/net/i2p/android/router/service/RouterBinder.java b/app/src/main/java/net/i2p/android/router/service/RouterBinder.java
similarity index 100%
rename from src/net/i2p/android/router/service/RouterBinder.java
rename to app/src/main/java/net/i2p/android/router/service/RouterBinder.java
diff --git a/src/net/i2p/android/router/service/RouterService.java b/app/src/main/java/net/i2p/android/router/service/RouterService.java
similarity index 100%
rename from src/net/i2p/android/router/service/RouterService.java
rename to app/src/main/java/net/i2p/android/router/service/RouterService.java
diff --git a/src/net/i2p/android/router/service/StatSummarizer.java b/app/src/main/java/net/i2p/android/router/service/StatSummarizer.java
similarity index 100%
rename from src/net/i2p/android/router/service/StatSummarizer.java
rename to app/src/main/java/net/i2p/android/router/service/StatSummarizer.java
diff --git a/src/net/i2p/android/router/service/StatusBar.java b/app/src/main/java/net/i2p/android/router/service/StatusBar.java
similarity index 100%
rename from src/net/i2p/android/router/service/StatusBar.java
rename to app/src/main/java/net/i2p/android/router/service/StatusBar.java
diff --git a/src/net/i2p/android/router/service/SummaryListener.java b/app/src/main/java/net/i2p/android/router/service/SummaryListener.java
similarity index 100%
rename from src/net/i2p/android/router/service/SummaryListener.java
rename to app/src/main/java/net/i2p/android/router/service/SummaryListener.java
diff --git a/src/net/i2p/android/router/stats/PeersActivity.java b/app/src/main/java/net/i2p/android/router/stats/PeersActivity.java
similarity index 100%
rename from src/net/i2p/android/router/stats/PeersActivity.java
rename to app/src/main/java/net/i2p/android/router/stats/PeersActivity.java
diff --git a/src/net/i2p/android/router/stats/PeersFragment.java b/app/src/main/java/net/i2p/android/router/stats/PeersFragment.java
similarity index 100%
rename from src/net/i2p/android/router/stats/PeersFragment.java
rename to app/src/main/java/net/i2p/android/router/stats/PeersFragment.java
diff --git a/src/net/i2p/android/router/stats/RateGraphActivity.java b/app/src/main/java/net/i2p/android/router/stats/RateGraphActivity.java
similarity index 100%
rename from src/net/i2p/android/router/stats/RateGraphActivity.java
rename to app/src/main/java/net/i2p/android/router/stats/RateGraphActivity.java
diff --git a/src/net/i2p/android/router/stats/RateGraphFragment.java b/app/src/main/java/net/i2p/android/router/stats/RateGraphFragment.java
similarity index 100%
rename from src/net/i2p/android/router/stats/RateGraphFragment.java
rename to app/src/main/java/net/i2p/android/router/stats/RateGraphFragment.java
diff --git a/src/net/i2p/android/router/util/AppCache.java b/app/src/main/java/net/i2p/android/router/util/AppCache.java
similarity index 100%
rename from src/net/i2p/android/router/util/AppCache.java
rename to app/src/main/java/net/i2p/android/router/util/AppCache.java
diff --git a/src/net/i2p/android/router/util/I2Patterns.java b/app/src/main/java/net/i2p/android/router/util/I2Patterns.java
similarity index 100%
rename from src/net/i2p/android/router/util/I2Patterns.java
rename to app/src/main/java/net/i2p/android/router/util/I2Patterns.java
diff --git a/src/net/i2p/android/router/util/LongToggleButton.java b/app/src/main/java/net/i2p/android/router/util/LongToggleButton.java
similarity index 100%
rename from src/net/i2p/android/router/util/LongToggleButton.java
rename to app/src/main/java/net/i2p/android/router/util/LongToggleButton.java
diff --git a/src/net/i2p/android/router/util/NamingServiceUtil.java b/app/src/main/java/net/i2p/android/router/util/NamingServiceUtil.java
similarity index 100%
rename from src/net/i2p/android/router/util/NamingServiceUtil.java
rename to app/src/main/java/net/i2p/android/router/util/NamingServiceUtil.java
diff --git a/src/net/i2p/android/router/util/Notifications.java b/app/src/main/java/net/i2p/android/router/util/Notifications.java
similarity index 100%
rename from src/net/i2p/android/router/util/Notifications.java
rename to app/src/main/java/net/i2p/android/router/util/Notifications.java
diff --git a/src/net/i2p/android/router/util/Util.java b/app/src/main/java/net/i2p/android/router/util/Util.java
similarity index 100%
rename from src/net/i2p/android/router/util/Util.java
rename to app/src/main/java/net/i2p/android/router/util/Util.java
diff --git a/src/net/i2p/android/router/web/I2PWebViewClient.java b/app/src/main/java/net/i2p/android/router/web/I2PWebViewClient.java
similarity index 100%
rename from src/net/i2p/android/router/web/I2PWebViewClient.java
rename to app/src/main/java/net/i2p/android/router/web/I2PWebViewClient.java
diff --git a/src/net/i2p/android/router/web/WebActivity.java b/app/src/main/java/net/i2p/android/router/web/WebActivity.java
similarity index 100%
rename from src/net/i2p/android/router/web/WebActivity.java
rename to app/src/main/java/net/i2p/android/router/web/WebActivity.java
diff --git a/src/net/i2p/android/router/web/WebFragment.java b/app/src/main/java/net/i2p/android/router/web/WebFragment.java
similarity index 100%
rename from src/net/i2p/android/router/web/WebFragment.java
rename to app/src/main/java/net/i2p/android/router/web/WebFragment.java
diff --git a/src/net/i2p/android/wizard/model/AbstractWizardModel.java b/app/src/main/java/net/i2p/android/wizard/model/AbstractWizardModel.java
similarity index 100%
rename from src/net/i2p/android/wizard/model/AbstractWizardModel.java
rename to app/src/main/java/net/i2p/android/wizard/model/AbstractWizardModel.java
diff --git a/src/net/i2p/android/wizard/model/BranchPage.java b/app/src/main/java/net/i2p/android/wizard/model/BranchPage.java
similarity index 100%
rename from src/net/i2p/android/wizard/model/BranchPage.java
rename to app/src/main/java/net/i2p/android/wizard/model/BranchPage.java
diff --git a/src/net/i2p/android/wizard/model/Conditional.java b/app/src/main/java/net/i2p/android/wizard/model/Conditional.java
similarity index 100%
rename from src/net/i2p/android/wizard/model/Conditional.java
rename to app/src/main/java/net/i2p/android/wizard/model/Conditional.java
diff --git a/src/net/i2p/android/wizard/model/I2PB64DestinationPage.java b/app/src/main/java/net/i2p/android/wizard/model/I2PB64DestinationPage.java
similarity index 100%
rename from src/net/i2p/android/wizard/model/I2PB64DestinationPage.java
rename to app/src/main/java/net/i2p/android/wizard/model/I2PB64DestinationPage.java
diff --git a/src/net/i2p/android/wizard/model/I2PDestinationPage.java b/app/src/main/java/net/i2p/android/wizard/model/I2PDestinationPage.java
similarity index 100%
rename from src/net/i2p/android/wizard/model/I2PDestinationPage.java
rename to app/src/main/java/net/i2p/android/wizard/model/I2PDestinationPage.java
diff --git a/src/net/i2p/android/wizard/model/ModelCallbacks.java b/app/src/main/java/net/i2p/android/wizard/model/ModelCallbacks.java
similarity index 100%
rename from src/net/i2p/android/wizard/model/ModelCallbacks.java
rename to app/src/main/java/net/i2p/android/wizard/model/ModelCallbacks.java
diff --git a/src/net/i2p/android/wizard/model/MultipleFixedChoicePage.java b/app/src/main/java/net/i2p/android/wizard/model/MultipleFixedChoicePage.java
similarity index 100%
rename from src/net/i2p/android/wizard/model/MultipleFixedChoicePage.java
rename to app/src/main/java/net/i2p/android/wizard/model/MultipleFixedChoicePage.java
diff --git a/src/net/i2p/android/wizard/model/Page.java b/app/src/main/java/net/i2p/android/wizard/model/Page.java
similarity index 100%
rename from src/net/i2p/android/wizard/model/Page.java
rename to app/src/main/java/net/i2p/android/wizard/model/Page.java
diff --git a/src/net/i2p/android/wizard/model/PageList.java b/app/src/main/java/net/i2p/android/wizard/model/PageList.java
similarity index 100%
rename from src/net/i2p/android/wizard/model/PageList.java
rename to app/src/main/java/net/i2p/android/wizard/model/PageList.java
diff --git a/src/net/i2p/android/wizard/model/PageTreeNode.java b/app/src/main/java/net/i2p/android/wizard/model/PageTreeNode.java
similarity index 100%
rename from src/net/i2p/android/wizard/model/PageTreeNode.java
rename to app/src/main/java/net/i2p/android/wizard/model/PageTreeNode.java
diff --git a/src/net/i2p/android/wizard/model/ReviewItem.java b/app/src/main/java/net/i2p/android/wizard/model/ReviewItem.java
similarity index 100%
rename from src/net/i2p/android/wizard/model/ReviewItem.java
rename to app/src/main/java/net/i2p/android/wizard/model/ReviewItem.java
diff --git a/src/net/i2p/android/wizard/model/SingleFixedBooleanPage.java b/app/src/main/java/net/i2p/android/wizard/model/SingleFixedBooleanPage.java
similarity index 100%
rename from src/net/i2p/android/wizard/model/SingleFixedBooleanPage.java
rename to app/src/main/java/net/i2p/android/wizard/model/SingleFixedBooleanPage.java
diff --git a/src/net/i2p/android/wizard/model/SingleFixedChoicePage.java b/app/src/main/java/net/i2p/android/wizard/model/SingleFixedChoicePage.java
similarity index 100%
rename from src/net/i2p/android/wizard/model/SingleFixedChoicePage.java
rename to app/src/main/java/net/i2p/android/wizard/model/SingleFixedChoicePage.java
diff --git a/src/net/i2p/android/wizard/model/SingleTextFieldPage.java b/app/src/main/java/net/i2p/android/wizard/model/SingleTextFieldPage.java
similarity index 100%
rename from src/net/i2p/android/wizard/model/SingleTextFieldPage.java
rename to app/src/main/java/net/i2p/android/wizard/model/SingleTextFieldPage.java
diff --git a/src/net/i2p/android/wizard/ui/AbstractWizardActivity.java b/app/src/main/java/net/i2p/android/wizard/ui/AbstractWizardActivity.java
similarity index 100%
rename from src/net/i2p/android/wizard/ui/AbstractWizardActivity.java
rename to app/src/main/java/net/i2p/android/wizard/ui/AbstractWizardActivity.java
diff --git a/src/net/i2p/android/wizard/ui/I2PB64DestinationFragment.java b/app/src/main/java/net/i2p/android/wizard/ui/I2PB64DestinationFragment.java
similarity index 100%
rename from src/net/i2p/android/wizard/ui/I2PB64DestinationFragment.java
rename to app/src/main/java/net/i2p/android/wizard/ui/I2PB64DestinationFragment.java
diff --git a/src/net/i2p/android/wizard/ui/I2PDestinationFragment.java b/app/src/main/java/net/i2p/android/wizard/ui/I2PDestinationFragment.java
similarity index 100%
rename from src/net/i2p/android/wizard/ui/I2PDestinationFragment.java
rename to app/src/main/java/net/i2p/android/wizard/ui/I2PDestinationFragment.java
diff --git a/src/net/i2p/android/wizard/ui/MultipleChoiceFragment.java b/app/src/main/java/net/i2p/android/wizard/ui/MultipleChoiceFragment.java
similarity index 100%
rename from src/net/i2p/android/wizard/ui/MultipleChoiceFragment.java
rename to app/src/main/java/net/i2p/android/wizard/ui/MultipleChoiceFragment.java
diff --git a/src/net/i2p/android/wizard/ui/PageFragmentCallbacks.java b/app/src/main/java/net/i2p/android/wizard/ui/PageFragmentCallbacks.java
similarity index 100%
rename from src/net/i2p/android/wizard/ui/PageFragmentCallbacks.java
rename to app/src/main/java/net/i2p/android/wizard/ui/PageFragmentCallbacks.java
diff --git a/src/net/i2p/android/wizard/ui/ReviewFragment.java b/app/src/main/java/net/i2p/android/wizard/ui/ReviewFragment.java
similarity index 100%
rename from src/net/i2p/android/wizard/ui/ReviewFragment.java
rename to app/src/main/java/net/i2p/android/wizard/ui/ReviewFragment.java
diff --git a/src/net/i2p/android/wizard/ui/SingleBooleanFragment.java b/app/src/main/java/net/i2p/android/wizard/ui/SingleBooleanFragment.java
similarity index 100%
rename from src/net/i2p/android/wizard/ui/SingleBooleanFragment.java
rename to app/src/main/java/net/i2p/android/wizard/ui/SingleBooleanFragment.java
diff --git a/src/net/i2p/android/wizard/ui/SingleChoiceFragment.java b/app/src/main/java/net/i2p/android/wizard/ui/SingleChoiceFragment.java
similarity index 100%
rename from src/net/i2p/android/wizard/ui/SingleChoiceFragment.java
rename to app/src/main/java/net/i2p/android/wizard/ui/SingleChoiceFragment.java
diff --git a/src/net/i2p/android/wizard/ui/SingleTextFieldFragment.java b/app/src/main/java/net/i2p/android/wizard/ui/SingleTextFieldFragment.java
similarity index 100%
rename from src/net/i2p/android/wizard/ui/SingleTextFieldFragment.java
rename to app/src/main/java/net/i2p/android/wizard/ui/SingleTextFieldFragment.java
diff --git a/src/net/i2p/android/wizard/ui/StepPagerStrip.java b/app/src/main/java/net/i2p/android/wizard/ui/StepPagerStrip.java
similarity index 100%
rename from src/net/i2p/android/wizard/ui/StepPagerStrip.java
rename to app/src/main/java/net/i2p/android/wizard/ui/StepPagerStrip.java
diff --git a/src/net/i2p/i2ptunnel/I2PTunnelGUI.java b/app/src/main/java/net/i2p/i2ptunnel/I2PTunnelGUI.java
similarity index 100%
rename from src/net/i2p/i2ptunnel/I2PTunnelGUI.java
rename to app/src/main/java/net/i2p/i2ptunnel/I2PTunnelGUI.java
diff --git a/src/net/i2p/util/LogWriter.java b/app/src/main/java/net/i2p/util/LogWriter.java
similarity index 100%
rename from src/net/i2p/util/LogWriter.java
rename to app/src/main/java/net/i2p/util/LogWriter.java
diff --git a/src/net/i2p/util/SecureDirectory.java b/app/src/main/java/net/i2p/util/SecureDirectory.java
similarity index 100%
rename from src/net/i2p/util/SecureDirectory.java
rename to app/src/main/java/net/i2p/util/SecureDirectory.java
diff --git a/src/net/i2p/util/SecureFile.java b/app/src/main/java/net/i2p/util/SecureFile.java
similarity index 100%
rename from src/net/i2p/util/SecureFile.java
rename to app/src/main/java/net/i2p/util/SecureFile.java
diff --git a/src/net/i2p/util/SecureFileOutputStream.java b/app/src/main/java/net/i2p/util/SecureFileOutputStream.java
similarity index 100%
rename from src/net/i2p/util/SecureFileOutputStream.java
rename to app/src/main/java/net/i2p/util/SecureFileOutputStream.java
diff --git a/res/drawable-hdpi/drawer_shadow.9.png b/app/src/main/res/drawable-hdpi/drawer_shadow.9.png
similarity index 100%
rename from res/drawable-hdpi/drawer_shadow.9.png
rename to app/src/main/res/drawable-hdpi/drawer_shadow.9.png
diff --git a/res/drawable-hdpi/ic_action_search.png b/app/src/main/res/drawable-hdpi/ic_action_search.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_search.png
rename to app/src/main/res/drawable-hdpi/ic_action_search.png
diff --git a/res/drawable-hdpi/ic_av_play.png b/app/src/main/res/drawable-hdpi/ic_av_play.png
similarity index 100%
rename from res/drawable-hdpi/ic_av_play.png
rename to app/src/main/res/drawable-hdpi/ic_av_play.png
diff --git a/res/drawable-hdpi/ic_av_stop.png b/app/src/main/res/drawable-hdpi/ic_av_stop.png
similarity index 100%
rename from res/drawable-hdpi/ic_av_stop.png
rename to app/src/main/res/drawable-hdpi/ic_av_stop.png
diff --git a/res/drawable-hdpi/ic_content_discard.png b/app/src/main/res/drawable-hdpi/ic_content_discard.png
similarity index 100%
rename from res/drawable-hdpi/ic_content_discard.png
rename to app/src/main/res/drawable-hdpi/ic_content_discard.png
diff --git a/res/drawable-hdpi/ic_content_edit.png b/app/src/main/res/drawable-hdpi/ic_content_edit.png
similarity index 100%
rename from res/drawable-hdpi/ic_content_edit.png
rename to app/src/main/res/drawable-hdpi/ic_content_edit.png
diff --git a/res/drawable-hdpi/ic_content_new.png b/app/src/main/res/drawable-hdpi/ic_content_new.png
similarity index 100%
rename from res/drawable-hdpi/ic_content_new.png
rename to app/src/main/res/drawable-hdpi/ic_content_new.png
diff --git a/res/drawable-hdpi/ic_drawer.png b/app/src/main/res/drawable-hdpi/ic_drawer.png
similarity index 100%
rename from res/drawable-hdpi/ic_drawer.png
rename to app/src/main/res/drawable-hdpi/ic_drawer.png
diff --git a/res/drawable-hdpi/ic_launcher_itoopie.png b/app/src/main/res/drawable-hdpi/ic_launcher_itoopie.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher_itoopie.png
rename to app/src/main/res/drawable-hdpi/ic_launcher_itoopie.png
diff --git a/res/drawable-hdpi/ic_navigation_refresh.png b/app/src/main/res/drawable-hdpi/ic_navigation_refresh.png
similarity index 100%
rename from res/drawable-hdpi/ic_navigation_refresh.png
rename to app/src/main/res/drawable-hdpi/ic_navigation_refresh.png
diff --git a/res/drawable-hdpi/ic_stat_router_active.png b/app/src/main/res/drawable-hdpi/ic_stat_router_active.png
similarity index 100%
rename from res/drawable-hdpi/ic_stat_router_active.png
rename to app/src/main/res/drawable-hdpi/ic_stat_router_active.png
diff --git a/res/drawable-hdpi/ic_stat_router_running.png b/app/src/main/res/drawable-hdpi/ic_stat_router_running.png
similarity index 100%
rename from res/drawable-hdpi/ic_stat_router_running.png
rename to app/src/main/res/drawable-hdpi/ic_stat_router_running.png
diff --git a/res/drawable-hdpi/ic_stat_router_shutting_down.png b/app/src/main/res/drawable-hdpi/ic_stat_router_shutting_down.png
similarity index 100%
rename from res/drawable-hdpi/ic_stat_router_shutting_down.png
rename to app/src/main/res/drawable-hdpi/ic_stat_router_shutting_down.png
diff --git a/res/drawable-hdpi/ic_stat_router_starting.png b/app/src/main/res/drawable-hdpi/ic_stat_router_starting.png
similarity index 100%
rename from res/drawable-hdpi/ic_stat_router_starting.png
rename to app/src/main/res/drawable-hdpi/ic_stat_router_starting.png
diff --git a/res/drawable-hdpi/ic_stat_router_stopping.png b/app/src/main/res/drawable-hdpi/ic_stat_router_stopping.png
similarity index 100%
rename from res/drawable-hdpi/ic_stat_router_stopping.png
rename to app/src/main/res/drawable-hdpi/ic_stat_router_stopping.png
diff --git a/res/drawable-hdpi/ic_stat_router_waiting_network.png b/app/src/main/res/drawable-hdpi/ic_stat_router_waiting_network.png
similarity index 100%
rename from res/drawable-hdpi/ic_stat_router_waiting_network.png
rename to app/src/main/res/drawable-hdpi/ic_stat_router_waiting_network.png
diff --git a/res/drawable-mdpi/drawer_shadow.9.png b/app/src/main/res/drawable-mdpi/drawer_shadow.9.png
similarity index 100%
rename from res/drawable-mdpi/drawer_shadow.9.png
rename to app/src/main/res/drawable-mdpi/drawer_shadow.9.png
diff --git a/res/drawable-mdpi/ic_action_search.png b/app/src/main/res/drawable-mdpi/ic_action_search.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_search.png
rename to app/src/main/res/drawable-mdpi/ic_action_search.png
diff --git a/res/drawable-mdpi/ic_av_play.png b/app/src/main/res/drawable-mdpi/ic_av_play.png
similarity index 100%
rename from res/drawable-mdpi/ic_av_play.png
rename to app/src/main/res/drawable-mdpi/ic_av_play.png
diff --git a/res/drawable-mdpi/ic_av_stop.png b/app/src/main/res/drawable-mdpi/ic_av_stop.png
similarity index 100%
rename from res/drawable-mdpi/ic_av_stop.png
rename to app/src/main/res/drawable-mdpi/ic_av_stop.png
diff --git a/res/drawable-mdpi/ic_content_discard.png b/app/src/main/res/drawable-mdpi/ic_content_discard.png
similarity index 100%
rename from res/drawable-mdpi/ic_content_discard.png
rename to app/src/main/res/drawable-mdpi/ic_content_discard.png
diff --git a/res/drawable-mdpi/ic_content_edit.png b/app/src/main/res/drawable-mdpi/ic_content_edit.png
similarity index 100%
rename from res/drawable-mdpi/ic_content_edit.png
rename to app/src/main/res/drawable-mdpi/ic_content_edit.png
diff --git a/res/drawable-mdpi/ic_content_new.png b/app/src/main/res/drawable-mdpi/ic_content_new.png
similarity index 100%
rename from res/drawable-mdpi/ic_content_new.png
rename to app/src/main/res/drawable-mdpi/ic_content_new.png
diff --git a/res/drawable-mdpi/ic_drawer.png b/app/src/main/res/drawable-mdpi/ic_drawer.png
similarity index 100%
rename from res/drawable-mdpi/ic_drawer.png
rename to app/src/main/res/drawable-mdpi/ic_drawer.png
diff --git a/res/drawable-mdpi/ic_launcher_itoopie.png b/app/src/main/res/drawable-mdpi/ic_launcher_itoopie.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher_itoopie.png
rename to app/src/main/res/drawable-mdpi/ic_launcher_itoopie.png
diff --git a/res/drawable-mdpi/ic_navigation_refresh.png b/app/src/main/res/drawable-mdpi/ic_navigation_refresh.png
similarity index 100%
rename from res/drawable-mdpi/ic_navigation_refresh.png
rename to app/src/main/res/drawable-mdpi/ic_navigation_refresh.png
diff --git a/res/drawable-mdpi/ic_stat_router_active.png b/app/src/main/res/drawable-mdpi/ic_stat_router_active.png
similarity index 100%
rename from res/drawable-mdpi/ic_stat_router_active.png
rename to app/src/main/res/drawable-mdpi/ic_stat_router_active.png
diff --git a/res/drawable-mdpi/ic_stat_router_running.png b/app/src/main/res/drawable-mdpi/ic_stat_router_running.png
similarity index 100%
rename from res/drawable-mdpi/ic_stat_router_running.png
rename to app/src/main/res/drawable-mdpi/ic_stat_router_running.png
diff --git a/res/drawable-mdpi/ic_stat_router_shutting_down.png b/app/src/main/res/drawable-mdpi/ic_stat_router_shutting_down.png
similarity index 100%
rename from res/drawable-mdpi/ic_stat_router_shutting_down.png
rename to app/src/main/res/drawable-mdpi/ic_stat_router_shutting_down.png
diff --git a/res/drawable-mdpi/ic_stat_router_starting.png b/app/src/main/res/drawable-mdpi/ic_stat_router_starting.png
similarity index 100%
rename from res/drawable-mdpi/ic_stat_router_starting.png
rename to app/src/main/res/drawable-mdpi/ic_stat_router_starting.png
diff --git a/res/drawable-mdpi/ic_stat_router_stopping.png b/app/src/main/res/drawable-mdpi/ic_stat_router_stopping.png
similarity index 100%
rename from res/drawable-mdpi/ic_stat_router_stopping.png
rename to app/src/main/res/drawable-mdpi/ic_stat_router_stopping.png
diff --git a/res/drawable-mdpi/ic_stat_router_waiting_network.png b/app/src/main/res/drawable-mdpi/ic_stat_router_waiting_network.png
similarity index 100%
rename from res/drawable-mdpi/ic_stat_router_waiting_network.png
rename to app/src/main/res/drawable-mdpi/ic_stat_router_waiting_network.png
diff --git a/res/drawable-xhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png
similarity index 100%
rename from res/drawable-xhdpi/drawer_shadow.9.png
rename to app/src/main/res/drawable-xhdpi/drawer_shadow.9.png
diff --git a/res/drawable-xhdpi/ic_action_search.png b/app/src/main/res/drawable-xhdpi/ic_action_search.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_search.png
rename to app/src/main/res/drawable-xhdpi/ic_action_search.png
diff --git a/res/drawable-xhdpi/ic_av_play.png b/app/src/main/res/drawable-xhdpi/ic_av_play.png
similarity index 100%
rename from res/drawable-xhdpi/ic_av_play.png
rename to app/src/main/res/drawable-xhdpi/ic_av_play.png
diff --git a/res/drawable-xhdpi/ic_av_stop.png b/app/src/main/res/drawable-xhdpi/ic_av_stop.png
similarity index 100%
rename from res/drawable-xhdpi/ic_av_stop.png
rename to app/src/main/res/drawable-xhdpi/ic_av_stop.png
diff --git a/res/drawable-xhdpi/ic_content_discard.png b/app/src/main/res/drawable-xhdpi/ic_content_discard.png
similarity index 100%
rename from res/drawable-xhdpi/ic_content_discard.png
rename to app/src/main/res/drawable-xhdpi/ic_content_discard.png
diff --git a/res/drawable-xhdpi/ic_content_edit.png b/app/src/main/res/drawable-xhdpi/ic_content_edit.png
similarity index 100%
rename from res/drawable-xhdpi/ic_content_edit.png
rename to app/src/main/res/drawable-xhdpi/ic_content_edit.png
diff --git a/res/drawable-xhdpi/ic_content_new.png b/app/src/main/res/drawable-xhdpi/ic_content_new.png
similarity index 100%
rename from res/drawable-xhdpi/ic_content_new.png
rename to app/src/main/res/drawable-xhdpi/ic_content_new.png
diff --git a/res/drawable-xhdpi/ic_drawer.png b/app/src/main/res/drawable-xhdpi/ic_drawer.png
similarity index 100%
rename from res/drawable-xhdpi/ic_drawer.png
rename to app/src/main/res/drawable-xhdpi/ic_drawer.png
diff --git a/res/drawable-xhdpi/ic_launcher_itoopie.png b/app/src/main/res/drawable-xhdpi/ic_launcher_itoopie.png
similarity index 100%
rename from res/drawable-xhdpi/ic_launcher_itoopie.png
rename to app/src/main/res/drawable-xhdpi/ic_launcher_itoopie.png
diff --git a/res/drawable-xhdpi/ic_navigation_refresh.png b/app/src/main/res/drawable-xhdpi/ic_navigation_refresh.png
similarity index 100%
rename from res/drawable-xhdpi/ic_navigation_refresh.png
rename to app/src/main/res/drawable-xhdpi/ic_navigation_refresh.png
diff --git a/res/drawable-xhdpi/ic_stat_router_active.png b/app/src/main/res/drawable-xhdpi/ic_stat_router_active.png
similarity index 100%
rename from res/drawable-xhdpi/ic_stat_router_active.png
rename to app/src/main/res/drawable-xhdpi/ic_stat_router_active.png
diff --git a/res/drawable-xhdpi/ic_stat_router_running.png b/app/src/main/res/drawable-xhdpi/ic_stat_router_running.png
similarity index 100%
rename from res/drawable-xhdpi/ic_stat_router_running.png
rename to app/src/main/res/drawable-xhdpi/ic_stat_router_running.png
diff --git a/res/drawable-xhdpi/ic_stat_router_shutting_down.png b/app/src/main/res/drawable-xhdpi/ic_stat_router_shutting_down.png
similarity index 100%
rename from res/drawable-xhdpi/ic_stat_router_shutting_down.png
rename to app/src/main/res/drawable-xhdpi/ic_stat_router_shutting_down.png
diff --git a/res/drawable-xhdpi/ic_stat_router_starting.png b/app/src/main/res/drawable-xhdpi/ic_stat_router_starting.png
similarity index 100%
rename from res/drawable-xhdpi/ic_stat_router_starting.png
rename to app/src/main/res/drawable-xhdpi/ic_stat_router_starting.png
diff --git a/res/drawable-xhdpi/ic_stat_router_stopping.png b/app/src/main/res/drawable-xhdpi/ic_stat_router_stopping.png
similarity index 100%
rename from res/drawable-xhdpi/ic_stat_router_stopping.png
rename to app/src/main/res/drawable-xhdpi/ic_stat_router_stopping.png
diff --git a/res/drawable-xhdpi/ic_stat_router_waiting_network.png b/app/src/main/res/drawable-xhdpi/ic_stat_router_waiting_network.png
similarity index 100%
rename from res/drawable-xhdpi/ic_stat_router_waiting_network.png
rename to app/src/main/res/drawable-xhdpi/ic_stat_router_waiting_network.png
diff --git a/res/drawable/client.png b/app/src/main/res/drawable/client.png
similarity index 100%
rename from res/drawable/client.png
rename to app/src/main/res/drawable/client.png
diff --git a/res/drawable/itoopie_sm.png b/app/src/main/res/drawable/itoopie_sm.png
similarity index 100%
rename from res/drawable/itoopie_sm.png
rename to app/src/main/res/drawable/itoopie_sm.png
diff --git a/res/drawable/local_down.png b/app/src/main/res/drawable/local_down.png
similarity index 100%
rename from res/drawable/local_down.png
rename to app/src/main/res/drawable/local_down.png
diff --git a/res/drawable/local_inprogress.png b/app/src/main/res/drawable/local_inprogress.png
similarity index 100%
rename from res/drawable/local_inprogress.png
rename to app/src/main/res/drawable/local_inprogress.png
diff --git a/res/drawable/local_up.png b/app/src/main/res/drawable/local_up.png
similarity index 100%
rename from res/drawable/local_up.png
rename to app/src/main/res/drawable/local_up.png
diff --git a/res/drawable/routerled_g.png b/app/src/main/res/drawable/routerled_g.png
similarity index 100%
rename from res/drawable/routerled_g.png
rename to app/src/main/res/drawable/routerled_g.png
diff --git a/res/drawable/routerled_r.png b/app/src/main/res/drawable/routerled_r.png
similarity index 100%
rename from res/drawable/routerled_r.png
rename to app/src/main/res/drawable/routerled_r.png
diff --git a/res/drawable/routerled_ry.xml b/app/src/main/res/drawable/routerled_ry.xml
similarity index 100%
rename from res/drawable/routerled_ry.xml
rename to app/src/main/res/drawable/routerled_ry.xml
diff --git a/res/drawable/routerled_ry_1.png b/app/src/main/res/drawable/routerled_ry_1.png
similarity index 100%
rename from res/drawable/routerled_ry_1.png
rename to app/src/main/res/drawable/routerled_ry_1.png
diff --git a/res/drawable/routerled_ry_2.png b/app/src/main/res/drawable/routerled_ry_2.png
similarity index 100%
rename from res/drawable/routerled_ry_2.png
rename to app/src/main/res/drawable/routerled_ry_2.png
diff --git a/res/drawable/routerled_ry_3.png b/app/src/main/res/drawable/routerled_ry_3.png
similarity index 100%
rename from res/drawable/routerled_ry_3.png
rename to app/src/main/res/drawable/routerled_ry_3.png
diff --git a/res/drawable/routerled_ry_4.png b/app/src/main/res/drawable/routerled_ry_4.png
similarity index 100%
rename from res/drawable/routerled_ry_4.png
rename to app/src/main/res/drawable/routerled_ry_4.png
diff --git a/res/drawable/routerled_ry_5.png b/app/src/main/res/drawable/routerled_ry_5.png
similarity index 100%
rename from res/drawable/routerled_ry_5.png
rename to app/src/main/res/drawable/routerled_ry_5.png
diff --git a/res/drawable/routerled_y.png b/app/src/main/res/drawable/routerled_y.png
similarity index 100%
rename from res/drawable/routerled_y.png
rename to app/src/main/res/drawable/routerled_y.png
diff --git a/res/drawable/routerlogo_0.png b/app/src/main/res/drawable/routerlogo_0.png
similarity index 100%
rename from res/drawable/routerlogo_0.png
rename to app/src/main/res/drawable/routerlogo_0.png
diff --git a/res/drawable/routerlogo_1.png b/app/src/main/res/drawable/routerlogo_1.png
similarity index 100%
rename from res/drawable/routerlogo_1.png
rename to app/src/main/res/drawable/routerlogo_1.png
diff --git a/res/drawable/routerlogo_2.png b/app/src/main/res/drawable/routerlogo_2.png
similarity index 100%
rename from res/drawable/routerlogo_2.png
rename to app/src/main/res/drawable/routerlogo_2.png
diff --git a/res/drawable/routerlogo_3.png b/app/src/main/res/drawable/routerlogo_3.png
similarity index 100%
rename from res/drawable/routerlogo_3.png
rename to app/src/main/res/drawable/routerlogo_3.png
diff --git a/res/drawable/routerlogo_4.png b/app/src/main/res/drawable/routerlogo_4.png
similarity index 100%
rename from res/drawable/routerlogo_4.png
rename to app/src/main/res/drawable/routerlogo_4.png
diff --git a/res/drawable/server.png b/app/src/main/res/drawable/server.png
similarity index 100%
rename from res/drawable/server.png
rename to app/src/main/res/drawable/server.png
diff --git a/res/layout-land/fragment_main.xml b/app/src/main/res/layout-land/fragment_main.xml
similarity index 100%
rename from res/layout-land/fragment_main.xml
rename to app/src/main/res/layout-land/fragment_main.xml
diff --git a/res/layout/activity_addressbook_settings.xml b/app/src/main/res/layout/activity_addressbook_settings.xml
similarity index 100%
rename from res/layout/activity_addressbook_settings.xml
rename to app/src/main/res/layout/activity_addressbook_settings.xml
diff --git a/res/layout/activity_navdrawer_onepane.xml b/app/src/main/res/layout/activity_navdrawer_onepane.xml
similarity index 100%
rename from res/layout/activity_navdrawer_onepane.xml
rename to app/src/main/res/layout/activity_navdrawer_onepane.xml
diff --git a/res/layout/activity_navdrawer_twopane.xml b/app/src/main/res/layout/activity_navdrawer_twopane.xml
similarity index 100%
rename from res/layout/activity_navdrawer_twopane.xml
rename to app/src/main/res/layout/activity_navdrawer_twopane.xml
diff --git a/res/layout/activity_navdrawer_viewpager.xml b/app/src/main/res/layout/activity_navdrawer_viewpager.xml
similarity index 100%
rename from res/layout/activity_navdrawer_viewpager.xml
rename to app/src/main/res/layout/activity_navdrawer_viewpager.xml
diff --git a/res/layout/activity_wizard.xml b/app/src/main/res/layout/activity_wizard.xml
similarity index 100%
rename from res/layout/activity_wizard.xml
rename to app/src/main/res/layout/activity_wizard.xml
diff --git a/res/layout/addressbook_list_item.xml b/app/src/main/res/layout/addressbook_list_item.xml
similarity index 100%
rename from res/layout/addressbook_list_item.xml
rename to app/src/main/res/layout/addressbook_list_item.xml
diff --git a/res/layout/fragment_dialog_about.xml b/app/src/main/res/layout/fragment_dialog_about.xml
similarity index 100%
rename from res/layout/fragment_dialog_about.xml
rename to app/src/main/res/layout/fragment_dialog_about.xml
diff --git a/res/layout/fragment_dialog_first_start.xml b/app/src/main/res/layout/fragment_dialog_first_start.xml
similarity index 100%
rename from res/layout/fragment_dialog_first_start.xml
rename to app/src/main/res/layout/fragment_dialog_first_start.xml
diff --git a/res/layout/fragment_dialog_text_resource.xml b/app/src/main/res/layout/fragment_dialog_text_resource.xml
similarity index 100%
rename from res/layout/fragment_dialog_text_resource.xml
rename to app/src/main/res/layout/fragment_dialog_text_resource.xml
diff --git a/res/layout/fragment_graph.xml b/app/src/main/res/layout/fragment_graph.xml
similarity index 100%
rename from res/layout/fragment_graph.xml
rename to app/src/main/res/layout/fragment_graph.xml
diff --git a/res/layout/fragment_i2ptunnel_detail.xml b/app/src/main/res/layout/fragment_i2ptunnel_detail.xml
similarity index 100%
rename from res/layout/fragment_i2ptunnel_detail.xml
rename to app/src/main/res/layout/fragment_i2ptunnel_detail.xml
diff --git a/res/layout/fragment_log_entry.xml b/app/src/main/res/layout/fragment_log_entry.xml
similarity index 100%
rename from res/layout/fragment_log_entry.xml
rename to app/src/main/res/layout/fragment_log_entry.xml
diff --git a/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
similarity index 100%
rename from res/layout/fragment_main.xml
rename to app/src/main/res/layout/fragment_main.xml
diff --git a/res/layout/fragment_netdb_leaseset_detail.xml b/app/src/main/res/layout/fragment_netdb_leaseset_detail.xml
similarity index 100%
rename from res/layout/fragment_netdb_leaseset_detail.xml
rename to app/src/main/res/layout/fragment_netdb_leaseset_detail.xml
diff --git a/res/layout/fragment_netdb_router_detail.xml b/app/src/main/res/layout/fragment_netdb_router_detail.xml
similarity index 100%
rename from res/layout/fragment_netdb_router_detail.xml
rename to app/src/main/res/layout/fragment_netdb_router_detail.xml
diff --git a/res/layout/fragment_news.xml b/app/src/main/res/layout/fragment_news.xml
similarity index 100%
rename from res/layout/fragment_news.xml
rename to app/src/main/res/layout/fragment_news.xml
diff --git a/res/layout/fragment_table.xml b/app/src/main/res/layout/fragment_table.xml
similarity index 100%
rename from res/layout/fragment_table.xml
rename to app/src/main/res/layout/fragment_table.xml
diff --git a/res/layout/fragment_wizard_page.xml b/app/src/main/res/layout/fragment_wizard_page.xml
similarity index 100%
rename from res/layout/fragment_wizard_page.xml
rename to app/src/main/res/layout/fragment_wizard_page.xml
diff --git a/res/layout/fragment_wizard_page_single_boolean.xml b/app/src/main/res/layout/fragment_wizard_page_single_boolean.xml
similarity index 100%
rename from res/layout/fragment_wizard_page_single_boolean.xml
rename to app/src/main/res/layout/fragment_wizard_page_single_boolean.xml
diff --git a/res/layout/fragment_wizard_page_single_text_field.xml b/app/src/main/res/layout/fragment_wizard_page_single_text_field.xml
similarity index 100%
rename from res/layout/fragment_wizard_page_single_text_field.xml
rename to app/src/main/res/layout/fragment_wizard_page_single_text_field.xml
diff --git a/res/layout/fragment_wizard_page_single_text_field_picker.xml b/app/src/main/res/layout/fragment_wizard_page_single_text_field_picker.xml
similarity index 100%
rename from res/layout/fragment_wizard_page_single_text_field_picker.xml
rename to app/src/main/res/layout/fragment_wizard_page_single_text_field_picker.xml
diff --git a/res/layout/listitem_i2ptunnel.xml b/app/src/main/res/layout/listitem_i2ptunnel.xml
similarity index 100%
rename from res/layout/listitem_i2ptunnel.xml
rename to app/src/main/res/layout/listitem_i2ptunnel.xml
diff --git a/res/layout/listitem_leaseset.xml b/app/src/main/res/layout/listitem_leaseset.xml
similarity index 100%
rename from res/layout/listitem_leaseset.xml
rename to app/src/main/res/layout/listitem_leaseset.xml
diff --git a/res/layout/listitem_logs.xml b/app/src/main/res/layout/listitem_logs.xml
similarity index 100%
rename from res/layout/listitem_logs.xml
rename to app/src/main/res/layout/listitem_logs.xml
diff --git a/res/layout/listitem_routerinfo.xml b/app/src/main/res/layout/listitem_routerinfo.xml
similarity index 100%
rename from res/layout/listitem_routerinfo.xml
rename to app/src/main/res/layout/listitem_routerinfo.xml
diff --git a/res/layout/listitem_wizard_review.xml b/app/src/main/res/layout/listitem_wizard_review.xml
similarity index 100%
rename from res/layout/listitem_wizard_review.xml
rename to app/src/main/res/layout/listitem_wizard_review.xml
diff --git a/res/layout/logs_header.xml b/app/src/main/res/layout/logs_header.xml
similarity index 100%
rename from res/layout/logs_header.xml
rename to app/src/main/res/layout/logs_header.xml
diff --git a/res/layout/parentfragment_viewpager.xml b/app/src/main/res/layout/parentfragment_viewpager.xml
similarity index 100%
rename from res/layout/parentfragment_viewpager.xml
rename to app/src/main/res/layout/parentfragment_viewpager.xml
diff --git a/res/layout/peers.xml b/app/src/main/res/layout/peers.xml
similarity index 100%
rename from res/layout/peers.xml
rename to app/src/main/res/layout/peers.xml
diff --git a/res/layout/web.xml b/app/src/main/res/layout/web.xml
similarity index 100%
rename from res/layout/web.xml
rename to app/src/main/res/layout/web.xml
diff --git a/res/menu/activity_addressbook_actions.xml b/app/src/main/res/menu/activity_addressbook_actions.xml
similarity index 100%
rename from res/menu/activity_addressbook_actions.xml
rename to app/src/main/res/menu/activity_addressbook_actions.xml
diff --git a/res/menu/activity_addressbook_settings.xml b/app/src/main/res/menu/activity_addressbook_settings.xml
similarity index 100%
rename from res/menu/activity_addressbook_settings.xml
rename to app/src/main/res/menu/activity_addressbook_settings.xml
diff --git a/res/menu/activity_base_actions.xml b/app/src/main/res/menu/activity_base_actions.xml
similarity index 100%
rename from res/menu/activity_base_actions.xml
rename to app/src/main/res/menu/activity_base_actions.xml
diff --git a/res/menu/activity_help_actions.xml b/app/src/main/res/menu/activity_help_actions.xml
similarity index 100%
rename from res/menu/activity_help_actions.xml
rename to app/src/main/res/menu/activity_help_actions.xml
diff --git a/res/menu/activity_main_actions.xml b/app/src/main/res/menu/activity_main_actions.xml
similarity index 100%
rename from res/menu/activity_main_actions.xml
rename to app/src/main/res/menu/activity_main_actions.xml
diff --git a/res/menu/fragment_addressbook_actions.xml b/app/src/main/res/menu/fragment_addressbook_actions.xml
similarity index 100%
rename from res/menu/fragment_addressbook_actions.xml
rename to app/src/main/res/menu/fragment_addressbook_actions.xml
diff --git a/res/menu/fragment_i2ptunnel_detail_actions.xml b/app/src/main/res/menu/fragment_i2ptunnel_detail_actions.xml
similarity index 100%
rename from res/menu/fragment_i2ptunnel_detail_actions.xml
rename to app/src/main/res/menu/fragment_i2ptunnel_detail_actions.xml
diff --git a/res/menu/fragment_i2ptunnel_list_actions.xml b/app/src/main/res/menu/fragment_i2ptunnel_list_actions.xml
similarity index 100%
rename from res/menu/fragment_i2ptunnel_list_actions.xml
rename to app/src/main/res/menu/fragment_i2ptunnel_list_actions.xml
diff --git a/res/menu/fragment_netdb_list_actions.xml b/app/src/main/res/menu/fragment_netdb_list_actions.xml
similarity index 100%
rename from res/menu/fragment_netdb_list_actions.xml
rename to app/src/main/res/menu/fragment_netdb_list_actions.xml
diff --git a/res/menu/fragment_web_actions.xml b/app/src/main/res/menu/fragment_web_actions.xml
similarity index 100%
rename from res/menu/fragment_web_actions.xml
rename to app/src/main/res/menu/fragment_web_actions.xml
diff --git a/res/raw/addressbook_config_txt b/app/src/main/res/raw/addressbook_config_txt
similarity index 100%
rename from res/raw/addressbook_config_txt
rename to app/src/main/res/raw/addressbook_config_txt
diff --git a/res/raw/ahelper_conflict_header_ht b/app/src/main/res/raw/ahelper_conflict_header_ht
similarity index 100%
rename from res/raw/ahelper_conflict_header_ht
rename to app/src/main/res/raw/ahelper_conflict_header_ht
diff --git a/res/raw/ahelper_new_header_ht b/app/src/main/res/raw/ahelper_new_header_ht
similarity index 100%
rename from res/raw/ahelper_new_header_ht
rename to app/src/main/res/raw/ahelper_new_header_ht
diff --git a/res/raw/android_css b/app/src/main/res/raw/android_css
similarity index 100%
rename from res/raw/android_css
rename to app/src/main/res/raw/android_css
diff --git a/res/raw/auth_header_ht b/app/src/main/res/raw/auth_header_ht
similarity index 100%
rename from res/raw/auth_header_ht
rename to app/src/main/res/raw/auth_header_ht
diff --git a/res/raw/denied_header_ht b/app/src/main/res/raw/denied_header_ht
similarity index 100%
rename from res/raw/denied_header_ht
rename to app/src/main/res/raw/denied_header_ht
diff --git a/res/raw/dnf_header_ht b/app/src/main/res/raw/dnf_header_ht
similarity index 100%
rename from res/raw/dnf_header_ht
rename to app/src/main/res/raw/dnf_header_ht
diff --git a/res/raw/dnfb_header_ht b/app/src/main/res/raw/dnfb_header_ht
similarity index 100%
rename from res/raw/dnfb_header_ht
rename to app/src/main/res/raw/dnfb_header_ht
diff --git a/res/raw/dnfh_header_ht b/app/src/main/res/raw/dnfh_header_ht
similarity index 100%
rename from res/raw/dnfh_header_ht
rename to app/src/main/res/raw/dnfh_header_ht
diff --git a/res/raw/dnfp_header_ht b/app/src/main/res/raw/dnfp_header_ht
similarity index 100%
rename from res/raw/dnfp_header_ht
rename to app/src/main/res/raw/dnfp_header_ht
diff --git a/res/raw/i2ptunnel_config b/app/src/main/res/raw/i2ptunnel_config
similarity index 100%
rename from res/raw/i2ptunnel_config
rename to app/src/main/res/raw/i2ptunnel_config
diff --git a/res/raw/initialnews_html b/app/src/main/res/raw/initialnews_html
similarity index 100%
rename from res/raw/initialnews_html
rename to app/src/main/res/raw/initialnews_html
diff --git a/res/raw/license_addressbook_txt b/app/src/main/res/raw/license_addressbook_txt
similarity index 100%
rename from res/raw/license_addressbook_txt
rename to app/src/main/res/raw/license_addressbook_txt
diff --git a/res/raw/licenses_txt b/app/src/main/res/raw/licenses_txt
similarity index 100%
rename from res/raw/licenses_txt
rename to app/src/main/res/raw/licenses_txt
diff --git a/res/raw/localhost_header_ht b/app/src/main/res/raw/localhost_header_ht
similarity index 100%
rename from res/raw/localhost_header_ht
rename to app/src/main/res/raw/localhost_header_ht
diff --git a/res/raw/logger_config b/app/src/main/res/raw/logger_config
similarity index 100%
rename from res/raw/logger_config
rename to app/src/main/res/raw/logger_config
diff --git a/res/raw/more_hosts_txt b/app/src/main/res/raw/more_hosts_txt
similarity index 100%
rename from res/raw/more_hosts_txt
rename to app/src/main/res/raw/more_hosts_txt
diff --git a/res/raw/noproxy_header_ht b/app/src/main/res/raw/noproxy_header_ht
similarity index 100%
rename from res/raw/noproxy_header_ht
rename to app/src/main/res/raw/noproxy_header_ht
diff --git a/res/raw/protocol_header_ht b/app/src/main/res/raw/protocol_header_ht
similarity index 100%
rename from res/raw/protocol_header_ht
rename to app/src/main/res/raw/protocol_header_ht
diff --git a/res/raw/releasenotes_txt b/app/src/main/res/raw/releasenotes_txt
similarity index 100%
rename from res/raw/releasenotes_txt
rename to app/src/main/res/raw/releasenotes_txt
diff --git a/res/raw/router_config b/app/src/main/res/raw/router_config
similarity index 100%
rename from res/raw/router_config
rename to app/src/main/res/raw/router_config
diff --git a/res/raw/subscriptions_txt b/app/src/main/res/raw/subscriptions_txt
similarity index 100%
rename from res/raw/subscriptions_txt
rename to app/src/main/res/raw/subscriptions_txt
diff --git a/res/raw/welcome_html b/app/src/main/res/raw/welcome_html
similarity index 100%
rename from res/raw/welcome_html
rename to app/src/main/res/raw/welcome_html
diff --git a/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
similarity index 100%
rename from res/values-ca/strings.xml
rename to app/src/main/res/values-ca/strings.xml
diff --git a/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
similarity index 100%
rename from res/values-de/strings.xml
rename to app/src/main/res/values-de/strings.xml
diff --git a/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
similarity index 100%
rename from res/values-es/strings.xml
rename to app/src/main/res/values-es/strings.xml
diff --git a/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
similarity index 100%
rename from res/values-fr/strings.xml
rename to app/src/main/res/values-fr/strings.xml
diff --git a/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
similarity index 100%
rename from res/values-it/strings.xml
rename to app/src/main/res/values-it/strings.xml
diff --git a/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
similarity index 100%
rename from res/values-ja/strings.xml
rename to app/src/main/res/values-ja/strings.xml
diff --git a/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
similarity index 100%
rename from res/values-ko/strings.xml
rename to app/src/main/res/values-ko/strings.xml
diff --git a/res/values-large/refs.xml b/app/src/main/res/values-large/refs.xml
similarity index 100%
rename from res/values-large/refs.xml
rename to app/src/main/res/values-large/refs.xml
diff --git a/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
similarity index 100%
rename from res/values-nb/strings.xml
rename to app/src/main/res/values-nb/strings.xml
diff --git a/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
similarity index 100%
rename from res/values-nl/strings.xml
rename to app/src/main/res/values-nl/strings.xml
diff --git a/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
similarity index 100%
rename from res/values-pl/strings.xml
rename to app/src/main/res/values-pl/strings.xml
diff --git a/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from res/values-pt-rBR/strings.xml
rename to app/src/main/res/values-pt-rBR/strings.xml
diff --git a/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
similarity index 100%
rename from res/values-pt/strings.xml
rename to app/src/main/res/values-pt/strings.xml
diff --git a/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
similarity index 100%
rename from res/values-ro/strings.xml
rename to app/src/main/res/values-ro/strings.xml
diff --git a/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
similarity index 100%
rename from res/values-ru/strings.xml
rename to app/src/main/res/values-ru/strings.xml
diff --git a/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
similarity index 100%
rename from res/values-sk/strings.xml
rename to app/src/main/res/values-sk/strings.xml
diff --git a/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
similarity index 100%
rename from res/values-sv/strings.xml
rename to app/src/main/res/values-sv/strings.xml
diff --git a/res/values-sw600dp/refs.xml b/app/src/main/res/values-sw600dp/refs.xml
similarity index 100%
rename from res/values-sw600dp/refs.xml
rename to app/src/main/res/values-sw600dp/refs.xml
diff --git a/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
similarity index 100%
rename from res/values-tr/strings.xml
rename to app/src/main/res/values-tr/strings.xml
diff --git a/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
similarity index 100%
rename from res/values-vi/strings.xml
rename to app/src/main/res/values-vi/strings.xml
diff --git a/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
similarity index 100%
rename from res/values-zh/strings.xml
rename to app/src/main/res/values-zh/strings.xml
diff --git a/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
similarity index 100%
rename from res/values/arrays.xml
rename to app/src/main/res/values/arrays.xml
diff --git a/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
similarity index 100%
rename from res/values/dimens.xml
rename to app/src/main/res/values/dimens.xml
diff --git a/res/values/integers.xml b/app/src/main/res/values/integers.xml
similarity index 100%
rename from res/values/integers.xml
rename to app/src/main/res/values/integers.xml
diff --git a/res/values/refs.xml b/app/src/main/res/values/refs.xml
similarity index 100%
rename from res/values/refs.xml
rename to app/src/main/res/values/refs.xml
diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 100%
rename from res/values/strings.xml
rename to app/src/main/res/values/strings.xml
diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from res/values/styles.xml
rename to app/src/main/res/values/styles.xml
diff --git a/res/xml/searchable_addressbook.xml b/app/src/main/res/xml/searchable_addressbook.xml
similarity index 100%
rename from res/xml/searchable_addressbook.xml
rename to app/src/main/res/xml/searchable_addressbook.xml
diff --git a/res/xml/settings_advanced.xml b/app/src/main/res/xml/settings_advanced.xml
similarity index 100%
rename from res/xml/settings_advanced.xml
rename to app/src/main/res/xml/settings_advanced.xml
diff --git a/res/xml/settings_graphs.xml b/app/src/main/res/xml/settings_graphs.xml
similarity index 100%
rename from res/xml/settings_graphs.xml
rename to app/src/main/res/xml/settings_graphs.xml
diff --git a/res/xml/settings_headers.xml b/app/src/main/res/xml/settings_headers.xml
similarity index 100%
rename from res/xml/settings_headers.xml
rename to app/src/main/res/xml/settings_headers.xml
diff --git a/res/xml/settings_headers_legacy.xml b/app/src/main/res/xml/settings_headers_legacy.xml
similarity index 100%
rename from res/xml/settings_headers_legacy.xml
rename to app/src/main/res/xml/settings_headers_legacy.xml
diff --git a/res/xml/settings_logging.xml b/app/src/main/res/xml/settings_logging.xml
similarity index 100%
rename from res/xml/settings_logging.xml
rename to app/src/main/res/xml/settings_logging.xml
diff --git a/res/xml/settings_net.xml b/app/src/main/res/xml/settings_net.xml
similarity index 100%
rename from res/xml/settings_net.xml
rename to app/src/main/res/xml/settings_net.xml
diff --git a/build.xml b/build.xml
deleted file mode 100644
index b8b474b47..000000000
--- a/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="I2PAndroid" 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" />
-
-    <!-- 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 an env var"
-            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/proguard-project.txt b/proguard-project.txt
deleted file mode 100644
index f2fe1559a..000000000
--- 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 520859816..000000000
--- a/project.properties
+++ /dev/null
@@ -1,20 +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,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-19
-# Must match that in AndroidManifest.xml.in
-minSdkVersion=8
-# I2P router libs
-android.library.reference.1=./routerjars
-# Android Support Library
-# If the relative path differs in your local environment,
-# override this in the base local.properties
-# (not routerjars/local.properties)
-android.library.reference.2=../android-sdk-linux/extras/android/support/v7/appcompat
diff --git a/routerjars/ant.properties b/routerjars/ant.properties
deleted file mode 100644
index 5285a6f6f..000000000
--- a/routerjars/ant.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked into Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
-application-package=net.i2p.router
diff --git a/routerjars/build.xml b/routerjars/build.xml
deleted file mode 100644
index b8b474b47..000000000
--- a/routerjars/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="I2PAndroid" 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" />
-
-    <!-- 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 an env var"
-            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/routerjars/custom_rules.xml b/routerjars/custom_rules.xml
index f93ea4faf..4f29775d2 100644
--- a/routerjars/custom_rules.xml
+++ b/routerjars/custom_rules.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="routerjars">
+    <property file="local.properties" />
+    <property name="jar.libs.dir" value="libs" />
 
     <!-- override with i2psrc=path/to/source in local.properties -->
     <property name="i2psrc" value="../../i2p.i2p" />
@@ -22,20 +24,6 @@
 
     <target name="-pre-compile" depends="jbigi, buildrouter" />
 
-    <!--
-         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">
-    </target>
-
     <!-- new rules -->
 
 
@@ -59,7 +47,7 @@
         <ant dir="${i2pbase}" inheritall="false" useNativeBasedir="true" target="buildBOB" />
     </target>
 
-    <target name="buildrouter" depends="-dirs, buildRouter, buildI2PTunnelJar, buildAddressbook, buildBOB">
+    <target name="buildrouter" depends="buildRouter, buildI2PTunnelJar, buildAddressbook, buildBOB">
 
         <!-- router -->
         <copy file="${i2pbase}/build/router.jar" todir="${jar.libs.dir}" />
diff --git a/routerjars/proguard-project.txt b/routerjars/proguard-project.txt
deleted file mode 100644
index f2fe1559a..000000000
--- a/routerjars/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/routerjars/project.properties b/routerjars/project.properties
deleted file mode 100644
index 5e83d66c1..000000000
--- a/routerjars/project.properties
+++ /dev/null
@@ -1,12 +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,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-19
-android.library=true
diff --git a/routerjars/src/README.txt b/routerjars/src/README.txt
deleted file mode 100644
index 3852f5431..000000000
--- a/routerjars/src/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This directory is intentionally blank.
diff --git a/routerjars/AndroidManifest.xml.in b/routerjars/src/main/AndroidManifest.xml
similarity index 86%
rename from routerjars/AndroidManifest.xml.in
rename to routerjars/src/main/AndroidManifest.xml
index cd7a189d1..745524493 100644
--- a/routerjars/AndroidManifest.xml.in
+++ b/routerjars/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="net.i2p.android.router"
+      package="net.i2p.android.routerjars"
       android:versionCode="0"
       android:versionName="0.0.0-0_b0-API8"
       android:installLocation="auto"
diff --git a/routerjars/jni/build.sh b/routerjars/src/main/jniLibs/armeabi/build.sh
similarity index 100%
rename from routerjars/jni/build.sh
rename to routerjars/src/main/jniLibs/armeabi/build.sh
diff --git a/routerjars/jni/libjbigi.so b/routerjars/src/main/jniLibs/armeabi/libjbigi.so
similarity index 100%
rename from routerjars/jni/libjbigi.so
rename to routerjars/src/main/jniLibs/armeabi/libjbigi.so
-- 
GitLab