diff --git a/build.gradle b/android/build.gradle
similarity index 100%
rename from build.gradle
rename to android/build.gradle
diff --git a/libs/zxing-core-2.3.0-SNAPSHOT.jar b/android/libs/zxing-core-2.3.0-SNAPSHOT.jar
similarity index 100%
rename from libs/zxing-core-2.3.0-SNAPSHOT.jar
rename to android/libs/zxing-core-2.3.0-SNAPSHOT.jar
diff --git a/lombok.config b/android/lombok.config
similarity index 100%
rename from lombok.config
rename to android/lombok.config
diff --git a/src/androidTest/assets/passes/broken/fail.pkpass b/android/src/androidTest/assets/passes/broken/fail.pkpass
similarity index 100%
rename from src/androidTest/assets/passes/broken/fail.pkpass
rename to android/src/androidTest/assets/passes/broken/fail.pkpass
diff --git a/src/androidTest/assets/passes/opass_v2/minimal.json b/android/src/androidTest/assets/passes/opass_v2/minimal.json
similarity index 100%
rename from src/androidTest/assets/passes/opass_v2/minimal.json
rename to android/src/androidTest/assets/passes/opass_v2/minimal.json
diff --git a/src/androidTest/assets/passes/workarounds/westbahn/special.pkpass b/android/src/androidTest/assets/passes/workarounds/westbahn/special.pkpass
similarity index 100%
rename from src/androidTest/assets/passes/workarounds/westbahn/special.pkpass
rename to android/src/androidTest/assets/passes/workarounds/westbahn/special.pkpass
diff --git a/src/androidTest/java/org/ligi/passandroid/BaseIntegration.java b/android/src/androidTest/java/org/ligi/passandroid/BaseIntegration.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/BaseIntegration.java
rename to android/src/androidTest/java/org/ligi/passandroid/BaseIntegration.java
diff --git a/src/androidTest/java/org/ligi/passandroid/TheAppleStyleBarcodeReaderBase.java b/android/src/androidTest/java/org/ligi/passandroid/TheAppleStyleBarcodeReaderBase.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/TheAppleStyleBarcodeReaderBase.java
rename to android/src/androidTest/java/org/ligi/passandroid/TheAppleStyleBarcodeReaderBase.java
diff --git a/src/androidTest/java/org/ligi/passandroid/TheBarcodeHelper.java b/android/src/androidTest/java/org/ligi/passandroid/TheBarcodeHelper.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/TheBarcodeHelper.java
rename to android/src/androidTest/java/org/ligi/passandroid/TheBarcodeHelper.java
diff --git a/src/androidTest/java/org/ligi/passandroid/TheCategoryHelper.java b/android/src/androidTest/java/org/ligi/passandroid/TheCategoryHelper.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/TheCategoryHelper.java
rename to android/src/androidTest/java/org/ligi/passandroid/TheCategoryHelper.java
diff --git a/src/androidTest/java/org/ligi/passandroid/TheEmptyPassList.java b/android/src/androidTest/java/org/ligi/passandroid/TheEmptyPassList.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/TheEmptyPassList.java
rename to android/src/androidTest/java/org/ligi/passandroid/TheEmptyPassList.java
diff --git a/src/androidTest/java/org/ligi/passandroid/TheFullscreenBarcodeActivity.java b/android/src/androidTest/java/org/ligi/passandroid/TheFullscreenBarcodeActivity.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/TheFullscreenBarcodeActivity.java
rename to android/src/androidTest/java/org/ligi/passandroid/TheFullscreenBarcodeActivity.java
diff --git a/src/androidTest/java/org/ligi/passandroid/TheHelpActivity.java b/android/src/androidTest/java/org/ligi/passandroid/TheHelpActivity.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/TheHelpActivity.java
rename to android/src/androidTest/java/org/ligi/passandroid/TheHelpActivity.java
diff --git a/src/androidTest/java/org/ligi/passandroid/ThePassEditActivity.java b/android/src/androidTest/java/org/ligi/passandroid/ThePassEditActivity.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/ThePassEditActivity.java
rename to android/src/androidTest/java/org/ligi/passandroid/ThePassEditActivity.java
diff --git a/src/androidTest/java/org/ligi/passandroid/ThePassListActivity.java b/android/src/androidTest/java/org/ligi/passandroid/ThePassListActivity.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/ThePassListActivity.java
rename to android/src/androidTest/java/org/ligi/passandroid/ThePassListActivity.java
diff --git a/src/androidTest/java/org/ligi/passandroid/ThePassViewActivity.java b/android/src/androidTest/java/org/ligi/passandroid/ThePassViewActivity.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/ThePassViewActivity.java
rename to android/src/androidTest/java/org/ligi/passandroid/ThePassViewActivity.java
diff --git a/src/androidTest/java/org/ligi/passandroid/ThePastLocationsStore.java b/android/src/androidTest/java/org/ligi/passandroid/ThePastLocationsStore.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/ThePastLocationsStore.java
rename to android/src/androidTest/java/org/ligi/passandroid/ThePastLocationsStore.java
diff --git a/src/androidTest/java/org/ligi/passandroid/TheQuirkCorrector.java b/android/src/androidTest/java/org/ligi/passandroid/TheQuirkCorrector.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/TheQuirkCorrector.java
rename to android/src/androidTest/java/org/ligi/passandroid/TheQuirkCorrector.java
diff --git a/src/androidTest/java/org/ligi/passandroid/TheUnzipPassController.java b/android/src/androidTest/java/org/ligi/passandroid/TheUnzipPassController.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/TheUnzipPassController.java
rename to android/src/androidTest/java/org/ligi/passandroid/TheUnzipPassController.java
diff --git a/src/androidTest/java/org/ligi/passandroid/helper/BarcodeDecoder.java b/android/src/androidTest/java/org/ligi/passandroid/helper/BarcodeDecoder.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/helper/BarcodeDecoder.java
rename to android/src/androidTest/java/org/ligi/passandroid/helper/BarcodeDecoder.java
diff --git a/src/androidTest/java/org/ligi/passandroid/injections/FixedPassListPassStore.java b/android/src/androidTest/java/org/ligi/passandroid/injections/FixedPassListPassStore.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/injections/FixedPassListPassStore.java
rename to android/src/androidTest/java/org/ligi/passandroid/injections/FixedPassListPassStore.java
diff --git a/src/androidTest/java/org/ligi/passandroid/reporting/SpooningFailureHandler.java b/android/src/androidTest/java/org/ligi/passandroid/reporting/SpooningFailureHandler.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/reporting/SpooningFailureHandler.java
rename to android/src/androidTest/java/org/ligi/passandroid/reporting/SpooningFailureHandler.java
diff --git a/src/androidTest/java/org/ligi/passandroid/steps/PassEditSteps.java b/android/src/androidTest/java/org/ligi/passandroid/steps/PassEditSteps.java
similarity index 100%
rename from src/androidTest/java/org/ligi/passandroid/steps/PassEditSteps.java
rename to android/src/androidTest/java/org/ligi/passandroid/steps/PassEditSteps.java
diff --git a/src/debug/AndroidManifest.xml b/android/src/debug/AndroidManifest.xml
similarity index 100%
rename from src/debug/AndroidManifest.xml
rename to android/src/debug/AndroidManifest.xml
diff --git a/src/forFDroid/res/values/strings.xml b/android/src/forFDroid/res/values/strings.xml
similarity index 100%
rename from src/forFDroid/res/values/strings.xml
rename to android/src/forFDroid/res/values/strings.xml
diff --git a/src/forPlay/res/values/strings.xml b/android/src/forPlay/res/values/strings.xml
similarity index 100%
rename from src/forPlay/res/values/strings.xml
rename to android/src/forPlay/res/values/strings.xml
diff --git a/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
similarity index 100%
rename from src/main/AndroidManifest.xml
rename to android/src/main/AndroidManifest.xml
diff --git a/src/main/java/com/ibm/icu/text/CharsetDetector.java b/android/src/main/java/com/ibm/icu/text/CharsetDetector.java
similarity index 100%
rename from src/main/java/com/ibm/icu/text/CharsetDetector.java
rename to android/src/main/java/com/ibm/icu/text/CharsetDetector.java
diff --git a/src/main/java/com/ibm/icu/text/CharsetMatch.java b/android/src/main/java/com/ibm/icu/text/CharsetMatch.java
similarity index 100%
rename from src/main/java/com/ibm/icu/text/CharsetMatch.java
rename to android/src/main/java/com/ibm/icu/text/CharsetMatch.java
diff --git a/src/main/java/com/ibm/icu/text/CharsetRecog_2022.java b/android/src/main/java/com/ibm/icu/text/CharsetRecog_2022.java
similarity index 100%
rename from src/main/java/com/ibm/icu/text/CharsetRecog_2022.java
rename to android/src/main/java/com/ibm/icu/text/CharsetRecog_2022.java
diff --git a/src/main/java/com/ibm/icu/text/CharsetRecog_UTF8.java b/android/src/main/java/com/ibm/icu/text/CharsetRecog_UTF8.java
similarity index 100%
rename from src/main/java/com/ibm/icu/text/CharsetRecog_UTF8.java
rename to android/src/main/java/com/ibm/icu/text/CharsetRecog_UTF8.java
diff --git a/src/main/java/com/ibm/icu/text/CharsetRecog_Unicode.java b/android/src/main/java/com/ibm/icu/text/CharsetRecog_Unicode.java
similarity index 100%
rename from src/main/java/com/ibm/icu/text/CharsetRecog_Unicode.java
rename to android/src/main/java/com/ibm/icu/text/CharsetRecog_Unicode.java
diff --git a/src/main/java/com/ibm/icu/text/CharsetRecog_mbcs.java b/android/src/main/java/com/ibm/icu/text/CharsetRecog_mbcs.java
similarity index 100%
rename from src/main/java/com/ibm/icu/text/CharsetRecog_mbcs.java
rename to android/src/main/java/com/ibm/icu/text/CharsetRecog_mbcs.java
diff --git a/src/main/java/com/ibm/icu/text/CharsetRecog_sbcs.java b/android/src/main/java/com/ibm/icu/text/CharsetRecog_sbcs.java
similarity index 100%
rename from src/main/java/com/ibm/icu/text/CharsetRecog_sbcs.java
rename to android/src/main/java/com/ibm/icu/text/CharsetRecog_sbcs.java
diff --git a/src/main/java/com/ibm/icu/text/CharsetRecognizer.java b/android/src/main/java/com/ibm/icu/text/CharsetRecognizer.java
similarity index 100%
rename from src/main/java/com/ibm/icu/text/CharsetRecognizer.java
rename to android/src/main/java/com/ibm/icu/text/CharsetRecognizer.java
diff --git a/src/main/java/org/ligi/passandroid/App.java b/android/src/main/java/org/ligi/passandroid/App.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/App.java
rename to android/src/main/java/org/ligi/passandroid/App.java
diff --git a/src/main/java/org/ligi/passandroid/TrackerInterface.java b/android/src/main/java/org/ligi/passandroid/TrackerInterface.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/TrackerInterface.java
rename to android/src/main/java/org/ligi/passandroid/TrackerInterface.java
diff --git a/src/main/java/org/ligi/passandroid/events/NavigationOpenedEvent.java b/android/src/main/java/org/ligi/passandroid/events/NavigationOpenedEvent.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/events/NavigationOpenedEvent.java
rename to android/src/main/java/org/ligi/passandroid/events/NavigationOpenedEvent.java
diff --git a/src/main/java/org/ligi/passandroid/events/PassRefreshEvent.java b/android/src/main/java/org/ligi/passandroid/events/PassRefreshEvent.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/events/PassRefreshEvent.java
rename to android/src/main/java/org/ligi/passandroid/events/PassRefreshEvent.java
diff --git a/src/main/java/org/ligi/passandroid/events/SortOrderChangeEvent.java b/android/src/main/java/org/ligi/passandroid/events/SortOrderChangeEvent.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/events/SortOrderChangeEvent.java
rename to android/src/main/java/org/ligi/passandroid/events/SortOrderChangeEvent.java
diff --git a/src/main/java/org/ligi/passandroid/events/TypeFocusEvent.java b/android/src/main/java/org/ligi/passandroid/events/TypeFocusEvent.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/events/TypeFocusEvent.java
rename to android/src/main/java/org/ligi/passandroid/events/TypeFocusEvent.java
diff --git a/src/main/java/org/ligi/passandroid/helper/BarcodeHelper.java b/android/src/main/java/org/ligi/passandroid/helper/BarcodeHelper.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/helper/BarcodeHelper.java
rename to android/src/main/java/org/ligi/passandroid/helper/BarcodeHelper.java
diff --git a/src/main/java/org/ligi/passandroid/helper/CategoryHelper.java b/android/src/main/java/org/ligi/passandroid/helper/CategoryHelper.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/helper/CategoryHelper.java
rename to android/src/main/java/org/ligi/passandroid/helper/CategoryHelper.java
diff --git a/src/main/java/org/ligi/passandroid/helper/DirectoryFileFilter.java b/android/src/main/java/org/ligi/passandroid/helper/DirectoryFileFilter.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/helper/DirectoryFileFilter.java
rename to android/src/main/java/org/ligi/passandroid/helper/DirectoryFileFilter.java
diff --git a/src/main/java/org/ligi/passandroid/helper/Files.java b/android/src/main/java/org/ligi/passandroid/helper/Files.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/helper/Files.java
rename to android/src/main/java/org/ligi/passandroid/helper/Files.java
diff --git a/src/main/java/org/ligi/passandroid/helper/PassUtil.java b/android/src/main/java/org/ligi/passandroid/helper/PassUtil.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/helper/PassUtil.java
rename to android/src/main/java/org/ligi/passandroid/helper/PassUtil.java
diff --git a/src/main/java/org/ligi/passandroid/helper/SafeJSONReader.java b/android/src/main/java/org/ligi/passandroid/helper/SafeJSONReader.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/helper/SafeJSONReader.java
rename to android/src/main/java/org/ligi/passandroid/helper/SafeJSONReader.java
diff --git a/src/main/java/org/ligi/passandroid/helper/Strings.java b/android/src/main/java/org/ligi/passandroid/helper/Strings.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/helper/Strings.java
rename to android/src/main/java/org/ligi/passandroid/helper/Strings.java
diff --git a/src/main/java/org/ligi/passandroid/model/AndroidFileSystemPassStore.java b/android/src/main/java/org/ligi/passandroid/model/AndroidFileSystemPassStore.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/model/AndroidFileSystemPassStore.java
rename to android/src/main/java/org/ligi/passandroid/model/AndroidFileSystemPassStore.java
diff --git a/src/main/java/org/ligi/passandroid/model/ApplePassbookQuirkCorrector.java b/android/src/main/java/org/ligi/passandroid/model/ApplePassbookQuirkCorrector.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/model/ApplePassbookQuirkCorrector.java
rename to android/src/main/java/org/ligi/passandroid/model/ApplePassbookQuirkCorrector.java
diff --git a/src/main/java/org/ligi/passandroid/model/AppleStylePassTranslation.java b/android/src/main/java/org/ligi/passandroid/model/AppleStylePassTranslation.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/model/AppleStylePassTranslation.java
rename to android/src/main/java/org/ligi/passandroid/model/AppleStylePassTranslation.java
diff --git a/src/main/java/org/ligi/passandroid/model/BarCode.java b/android/src/main/java/org/ligi/passandroid/model/BarCode.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/model/BarCode.java
rename to android/src/main/java/org/ligi/passandroid/model/BarCode.java
diff --git a/src/main/java/org/ligi/passandroid/model/FiledPass.java b/android/src/main/java/org/ligi/passandroid/model/FiledPass.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/model/FiledPass.java
rename to android/src/main/java/org/ligi/passandroid/model/FiledPass.java
diff --git a/src/main/java/org/ligi/passandroid/model/InputStreamWithSource.java b/android/src/main/java/org/ligi/passandroid/model/InputStreamWithSource.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/model/InputStreamWithSource.java
rename to android/src/main/java/org/ligi/passandroid/model/InputStreamWithSource.java
diff --git a/src/main/java/org/ligi/passandroid/model/Pass.java b/android/src/main/java/org/ligi/passandroid/model/Pass.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/model/Pass.java
rename to android/src/main/java/org/ligi/passandroid/model/Pass.java
diff --git a/src/main/java/org/ligi/passandroid/model/PassField.java b/android/src/main/java/org/ligi/passandroid/model/PassField.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/model/PassField.java
rename to android/src/main/java/org/ligi/passandroid/model/PassField.java
diff --git a/src/main/java/org/ligi/passandroid/model/PassFieldList.java b/android/src/main/java/org/ligi/passandroid/model/PassFieldList.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/model/PassFieldList.java
rename to android/src/main/java/org/ligi/passandroid/model/PassFieldList.java
diff --git a/src/main/java/org/ligi/passandroid/model/PassImpl.java b/android/src/main/java/org/ligi/passandroid/model/PassImpl.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/model/PassImpl.java
rename to android/src/main/java/org/ligi/passandroid/model/PassImpl.java
diff --git a/src/main/java/org/ligi/passandroid/model/PassLocation.java b/android/src/main/java/org/ligi/passandroid/model/PassLocation.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/model/PassLocation.java
rename to android/src/main/java/org/ligi/passandroid/model/PassLocation.java
diff --git a/src/main/java/org/ligi/passandroid/model/PassStore.java b/android/src/main/java/org/ligi/passandroid/model/PassStore.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/model/PassStore.java
rename to android/src/main/java/org/ligi/passandroid/model/PassStore.java
diff --git a/src/main/java/org/ligi/passandroid/model/PassWriter.java b/android/src/main/java/org/ligi/passandroid/model/PassWriter.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/model/PassWriter.java
rename to android/src/main/java/org/ligi/passandroid/model/PassWriter.java
diff --git a/src/main/java/org/ligi/passandroid/model/PastLocationsStore.java b/android/src/main/java/org/ligi/passandroid/model/PastLocationsStore.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/model/PastLocationsStore.java
rename to android/src/main/java/org/ligi/passandroid/model/PastLocationsStore.java
diff --git a/src/main/java/org/ligi/passandroid/model/Settings.java b/android/src/main/java/org/ligi/passandroid/model/Settings.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/model/Settings.java
rename to android/src/main/java/org/ligi/passandroid/model/Settings.java
diff --git a/src/main/java/org/ligi/passandroid/package-info.java b/android/src/main/java/org/ligi/passandroid/package-info.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/package-info.java
rename to android/src/main/java/org/ligi/passandroid/package-info.java
diff --git a/src/main/java/org/ligi/passandroid/reader/AppleStylePassReader.java b/android/src/main/java/org/ligi/passandroid/reader/AppleStylePassReader.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/reader/AppleStylePassReader.java
rename to android/src/main/java/org/ligi/passandroid/reader/AppleStylePassReader.java
diff --git a/src/main/java/org/ligi/passandroid/reader/PassReader.java b/android/src/main/java/org/ligi/passandroid/reader/PassReader.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/reader/PassReader.java
rename to android/src/main/java/org/ligi/passandroid/reader/PassReader.java
diff --git a/src/main/java/org/ligi/passandroid/reader/TAMMultiPassReader.java b/android/src/main/java/org/ligi/passandroid/reader/TAMMultiPassReader.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/reader/TAMMultiPassReader.java
rename to android/src/main/java/org/ligi/passandroid/reader/TAMMultiPassReader.java
diff --git a/src/main/java/org/ligi/passandroid/ui/AsyncSetBarCodeImageTask.java b/android/src/main/java/org/ligi/passandroid/ui/AsyncSetBarCodeImageTask.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/AsyncSetBarCodeImageTask.java
rename to android/src/main/java/org/ligi/passandroid/ui/AsyncSetBarCodeImageTask.java
diff --git a/src/main/java/org/ligi/passandroid/ui/ExportProblemPassToLigiAndFinishTask.java b/android/src/main/java/org/ligi/passandroid/ui/ExportProblemPassToLigiAndFinishTask.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/ExportProblemPassToLigiAndFinishTask.java
rename to android/src/main/java/org/ligi/passandroid/ui/ExportProblemPassToLigiAndFinishTask.java
diff --git a/src/main/java/org/ligi/passandroid/ui/ExtractURLAsIphoneActivity.java b/android/src/main/java/org/ligi/passandroid/ui/ExtractURLAsIphoneActivity.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/ExtractURLAsIphoneActivity.java
rename to android/src/main/java/org/ligi/passandroid/ui/ExtractURLAsIphoneActivity.java
diff --git a/src/main/java/org/ligi/passandroid/ui/FullscreenBarcodeActivity.java b/android/src/main/java/org/ligi/passandroid/ui/FullscreenBarcodeActivity.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/FullscreenBarcodeActivity.java
rename to android/src/main/java/org/ligi/passandroid/ui/FullscreenBarcodeActivity.java
diff --git a/src/main/java/org/ligi/passandroid/ui/GoldenCutLinearLayout.java b/android/src/main/java/org/ligi/passandroid/ui/GoldenCutLinearLayout.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/GoldenCutLinearLayout.java
rename to android/src/main/java/org/ligi/passandroid/ui/GoldenCutLinearLayout.java
diff --git a/src/main/java/org/ligi/passandroid/ui/HelpActivity.java b/android/src/main/java/org/ligi/passandroid/ui/HelpActivity.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/HelpActivity.java
rename to android/src/main/java/org/ligi/passandroid/ui/HelpActivity.java
diff --git a/src/main/java/org/ligi/passandroid/ui/InputStreamProvider.java b/android/src/main/java/org/ligi/passandroid/ui/InputStreamProvider.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/InputStreamProvider.java
rename to android/src/main/java/org/ligi/passandroid/ui/InputStreamProvider.java
diff --git a/src/main/java/org/ligi/passandroid/ui/NavigateToLocationsDialog.java b/android/src/main/java/org/ligi/passandroid/ui/NavigateToLocationsDialog.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/NavigateToLocationsDialog.java
rename to android/src/main/java/org/ligi/passandroid/ui/NavigateToLocationsDialog.java
diff --git a/src/main/java/org/ligi/passandroid/ui/NavigationFragment.java b/android/src/main/java/org/ligi/passandroid/ui/NavigationFragment.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/NavigationFragment.java
rename to android/src/main/java/org/ligi/passandroid/ui/NavigationFragment.java
diff --git a/src/main/java/org/ligi/passandroid/ui/PassAdapter.java b/android/src/main/java/org/ligi/passandroid/ui/PassAdapter.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/PassAdapter.java
rename to android/src/main/java/org/ligi/passandroid/ui/PassAdapter.java
diff --git a/src/main/java/org/ligi/passandroid/ui/PassEditActivity.java b/android/src/main/java/org/ligi/passandroid/ui/PassEditActivity.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/PassEditActivity.java
rename to android/src/main/java/org/ligi/passandroid/ui/PassEditActivity.java
diff --git a/src/main/java/org/ligi/passandroid/ui/PassExportTask.java b/android/src/main/java/org/ligi/passandroid/ui/PassExportTask.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/PassExportTask.java
rename to android/src/main/java/org/ligi/passandroid/ui/PassExportTask.java
diff --git a/src/main/java/org/ligi/passandroid/ui/PassExporter.java b/android/src/main/java/org/ligi/passandroid/ui/PassExporter.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/PassExporter.java
rename to android/src/main/java/org/ligi/passandroid/ui/PassExporter.java
diff --git a/src/main/java/org/ligi/passandroid/ui/PassImportActivity.java b/android/src/main/java/org/ligi/passandroid/ui/PassImportActivity.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/PassImportActivity.java
rename to android/src/main/java/org/ligi/passandroid/ui/PassImportActivity.java
diff --git a/src/main/java/org/ligi/passandroid/ui/PassListActivity.java b/android/src/main/java/org/ligi/passandroid/ui/PassListActivity.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/PassListActivity.java
rename to android/src/main/java/org/ligi/passandroid/ui/PassListActivity.java
diff --git a/src/main/java/org/ligi/passandroid/ui/PassMenuOptions.java b/android/src/main/java/org/ligi/passandroid/ui/PassMenuOptions.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/PassMenuOptions.java
rename to android/src/main/java/org/ligi/passandroid/ui/PassMenuOptions.java
diff --git a/src/main/java/org/ligi/passandroid/ui/PassViewActivity.java b/android/src/main/java/org/ligi/passandroid/ui/PassViewActivity.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/PassViewActivity.java
rename to android/src/main/java/org/ligi/passandroid/ui/PassViewActivity.java
diff --git a/src/main/java/org/ligi/passandroid/ui/PassViewActivityBase.java b/android/src/main/java/org/ligi/passandroid/ui/PassViewActivityBase.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/PassViewActivityBase.java
rename to android/src/main/java/org/ligi/passandroid/ui/PassViewActivityBase.java
diff --git a/src/main/java/org/ligi/passandroid/ui/PassViewHolder.java b/android/src/main/java/org/ligi/passandroid/ui/PassViewHolder.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/PassViewHolder.java
rename to android/src/main/java/org/ligi/passandroid/ui/PassViewHolder.java
diff --git a/src/main/java/org/ligi/passandroid/ui/PreferenceActivity.java b/android/src/main/java/org/ligi/passandroid/ui/PreferenceActivity.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/PreferenceActivity.java
rename to android/src/main/java/org/ligi/passandroid/ui/PreferenceActivity.java
diff --git a/src/main/java/org/ligi/passandroid/ui/SearchPassesIntentService.java b/android/src/main/java/org/ligi/passandroid/ui/SearchPassesIntentService.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/SearchPassesIntentService.java
rename to android/src/main/java/org/ligi/passandroid/ui/SearchPassesIntentService.java
diff --git a/src/main/java/org/ligi/passandroid/ui/UnzipPassController.java b/android/src/main/java/org/ligi/passandroid/ui/UnzipPassController.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/UnzipPassController.java
rename to android/src/main/java/org/ligi/passandroid/ui/UnzipPassController.java
diff --git a/src/main/java/org/ligi/passandroid/ui/UnzipPassDialog.java b/android/src/main/java/org/ligi/passandroid/ui/UnzipPassDialog.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/UnzipPassDialog.java
rename to android/src/main/java/org/ligi/passandroid/ui/UnzipPassDialog.java
diff --git a/src/main/java/org/ligi/passandroid/ui/Visibility.java b/android/src/main/java/org/ligi/passandroid/ui/Visibility.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/Visibility.java
rename to android/src/main/java/org/ligi/passandroid/ui/Visibility.java
diff --git a/src/main/java/org/ligi/passandroid/ui/edit_fragments/BarCodeIntentIntegrator.java b/android/src/main/java/org/ligi/passandroid/ui/edit_fragments/BarCodeIntentIntegrator.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/edit_fragments/BarCodeIntentIntegrator.java
rename to android/src/main/java/org/ligi/passandroid/ui/edit_fragments/BarCodeIntentIntegrator.java
diff --git a/src/main/java/org/ligi/passandroid/ui/edit_fragments/BarcodeEditFragment.java b/android/src/main/java/org/ligi/passandroid/ui/edit_fragments/BarcodeEditFragment.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/edit_fragments/BarcodeEditFragment.java
rename to android/src/main/java/org/ligi/passandroid/ui/edit_fragments/BarcodeEditFragment.java
diff --git a/src/main/java/org/ligi/passandroid/ui/edit_fragments/CategoryPickFragment.java b/android/src/main/java/org/ligi/passandroid/ui/edit_fragments/CategoryPickFragment.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/edit_fragments/CategoryPickFragment.java
rename to android/src/main/java/org/ligi/passandroid/ui/edit_fragments/CategoryPickFragment.java
diff --git a/src/main/java/org/ligi/passandroid/ui/edit_fragments/ColorPickFragment.java b/android/src/main/java/org/ligi/passandroid/ui/edit_fragments/ColorPickFragment.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/edit_fragments/ColorPickFragment.java
rename to android/src/main/java/org/ligi/passandroid/ui/edit_fragments/ColorPickFragment.java
diff --git a/src/main/java/org/ligi/passandroid/ui/edit_fragments/ImageEditFragment.java b/android/src/main/java/org/ligi/passandroid/ui/edit_fragments/ImageEditFragment.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/edit_fragments/ImageEditFragment.java
rename to android/src/main/java/org/ligi/passandroid/ui/edit_fragments/ImageEditFragment.java
diff --git a/src/main/java/org/ligi/passandroid/ui/edit_fragments/MetaDataFragment.java b/android/src/main/java/org/ligi/passandroid/ui/edit_fragments/MetaDataFragment.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/edit_fragments/MetaDataFragment.java
rename to android/src/main/java/org/ligi/passandroid/ui/edit_fragments/MetaDataFragment.java
diff --git a/src/main/java/org/ligi/passandroid/ui/quirk_fix/OpenIphoneWebView.java b/android/src/main/java/org/ligi/passandroid/ui/quirk_fix/OpenIphoneWebView.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/quirk_fix/OpenIphoneWebView.java
rename to android/src/main/java/org/ligi/passandroid/ui/quirk_fix/OpenIphoneWebView.java
diff --git a/src/main/java/org/ligi/passandroid/ui/quirk_fix/URLRewriteActivity.java b/android/src/main/java/org/ligi/passandroid/ui/quirk_fix/URLRewriteActivity.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/quirk_fix/URLRewriteActivity.java
rename to android/src/main/java/org/ligi/passandroid/ui/quirk_fix/URLRewriteActivity.java
diff --git a/src/main/java/org/ligi/passandroid/ui/quirk_fix/USAirwaysLoadActivity.java b/android/src/main/java/org/ligi/passandroid/ui/quirk_fix/USAirwaysLoadActivity.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/quirk_fix/USAirwaysLoadActivity.java
rename to android/src/main/java/org/ligi/passandroid/ui/quirk_fix/USAirwaysLoadActivity.java
diff --git a/src/main/java/org/ligi/passandroid/ui/views/CategoryIndicatorView.java b/android/src/main/java/org/ligi/passandroid/ui/views/CategoryIndicatorView.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/views/CategoryIndicatorView.java
rename to android/src/main/java/org/ligi/passandroid/ui/views/CategoryIndicatorView.java
diff --git a/src/main/java/org/ligi/passandroid/ui/views/WidthDominatedSquareImageView.java b/android/src/main/java/org/ligi/passandroid/ui/views/WidthDominatedSquareImageView.java
similarity index 100%
rename from src/main/java/org/ligi/passandroid/ui/views/WidthDominatedSquareImageView.java
rename to android/src/main/java/org/ligi/passandroid/ui/views/WidthDominatedSquareImageView.java
diff --git a/src/main/res/drawable-hdpi/ic_action_create.png b/android/src/main/res/drawable-hdpi/ic_action_create.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_action_create.png
rename to android/src/main/res/drawable-hdpi/ic_action_create.png
diff --git a/src/main/res/drawable-hdpi/ic_action_delete.png b/android/src/main/res/drawable-hdpi/ic_action_delete.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_action_delete.png
rename to android/src/main/res/drawable-hdpi/ic_action_delete.png
diff --git a/src/main/res/drawable-hdpi/ic_action_gplus.png b/android/src/main/res/drawable-hdpi/ic_action_gplus.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_action_gplus.png
rename to android/src/main/res/drawable-hdpi/ic_action_gplus.png
diff --git a/src/main/res/drawable-hdpi/ic_action_help.png b/android/src/main/res/drawable-hdpi/ic_action_help.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_action_help.png
rename to android/src/main/res/drawable-hdpi/ic_action_help.png
diff --git a/src/main/res/drawable-hdpi/ic_action_map.png b/android/src/main/res/drawable-hdpi/ic_action_map.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_action_map.png
rename to android/src/main/res/drawable-hdpi/ic_action_map.png
diff --git a/src/main/res/drawable-hdpi/ic_action_refresh.png b/android/src/main/res/drawable-hdpi/ic_action_refresh.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_action_refresh.png
rename to android/src/main/res/drawable-hdpi/ic_action_refresh.png
diff --git a/src/main/res/drawable-hdpi/ic_action_save.png b/android/src/main/res/drawable-hdpi/ic_action_save.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_action_save.png
rename to android/src/main/res/drawable-hdpi/ic_action_save.png
diff --git a/src/main/res/drawable-hdpi/ic_action_share.png b/android/src/main/res/drawable-hdpi/ic_action_share.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_action_share.png
rename to android/src/main/res/drawable-hdpi/ic_action_share.png
diff --git a/src/main/res/drawable-hdpi/ic_action_wb_incandescent.png b/android/src/main/res/drawable-hdpi/ic_action_wb_incandescent.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_action_wb_incandescent.png
rename to android/src/main/res/drawable-hdpi/ic_action_wb_incandescent.png
diff --git a/src/main/res/drawable-hdpi/ic_fam_add.png b/android/src/main/res/drawable-hdpi/ic_fam_add.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_fam_add.png
rename to android/src/main/res/drawable-hdpi/ic_fam_add.png
diff --git a/src/main/res/drawable-hdpi/ic_fam_find.png b/android/src/main/res/drawable-hdpi/ic_fam_find.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_fam_find.png
rename to android/src/main/res/drawable-hdpi/ic_fam_find.png
diff --git a/src/main/res/drawable-hdpi/ic_fam_giftcard.png b/android/src/main/res/drawable-hdpi/ic_fam_giftcard.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_fam_giftcard.png
rename to android/src/main/res/drawable-hdpi/ic_fam_giftcard.png
diff --git a/src/main/res/drawable-hdpi/ic_fam_open.png b/android/src/main/res/drawable-hdpi/ic_fam_open.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_fam_open.png
rename to android/src/main/res/drawable-hdpi/ic_fam_open.png
diff --git a/src/main/res/drawable-hdpi/ic_launcher.png b/android/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_launcher.png
rename to android/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/src/main/res/drawable-hdpi/ic_nav_share.png b/android/src/main/res/drawable-hdpi/ic_nav_share.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_nav_share.png
rename to android/src/main/res/drawable-hdpi/ic_nav_share.png
diff --git a/src/main/res/drawable-hdpi/ic_warning_amber_36dp.png b/android/src/main/res/drawable-hdpi/ic_warning_amber_36dp.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_warning_amber_36dp.png
rename to android/src/main/res/drawable-hdpi/ic_warning_amber_36dp.png
diff --git a/src/main/res/drawable-ldpi/ic_action_gplus.png b/android/src/main/res/drawable-ldpi/ic_action_gplus.png
similarity index 100%
rename from src/main/res/drawable-ldpi/ic_action_gplus.png
rename to android/src/main/res/drawable-ldpi/ic_action_gplus.png
diff --git a/src/main/res/drawable-ldpi/ic_fam_open.png b/android/src/main/res/drawable-ldpi/ic_fam_open.png
similarity index 100%
rename from src/main/res/drawable-ldpi/ic_fam_open.png
rename to android/src/main/res/drawable-ldpi/ic_fam_open.png
diff --git a/src/main/res/drawable-ldpi/ic_launcher.png b/android/src/main/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from src/main/res/drawable-ldpi/ic_launcher.png
rename to android/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/src/main/res/drawable-ldpi/ic_nav_share.png b/android/src/main/res/drawable-ldpi/ic_nav_share.png
similarity index 100%
rename from src/main/res/drawable-ldpi/ic_nav_share.png
rename to android/src/main/res/drawable-ldpi/ic_nav_share.png
diff --git a/src/main/res/drawable-mdpi/ic_action_create.png b/android/src/main/res/drawable-mdpi/ic_action_create.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_action_create.png
rename to android/src/main/res/drawable-mdpi/ic_action_create.png
diff --git a/src/main/res/drawable-mdpi/ic_action_delete.png b/android/src/main/res/drawable-mdpi/ic_action_delete.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_action_delete.png
rename to android/src/main/res/drawable-mdpi/ic_action_delete.png
diff --git a/src/main/res/drawable-mdpi/ic_action_gplus.png b/android/src/main/res/drawable-mdpi/ic_action_gplus.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_action_gplus.png
rename to android/src/main/res/drawable-mdpi/ic_action_gplus.png
diff --git a/src/main/res/drawable-mdpi/ic_action_help.png b/android/src/main/res/drawable-mdpi/ic_action_help.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_action_help.png
rename to android/src/main/res/drawable-mdpi/ic_action_help.png
diff --git a/src/main/res/drawable-mdpi/ic_action_map.png b/android/src/main/res/drawable-mdpi/ic_action_map.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_action_map.png
rename to android/src/main/res/drawable-mdpi/ic_action_map.png
diff --git a/src/main/res/drawable-mdpi/ic_action_refresh.png b/android/src/main/res/drawable-mdpi/ic_action_refresh.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_action_refresh.png
rename to android/src/main/res/drawable-mdpi/ic_action_refresh.png
diff --git a/src/main/res/drawable-mdpi/ic_action_save.png b/android/src/main/res/drawable-mdpi/ic_action_save.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_action_save.png
rename to android/src/main/res/drawable-mdpi/ic_action_save.png
diff --git a/src/main/res/drawable-mdpi/ic_action_share.png b/android/src/main/res/drawable-mdpi/ic_action_share.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_action_share.png
rename to android/src/main/res/drawable-mdpi/ic_action_share.png
diff --git a/src/main/res/drawable-mdpi/ic_action_wb_incandescent.png b/android/src/main/res/drawable-mdpi/ic_action_wb_incandescent.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_action_wb_incandescent.png
rename to android/src/main/res/drawable-mdpi/ic_action_wb_incandescent.png
diff --git a/src/main/res/drawable-mdpi/ic_fam_add.png b/android/src/main/res/drawable-mdpi/ic_fam_add.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_fam_add.png
rename to android/src/main/res/drawable-mdpi/ic_fam_add.png
diff --git a/src/main/res/drawable-mdpi/ic_fam_find.png b/android/src/main/res/drawable-mdpi/ic_fam_find.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_fam_find.png
rename to android/src/main/res/drawable-mdpi/ic_fam_find.png
diff --git a/src/main/res/drawable-mdpi/ic_fam_giftcard.png b/android/src/main/res/drawable-mdpi/ic_fam_giftcard.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_fam_giftcard.png
rename to android/src/main/res/drawable-mdpi/ic_fam_giftcard.png
diff --git a/src/main/res/drawable-mdpi/ic_fam_open.png b/android/src/main/res/drawable-mdpi/ic_fam_open.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_fam_open.png
rename to android/src/main/res/drawable-mdpi/ic_fam_open.png
diff --git a/src/main/res/drawable-mdpi/ic_launcher.png b/android/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_launcher.png
rename to android/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/src/main/res/drawable-mdpi/ic_nav_share.png b/android/src/main/res/drawable-mdpi/ic_nav_share.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_nav_share.png
rename to android/src/main/res/drawable-mdpi/ic_nav_share.png
diff --git a/src/main/res/drawable-mdpi/ic_place_grey600_18dp.png b/android/src/main/res/drawable-mdpi/ic_place_grey600_18dp.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_place_grey600_18dp.png
rename to android/src/main/res/drawable-mdpi/ic_place_grey600_18dp.png
diff --git a/src/main/res/drawable-mdpi/ic_today_grey600_18dp.png b/android/src/main/res/drawable-mdpi/ic_today_grey600_18dp.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_today_grey600_18dp.png
rename to android/src/main/res/drawable-mdpi/ic_today_grey600_18dp.png
diff --git a/src/main/res/drawable-mdpi/ic_warning_amber_36dp.png b/android/src/main/res/drawable-mdpi/ic_warning_amber_36dp.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_warning_amber_36dp.png
rename to android/src/main/res/drawable-mdpi/ic_warning_amber_36dp.png
diff --git a/src/main/res/drawable-v21/clickable_bg.xml b/android/src/main/res/drawable-v21/clickable_bg.xml
similarity index 100%
rename from src/main/res/drawable-v21/clickable_bg.xml
rename to android/src/main/res/drawable-v21/clickable_bg.xml
diff --git a/src/main/res/drawable-xhdpi/ic_action_create.png b/android/src/main/res/drawable-xhdpi/ic_action_create.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_action_create.png
rename to android/src/main/res/drawable-xhdpi/ic_action_create.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_delete.png b/android/src/main/res/drawable-xhdpi/ic_action_delete.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_action_delete.png
rename to android/src/main/res/drawable-xhdpi/ic_action_delete.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_gplus.png b/android/src/main/res/drawable-xhdpi/ic_action_gplus.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_action_gplus.png
rename to android/src/main/res/drawable-xhdpi/ic_action_gplus.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_help.png b/android/src/main/res/drawable-xhdpi/ic_action_help.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_action_help.png
rename to android/src/main/res/drawable-xhdpi/ic_action_help.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_map.png b/android/src/main/res/drawable-xhdpi/ic_action_map.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_action_map.png
rename to android/src/main/res/drawable-xhdpi/ic_action_map.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_refresh.png b/android/src/main/res/drawable-xhdpi/ic_action_refresh.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_action_refresh.png
rename to android/src/main/res/drawable-xhdpi/ic_action_refresh.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_save.png b/android/src/main/res/drawable-xhdpi/ic_action_save.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_action_save.png
rename to android/src/main/res/drawable-xhdpi/ic_action_save.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_share.png b/android/src/main/res/drawable-xhdpi/ic_action_share.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_action_share.png
rename to android/src/main/res/drawable-xhdpi/ic_action_share.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_wb_incandescent.png b/android/src/main/res/drawable-xhdpi/ic_action_wb_incandescent.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_action_wb_incandescent.png
rename to android/src/main/res/drawable-xhdpi/ic_action_wb_incandescent.png
diff --git a/src/main/res/drawable-xhdpi/ic_fam_add.png b/android/src/main/res/drawable-xhdpi/ic_fam_add.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_fam_add.png
rename to android/src/main/res/drawable-xhdpi/ic_fam_add.png
diff --git a/src/main/res/drawable-xhdpi/ic_fam_find.png b/android/src/main/res/drawable-xhdpi/ic_fam_find.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_fam_find.png
rename to android/src/main/res/drawable-xhdpi/ic_fam_find.png
diff --git a/src/main/res/drawable-xhdpi/ic_fam_giftcard.png b/android/src/main/res/drawable-xhdpi/ic_fam_giftcard.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_fam_giftcard.png
rename to android/src/main/res/drawable-xhdpi/ic_fam_giftcard.png
diff --git a/src/main/res/drawable-xhdpi/ic_fam_open.png b/android/src/main/res/drawable-xhdpi/ic_fam_open.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_fam_open.png
rename to android/src/main/res/drawable-xhdpi/ic_fam_open.png
diff --git a/src/main/res/drawable-xhdpi/ic_launcher.png b/android/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_launcher.png
rename to android/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/src/main/res/drawable-xhdpi/ic_nav_share.png b/android/src/main/res/drawable-xhdpi/ic_nav_share.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_nav_share.png
rename to android/src/main/res/drawable-xhdpi/ic_nav_share.png
diff --git a/src/main/res/drawable-xhdpi/ic_place_grey600_18dp.png b/android/src/main/res/drawable-xhdpi/ic_place_grey600_18dp.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_place_grey600_18dp.png
rename to android/src/main/res/drawable-xhdpi/ic_place_grey600_18dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_today_grey600_18dp.png b/android/src/main/res/drawable-xhdpi/ic_today_grey600_18dp.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_today_grey600_18dp.png
rename to android/src/main/res/drawable-xhdpi/ic_today_grey600_18dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_warning_amber_36dp.png b/android/src/main/res/drawable-xhdpi/ic_warning_amber_36dp.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_warning_amber_36dp.png
rename to android/src/main/res/drawable-xhdpi/ic_warning_amber_36dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_create.png b/android/src/main/res/drawable-xxhdpi/ic_action_create.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_action_create.png
rename to android/src/main/res/drawable-xxhdpi/ic_action_create.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_delete.png b/android/src/main/res/drawable-xxhdpi/ic_action_delete.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_action_delete.png
rename to android/src/main/res/drawable-xxhdpi/ic_action_delete.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_gplus.png b/android/src/main/res/drawable-xxhdpi/ic_action_gplus.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_action_gplus.png
rename to android/src/main/res/drawable-xxhdpi/ic_action_gplus.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_help.png b/android/src/main/res/drawable-xxhdpi/ic_action_help.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_action_help.png
rename to android/src/main/res/drawable-xxhdpi/ic_action_help.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_map.png b/android/src/main/res/drawable-xxhdpi/ic_action_map.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_action_map.png
rename to android/src/main/res/drawable-xxhdpi/ic_action_map.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_refresh.png b/android/src/main/res/drawable-xxhdpi/ic_action_refresh.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_action_refresh.png
rename to android/src/main/res/drawable-xxhdpi/ic_action_refresh.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_save.png b/android/src/main/res/drawable-xxhdpi/ic_action_save.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_action_save.png
rename to android/src/main/res/drawable-xxhdpi/ic_action_save.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_share.png b/android/src/main/res/drawable-xxhdpi/ic_action_share.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_action_share.png
rename to android/src/main/res/drawable-xxhdpi/ic_action_share.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_wb_incandescent.png b/android/src/main/res/drawable-xxhdpi/ic_action_wb_incandescent.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_action_wb_incandescent.png
rename to android/src/main/res/drawable-xxhdpi/ic_action_wb_incandescent.png
diff --git a/src/main/res/drawable-xxhdpi/ic_fam_add.png b/android/src/main/res/drawable-xxhdpi/ic_fam_add.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_fam_add.png
rename to android/src/main/res/drawable-xxhdpi/ic_fam_add.png
diff --git a/src/main/res/drawable-xxhdpi/ic_fam_find.png b/android/src/main/res/drawable-xxhdpi/ic_fam_find.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_fam_find.png
rename to android/src/main/res/drawable-xxhdpi/ic_fam_find.png
diff --git a/src/main/res/drawable-xxhdpi/ic_fam_giftcard.png b/android/src/main/res/drawable-xxhdpi/ic_fam_giftcard.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_fam_giftcard.png
rename to android/src/main/res/drawable-xxhdpi/ic_fam_giftcard.png
diff --git a/src/main/res/drawable-xxhdpi/ic_fam_open.png b/android/src/main/res/drawable-xxhdpi/ic_fam_open.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_fam_open.png
rename to android/src/main/res/drawable-xxhdpi/ic_fam_open.png
diff --git a/src/main/res/drawable-xxhdpi/ic_launcher.png b/android/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_launcher.png
rename to android/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/src/main/res/drawable-xxhdpi/ic_nav_share.png b/android/src/main/res/drawable-xxhdpi/ic_nav_share.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_nav_share.png
rename to android/src/main/res/drawable-xxhdpi/ic_nav_share.png
diff --git a/src/main/res/drawable-xxhdpi/ic_place_grey600_18dp.png b/android/src/main/res/drawable-xxhdpi/ic_place_grey600_18dp.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_place_grey600_18dp.png
rename to android/src/main/res/drawable-xxhdpi/ic_place_grey600_18dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_today_grey600_18dp.png b/android/src/main/res/drawable-xxhdpi/ic_today_grey600_18dp.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_today_grey600_18dp.png
rename to android/src/main/res/drawable-xxhdpi/ic_today_grey600_18dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_warning_amber_36dp.png b/android/src/main/res/drawable-xxhdpi/ic_warning_amber_36dp.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_warning_amber_36dp.png
rename to android/src/main/res/drawable-xxhdpi/ic_warning_amber_36dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_action_create.png b/android/src/main/res/drawable-xxxhdpi/ic_action_create.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/ic_action_create.png
rename to android/src/main/res/drawable-xxxhdpi/ic_action_create.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_action_delete.png b/android/src/main/res/drawable-xxxhdpi/ic_action_delete.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/ic_action_delete.png
rename to android/src/main/res/drawable-xxxhdpi/ic_action_delete.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_action_help.png b/android/src/main/res/drawable-xxxhdpi/ic_action_help.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/ic_action_help.png
rename to android/src/main/res/drawable-xxxhdpi/ic_action_help.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_action_map.png b/android/src/main/res/drawable-xxxhdpi/ic_action_map.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/ic_action_map.png
rename to android/src/main/res/drawable-xxxhdpi/ic_action_map.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_action_refresh.png b/android/src/main/res/drawable-xxxhdpi/ic_action_refresh.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/ic_action_refresh.png
rename to android/src/main/res/drawable-xxxhdpi/ic_action_refresh.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_action_save.png b/android/src/main/res/drawable-xxxhdpi/ic_action_save.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/ic_action_save.png
rename to android/src/main/res/drawable-xxxhdpi/ic_action_save.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_action_share.png b/android/src/main/res/drawable-xxxhdpi/ic_action_share.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/ic_action_share.png
rename to android/src/main/res/drawable-xxxhdpi/ic_action_share.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_action_wb_incandescent.png b/android/src/main/res/drawable-xxxhdpi/ic_action_wb_incandescent.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/ic_action_wb_incandescent.png
rename to android/src/main/res/drawable-xxxhdpi/ic_action_wb_incandescent.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_fam_add.png b/android/src/main/res/drawable-xxxhdpi/ic_fam_add.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/ic_fam_add.png
rename to android/src/main/res/drawable-xxxhdpi/ic_fam_add.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_fam_find.png b/android/src/main/res/drawable-xxxhdpi/ic_fam_find.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/ic_fam_find.png
rename to android/src/main/res/drawable-xxxhdpi/ic_fam_find.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_fam_giftcard.png b/android/src/main/res/drawable-xxxhdpi/ic_fam_giftcard.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/ic_fam_giftcard.png
rename to android/src/main/res/drawable-xxxhdpi/ic_fam_giftcard.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_launcher.png b/android/src/main/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/ic_launcher.png
rename to android/src/main/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_place_grey600_18dp.png b/android/src/main/res/drawable-xxxhdpi/ic_place_grey600_18dp.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/ic_place_grey600_18dp.png
rename to android/src/main/res/drawable-xxxhdpi/ic_place_grey600_18dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_today_grey600_18dp.png b/android/src/main/res/drawable-xxxhdpi/ic_today_grey600_18dp.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/ic_today_grey600_18dp.png
rename to android/src/main/res/drawable-xxxhdpi/ic_today_grey600_18dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_warning_amber_36dp.png b/android/src/main/res/drawable-xxxhdpi/ic_warning_amber_36dp.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/ic_warning_amber_36dp.png
rename to android/src/main/res/drawable-xxxhdpi/ic_warning_amber_36dp.png
diff --git a/src/main/res/drawable/cat_bg.png b/android/src/main/res/drawable/cat_bg.png
similarity index 100%
rename from src/main/res/drawable/cat_bg.png
rename to android/src/main/res/drawable/cat_bg.png
diff --git a/src/main/res/drawable/cat_bp.png b/android/src/main/res/drawable/cat_bp.png
similarity index 100%
rename from src/main/res/drawable/cat_bp.png
rename to android/src/main/res/drawable/cat_bp.png
diff --git a/src/main/res/drawable/cat_cp.png b/android/src/main/res/drawable/cat_cp.png
similarity index 100%
rename from src/main/res/drawable/cat_cp.png
rename to android/src/main/res/drawable/cat_cp.png
diff --git a/src/main/res/drawable/cat_et.png b/android/src/main/res/drawable/cat_et.png
similarity index 100%
rename from src/main/res/drawable/cat_et.png
rename to android/src/main/res/drawable/cat_et.png
diff --git a/src/main/res/drawable/cat_none.png b/android/src/main/res/drawable/cat_none.png
similarity index 100%
rename from src/main/res/drawable/cat_none.png
rename to android/src/main/res/drawable/cat_none.png
diff --git a/src/main/res/drawable/cat_ps.png b/android/src/main/res/drawable/cat_ps.png
similarity index 100%
rename from src/main/res/drawable/cat_ps.png
rename to android/src/main/res/drawable/cat_ps.png
diff --git a/src/main/res/drawable/cat_sc.png b/android/src/main/res/drawable/cat_sc.png
similarity index 100%
rename from src/main/res/drawable/cat_sc.png
rename to android/src/main/res/drawable/cat_sc.png
diff --git a/src/main/res/drawable/clickable_bg.xml b/android/src/main/res/drawable/clickable_bg.xml
similarity index 100%
rename from src/main/res/drawable/clickable_bg.xml
rename to android/src/main/res/drawable/clickable_bg.xml
diff --git a/src/main/res/layout-land/activity_pass_view.xml b/android/src/main/res/layout-land/activity_pass_view.xml
similarity index 100%
rename from src/main/res/layout-land/activity_pass_view.xml
rename to android/src/main/res/layout-land/activity_pass_view.xml
diff --git a/src/main/res/layout/activity_help.xml b/android/src/main/res/layout/activity_help.xml
similarity index 100%
rename from src/main/res/layout/activity_help.xml
rename to android/src/main/res/layout/activity_help.xml
diff --git a/src/main/res/layout/activity_pass_view.xml b/android/src/main/res/layout/activity_pass_view.xml
similarity index 100%
rename from src/main/res/layout/activity_pass_view.xml
rename to android/src/main/res/layout/activity_pass_view.xml
diff --git a/src/main/res/layout/activity_pass_view_base.xml b/android/src/main/res/layout/activity_pass_view_base.xml
similarity index 100%
rename from src/main/res/layout/activity_pass_view_base.xml
rename to android/src/main/res/layout/activity_pass_view_base.xml
diff --git a/src/main/res/layout/category_indicator.xml b/android/src/main/res/layout/category_indicator.xml
similarity index 100%
rename from src/main/res/layout/category_indicator.xml
rename to android/src/main/res/layout/category_indicator.xml
diff --git a/src/main/res/layout/edit.xml b/android/src/main/res/layout/edit.xml
similarity index 100%
rename from src/main/res/layout/edit.xml
rename to android/src/main/res/layout/edit.xml
diff --git a/src/main/res/layout/edit_barcode.xml b/android/src/main/res/layout/edit_barcode.xml
similarity index 100%
rename from src/main/res/layout/edit_barcode.xml
rename to android/src/main/res/layout/edit_barcode.xml
diff --git a/src/main/res/layout/edit_color.xml b/android/src/main/res/layout/edit_color.xml
similarity index 100%
rename from src/main/res/layout/edit_color.xml
rename to android/src/main/res/layout/edit_color.xml
diff --git a/src/main/res/layout/edit_images.xml b/android/src/main/res/layout/edit_images.xml
similarity index 100%
rename from src/main/res/layout/edit_images.xml
rename to android/src/main/res/layout/edit_images.xml
diff --git a/src/main/res/layout/edit_meta_data.xml b/android/src/main/res/layout/edit_meta_data.xml
similarity index 100%
rename from src/main/res/layout/edit_meta_data.xml
rename to android/src/main/res/layout/edit_meta_data.xml
diff --git a/src/main/res/layout/fragment_navigation.xml b/android/src/main/res/layout/fragment_navigation.xml
similarity index 100%
rename from src/main/res/layout/fragment_navigation.xml
rename to android/src/main/res/layout/fragment_navigation.xml
diff --git a/src/main/res/layout/fullscreen_image.xml b/android/src/main/res/layout/fullscreen_image.xml
similarity index 100%
rename from src/main/res/layout/fullscreen_image.xml
rename to android/src/main/res/layout/fullscreen_image.xml
diff --git a/src/main/res/layout/item_nav_pass_category.xml b/android/src/main/res/layout/item_nav_pass_category.xml
similarity index 100%
rename from src/main/res/layout/item_nav_pass_category.xml
rename to android/src/main/res/layout/item_nav_pass_category.xml
diff --git a/src/main/res/layout/main_field_item.xml b/android/src/main/res/layout/main_field_item.xml
similarity index 100%
rename from src/main/res/layout/main_field_item.xml
rename to android/src/main/res/layout/main_field_item.xml
diff --git a/src/main/res/layout/pass_list.xml b/android/src/main/res/layout/pass_list.xml
similarity index 100%
rename from src/main/res/layout/pass_list.xml
rename to android/src/main/res/layout/pass_list.xml
diff --git a/src/main/res/layout/pass_list_item.xml b/android/src/main/res/layout/pass_list_item.xml
similarity index 100%
rename from src/main/res/layout/pass_list_item.xml
rename to android/src/main/res/layout/pass_list_item.xml
diff --git a/src/main/res/layout/pass_view_extra_data.xml b/android/src/main/res/layout/pass_view_extra_data.xml
similarity index 100%
rename from src/main/res/layout/pass_view_extra_data.xml
rename to android/src/main/res/layout/pass_view_extra_data.xml
diff --git a/src/main/res/layout/vertical_container.xml b/android/src/main/res/layout/vertical_container.xml
similarity index 100%
rename from src/main/res/layout/vertical_container.xml
rename to android/src/main/res/layout/vertical_container.xml
diff --git a/src/main/res/menu/activity_pass_action_mode.xml b/android/src/main/res/menu/activity_pass_action_mode.xml
similarity index 100%
rename from src/main/res/menu/activity_pass_action_mode.xml
rename to android/src/main/res/menu/activity_pass_action_mode.xml
diff --git a/src/main/res/menu/activity_pass_list_view.xml b/android/src/main/res/menu/activity_pass_list_view.xml
similarity index 100%
rename from src/main/res/menu/activity_pass_list_view.xml
rename to android/src/main/res/menu/activity_pass_list_view.xml
diff --git a/src/main/res/menu/activity_pass_view.xml b/android/src/main/res/menu/activity_pass_view.xml
similarity index 100%
rename from src/main/res/menu/activity_pass_view.xml
rename to android/src/main/res/menu/activity_pass_view.xml
diff --git a/src/main/res/menu/create.xml b/android/src/main/res/menu/create.xml
similarity index 100%
rename from src/main/res/menu/create.xml
rename to android/src/main/res/menu/create.xml
diff --git a/src/main/res/menu/map_item.xml b/android/src/main/res/menu/map_item.xml
similarity index 100%
rename from src/main/res/menu/map_item.xml
rename to android/src/main/res/menu/map_item.xml
diff --git a/src/main/res/menu/update.xml b/android/src/main/res/menu/update.xml
similarity index 100%
rename from src/main/res/menu/update.xml
rename to android/src/main/res/menu/update.xml
diff --git a/src/main/res/values-de/strings.xml b/android/src/main/res/values-de/strings.xml
similarity index 100%
rename from src/main/res/values-de/strings.xml
rename to android/src/main/res/values-de/strings.xml
diff --git a/src/main/res/values-es/strings.xml b/android/src/main/res/values-es/strings.xml
similarity index 100%
rename from src/main/res/values-es/strings.xml
rename to android/src/main/res/values-es/strings.xml
diff --git a/src/main/res/values-ru/strings.xml b/android/src/main/res/values-ru/strings.xml
similarity index 100%
rename from src/main/res/values-ru/strings.xml
rename to android/src/main/res/values-ru/strings.xml
diff --git a/src/main/res/values/colors.xml b/android/src/main/res/values/colors.xml
similarity index 100%
rename from src/main/res/values/colors.xml
rename to android/src/main/res/values/colors.xml
diff --git a/src/main/res/values/dimens.xml b/android/src/main/res/values/dimens.xml
similarity index 100%
rename from src/main/res/values/dimens.xml
rename to android/src/main/res/values/dimens.xml
diff --git a/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
similarity index 100%
rename from src/main/res/values/strings.xml
rename to android/src/main/res/values/strings.xml
diff --git a/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml
similarity index 100%
rename from src/main/res/values/styles.xml
rename to android/src/main/res/values/styles.xml
diff --git a/src/noAnalytics/java/org/ligi/ticketviewer/NotTracker.java b/android/src/noAnalytics/java/org/ligi/ticketviewer/NotTracker.java
similarity index 100%
rename from src/noAnalytics/java/org/ligi/ticketviewer/NotTracker.java
rename to android/src/noAnalytics/java/org/ligi/ticketviewer/NotTracker.java
diff --git a/src/noAnalytics/java/org/ligi/ticketviewer/Tracker.java b/android/src/noAnalytics/java/org/ligi/ticketviewer/Tracker.java
similarity index 100%
rename from src/noAnalytics/java/org/ligi/ticketviewer/Tracker.java
rename to android/src/noAnalytics/java/org/ligi/ticketviewer/Tracker.java
diff --git a/src/noMaps/java/org/ligi/passandroid/maps/PassbookMapsFacade.java b/android/src/noMaps/java/org/ligi/passandroid/maps/PassbookMapsFacade.java
similarity index 100%
rename from src/noMaps/java/org/ligi/passandroid/maps/PassbookMapsFacade.java
rename to android/src/noMaps/java/org/ligi/passandroid/maps/PassbookMapsFacade.java
diff --git a/src/test/java/org/ligi/passandroid/unittest/TheAppleStylePassTranslation.java b/android/src/test/java/org/ligi/passandroid/unittest/TheAppleStylePassTranslation.java
similarity index 100%
rename from src/test/java/org/ligi/passandroid/unittest/TheAppleStylePassTranslation.java
rename to android/src/test/java/org/ligi/passandroid/unittest/TheAppleStylePassTranslation.java
diff --git a/src/test/java/org/ligi/passandroid/unittest/ThePassField.java b/android/src/test/java/org/ligi/passandroid/unittest/ThePassField.java
similarity index 100%
rename from src/test/java/org/ligi/passandroid/unittest/ThePassField.java
rename to android/src/test/java/org/ligi/passandroid/unittest/ThePassField.java
diff --git a/src/test/java/org/ligi/passandroid/unittest/TheTAMMultiPassParser.java b/android/src/test/java/org/ligi/passandroid/unittest/TheTAMMultiPassParser.java
similarity index 100%
rename from src/test/java/org/ligi/passandroid/unittest/TheTAMMultiPassParser.java
rename to android/src/test/java/org/ligi/passandroid/unittest/TheTAMMultiPassParser.java
diff --git a/src/test/resources/tam_example_multipass_reply.html b/android/src/test/resources/tam_example_multipass_reply.html
similarity index 100%
rename from src/test/resources/tam_example_multipass_reply.html
rename to android/src/test/resources/tam_example_multipass_reply.html
diff --git a/src/withAnalytics/java/org/ligi/passandroid/AnalyticsTracker.java b/android/src/withAnalytics/java/org/ligi/passandroid/AnalyticsTracker.java
similarity index 100%
rename from src/withAnalytics/java/org/ligi/passandroid/AnalyticsTracker.java
rename to android/src/withAnalytics/java/org/ligi/passandroid/AnalyticsTracker.java
diff --git a/src/withAnalytics/java/org/ligi/passandroid/Tracker.java b/android/src/withAnalytics/java/org/ligi/passandroid/Tracker.java
similarity index 100%
rename from src/withAnalytics/java/org/ligi/passandroid/Tracker.java
rename to android/src/withAnalytics/java/org/ligi/passandroid/Tracker.java
diff --git a/src/withAnalytics/res/xml/analytics.xml b/android/src/withAnalytics/res/xml/analytics.xml
similarity index 100%
rename from src/withAnalytics/res/xml/analytics.xml
rename to android/src/withAnalytics/res/xml/analytics.xml
diff --git a/src/withMaps/AndroidManifest.xml b/android/src/withMaps/AndroidManifest.xml
similarity index 100%
rename from src/withMaps/AndroidManifest.xml
rename to android/src/withMaps/AndroidManifest.xml
diff --git a/src/withMaps/java/org/ligi/passandroid/FullscreenMapActivity.java b/android/src/withMaps/java/org/ligi/passandroid/FullscreenMapActivity.java
similarity index 100%
rename from src/withMaps/java/org/ligi/passandroid/FullscreenMapActivity.java
rename to android/src/withMaps/java/org/ligi/passandroid/FullscreenMapActivity.java
diff --git a/src/withMaps/java/org/ligi/passandroid/LocationsMapFragment.java b/android/src/withMaps/java/org/ligi/passandroid/LocationsMapFragment.java
similarity index 100%
rename from src/withMaps/java/org/ligi/passandroid/LocationsMapFragment.java
rename to android/src/withMaps/java/org/ligi/passandroid/LocationsMapFragment.java
diff --git a/src/withMaps/java/org/ligi/passandroid/maps/PassbookMapsFacade.java b/android/src/withMaps/java/org/ligi/passandroid/maps/PassbookMapsFacade.java
similarity index 100%
rename from src/withMaps/java/org/ligi/passandroid/maps/PassbookMapsFacade.java
rename to android/src/withMaps/java/org/ligi/passandroid/maps/PassbookMapsFacade.java
diff --git a/src/withMaps/res/layout/fullscreen_map.xml b/android/src/withMaps/res/layout/fullscreen_map.xml
similarity index 100%
rename from src/withMaps/res/layout/fullscreen_map.xml
rename to android/src/withMaps/res/layout/fullscreen_map.xml
diff --git a/settings.gradle b/settings.gradle
index 801853c5..03ac6641 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-//include ':backend'
\ No newline at end of file
+include ':android',':backend'
\ No newline at end of file