diff --git a/android-old/#AndroidManifest.xml# b/android-old/#AndroidManifest.xml#
new file mode 100644
index 0000000..169c620
--- /dev/null
+++ b/android-old/#AndroidManifest.xml#
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/AndroidManifest.xml b/android-old/AndroidManifest.xml
similarity index 100%
rename from android/AndroidManifest.xml
rename to android-old/AndroidManifest.xml
diff --git a/android/README.md b/android-old/README.md
similarity index 100%
rename from android/README.md
rename to android-old/README.md
diff --git a/android/ant.properties b/android-old/ant.properties
similarity index 100%
rename from android/ant.properties
rename to android-old/ant.properties
diff --git a/android-old/bin/AndroidManifest.xml b/android-old/bin/AndroidManifest.xml
new file mode 100644
index 0000000..9e67b34
--- /dev/null
+++ b/android-old/bin/AndroidManifest.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android-old/bin/AndroidManifest.xml.d b/android-old/bin/AndroidManifest.xml.d
new file mode 100644
index 0000000..4570e44
--- /dev/null
+++ b/android-old/bin/AndroidManifest.xml.d
@@ -0,0 +1,2 @@
+/home/dave/code/mongoose-2000/android/bin/AndroidManifest.xml : \
+/home/dave/code/mongoose-2000/android/AndroidManifest.xml \
diff --git a/android-old/bin/R.txt b/android-old/bin/R.txt
new file mode 100644
index 0000000..2c26b77
--- /dev/null
+++ b/android-old/bin/R.txt
@@ -0,0 +1,66 @@
+int animator card_flip_left_in 0x7f040000
+int animator card_flip_left_out 0x7f040001
+int animator card_flip_right_in 0x7f040002
+int animator card_flip_right_out 0x7f040003
+int color bg 0x7f070000
+int color buttonbg 0x7f070002
+int color text 0x7f070001
+int drawable arrow_left 0x7f020000
+int drawable arrow_right 0x7f020001
+int drawable bg 0x7f020002
+int drawable bg_style 0x7f020003
+int drawable bgpaw 0x7f020004
+int drawable button 0x7f020005
+int drawable button_bg 0x7f020006
+int drawable button_bg2 0x7f020007
+int drawable button_style 0x7f020008
+int drawable cross 0x7f020009
+int drawable draggable 0x7f02000a
+int drawable ic_launcher 0x7f02000b
+int drawable image_button_style 0x7f02000c
+int drawable logo 0x7f02000d
+int drawable maybe_off 0x7f02000e
+int drawable maybe_on 0x7f02000f
+int drawable mongooses 0x7f020010
+int drawable no_off 0x7f020011
+int drawable no_on 0x7f020012
+int drawable seekbg_fill 0x7f020013
+int drawable seekprogress 0x7f020014
+int drawable seekprogress_fill 0x7f020015
+int drawable seekthumb 0x7f020016
+int drawable swarmbutton 0x7f020017
+int drawable swarmspinner 0x7f020018
+int drawable swarmtoggle 0x7f020019
+int drawable swarmtoggledrawable 0x7f02001a
+int drawable swarmtoggledrawable_maybe 0x7f02001b
+int drawable swarmtoggledrawable_no 0x7f02001c
+int drawable swarmtoggledrawable_yes 0x7f02001d
+int drawable tick 0x7f02001e
+int drawable yes_off 0x7f02001f
+int drawable yes_on 0x7f020020
+int id inner_fragment 0x7f090001
+int id main 0x7f090000
+int id spinnerTarget 0x7f090003
+int id standard_spinner_format 0x7f090002
+int layout debug_text 0x7f030000
+int layout main 0x7f030001
+int layout main_fragment 0x7f030002
+int layout spinner_item 0x7f030003
+int layout spinner_layout 0x7f030004
+int layout toggle_button_fancy 0x7f030005
+int layout toggle_button_maybe 0x7f030006
+int layout toggle_button_no 0x7f030007
+int layout toggle_button_yes 0x7f030008
+int raw active 0x7f050000
+int raw ping 0x7f050001
+int string app_name 0x7f060000
+int style StarwispButton 0x7f080000
+int style StarwispFancyToggleButton 0x7f080001
+int style StarwispMaybeToggleButton 0x7f080003
+int style StarwispNoToggleButton 0x7f080004
+int style StarwispSeekBar 0x7f080008
+int style StarwispSpinner 0x7f080007
+int style StarwispSpinnerItem 0x7f080005
+int style StarwispTextAppearanceSpinnerItem 0x7f080006
+int style StarwispTheme 0x7f080009
+int style StarwispYesToggleButton 0x7f080002
diff --git a/android-old/bin/build.prop b/android-old/bin/build.prop
new file mode 100644
index 0000000..09bb6c0
--- /dev/null
+++ b/android-old/bin/build.prop
@@ -0,0 +1,10 @@
+#Last build type
+#Mon, 19 Feb 2018 12:18:58 +0000
+
+build.last.target=debug
+
+build.last.is.instrumented=false
+
+build.last.is.packaging.debug=true
+
+build.last.is.signing.debug=true
diff --git a/android-old/bin/classes.dex b/android-old/bin/classes.dex
new file mode 100644
index 0000000..20989f9
Binary files /dev/null and b/android-old/bin/classes.dex differ
diff --git a/android-old/bin/classes.dex.d b/android-old/bin/classes.dex.d
new file mode 100644
index 0000000..9cee66e
--- /dev/null
+++ b/android-old/bin/classes.dex.d
@@ -0,0 +1,42 @@
+/home/dave/code/mongoose-2000/android/bin/classes.dex : \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/R$color.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/R$string.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/NewIndividualActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/ExportActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/UpdateIndividualActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/MainActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/TagLocationActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/starwisp.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/R$animator.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/SyncActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/ReviewActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/R$attr.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/R$drawable.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/PupFocalStartActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/ReviewItemActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/ObservationsActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/GroupEventsActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/NewPackActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/R$id.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/PupFocalActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/R$raw.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/ReviewCollectionActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/R$layout.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/R$style.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/GroupCompositionActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/ManageIndividualActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/BuildConfig.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/R.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/mongoose/ManagePacksActivity.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/starwisp/R$color.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/starwisp/R$string.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/starwisp/R$drawable.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/starwisp/R$id.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/starwisp/R$raw.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/starwisp/R$layout.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/starwisp/R$style.class \
+/home/dave/code/mongoose-2000/android/bin/classes/foam/starwisp/R.class \
+/home/dave/code/mongoose-2000/android/bin/dexedLibs/classes-ba923427811e32a2e5388830ffe39d17.jar \
+/home/dave/code/mongoose-2000/android/bin/dexedLibs/android-support-v7-gridlayout-d6cb52cfe77dfe7b42ec6d69a576dee5.jar \
+/home/dave/code/mongoose-2000/android/bin/dexedLibs/ouya-sdk-6f28e5ee942a0f2ab25bc6a51f78d35b.jar \
+/home/dave/code/mongoose-2000/android/bin/dexedLibs/android-support-v13-7224747ef056b5ee3b803aceed904ba6.jar \
diff --git a/android-old/bin/classes/foam/mongoose/BuildConfig.class b/android-old/bin/classes/foam/mongoose/BuildConfig.class
new file mode 100644
index 0000000..41228e3
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/BuildConfig.class differ
diff --git a/android-old/bin/classes/foam/mongoose/ExportActivity.class b/android-old/bin/classes/foam/mongoose/ExportActivity.class
new file mode 100644
index 0000000..ffd858e
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/ExportActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/GroupCompositionActivity.class b/android-old/bin/classes/foam/mongoose/GroupCompositionActivity.class
new file mode 100644
index 0000000..5c15337
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/GroupCompositionActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/GroupEventsActivity.class b/android-old/bin/classes/foam/mongoose/GroupEventsActivity.class
new file mode 100644
index 0000000..99c5972
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/GroupEventsActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/MainActivity.class b/android-old/bin/classes/foam/mongoose/MainActivity.class
new file mode 100644
index 0000000..41ad8a1
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/MainActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/ManageIndividualActivity.class b/android-old/bin/classes/foam/mongoose/ManageIndividualActivity.class
new file mode 100644
index 0000000..9d20b2b
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/ManageIndividualActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/ManagePacksActivity.class b/android-old/bin/classes/foam/mongoose/ManagePacksActivity.class
new file mode 100644
index 0000000..fcc11b2
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/ManagePacksActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/NewIndividualActivity.class b/android-old/bin/classes/foam/mongoose/NewIndividualActivity.class
new file mode 100644
index 0000000..5d39cec
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/NewIndividualActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/NewPackActivity.class b/android-old/bin/classes/foam/mongoose/NewPackActivity.class
new file mode 100644
index 0000000..cb7518d
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/NewPackActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/ObservationsActivity.class b/android-old/bin/classes/foam/mongoose/ObservationsActivity.class
new file mode 100644
index 0000000..b590f3f
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/ObservationsActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/PupFocalActivity.class b/android-old/bin/classes/foam/mongoose/PupFocalActivity.class
new file mode 100644
index 0000000..41c040c
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/PupFocalActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/PupFocalStartActivity.class b/android-old/bin/classes/foam/mongoose/PupFocalStartActivity.class
new file mode 100644
index 0000000..797ce6a
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/PupFocalStartActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/R$animator.class b/android-old/bin/classes/foam/mongoose/R$animator.class
new file mode 100644
index 0000000..c8960ed
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/R$animator.class differ
diff --git a/android-old/bin/classes/foam/mongoose/R$attr.class b/android-old/bin/classes/foam/mongoose/R$attr.class
new file mode 100644
index 0000000..c51f362
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/R$attr.class differ
diff --git a/android-old/bin/classes/foam/mongoose/R$color.class b/android-old/bin/classes/foam/mongoose/R$color.class
new file mode 100644
index 0000000..701071d
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/R$color.class differ
diff --git a/android-old/bin/classes/foam/mongoose/R$drawable.class b/android-old/bin/classes/foam/mongoose/R$drawable.class
new file mode 100644
index 0000000..193e0c1
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/R$drawable.class differ
diff --git a/android-old/bin/classes/foam/mongoose/R$id.class b/android-old/bin/classes/foam/mongoose/R$id.class
new file mode 100644
index 0000000..7c5a57a
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/R$id.class differ
diff --git a/android-old/bin/classes/foam/mongoose/R$layout.class b/android-old/bin/classes/foam/mongoose/R$layout.class
new file mode 100644
index 0000000..f6f58cf
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/R$layout.class differ
diff --git a/android-old/bin/classes/foam/mongoose/R$raw.class b/android-old/bin/classes/foam/mongoose/R$raw.class
new file mode 100644
index 0000000..09d5ab5
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/R$raw.class differ
diff --git a/android-old/bin/classes/foam/mongoose/R$string.class b/android-old/bin/classes/foam/mongoose/R$string.class
new file mode 100644
index 0000000..46dd29c
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/R$string.class differ
diff --git a/android-old/bin/classes/foam/mongoose/R$style.class b/android-old/bin/classes/foam/mongoose/R$style.class
new file mode 100644
index 0000000..113ed75
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/R$style.class differ
diff --git a/android-old/bin/classes/foam/mongoose/R.class b/android-old/bin/classes/foam/mongoose/R.class
new file mode 100644
index 0000000..f20af22
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/R.class differ
diff --git a/android-old/bin/classes/foam/mongoose/ReviewActivity.class b/android-old/bin/classes/foam/mongoose/ReviewActivity.class
new file mode 100644
index 0000000..153b50b
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/ReviewActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/ReviewCollectionActivity.class b/android-old/bin/classes/foam/mongoose/ReviewCollectionActivity.class
new file mode 100644
index 0000000..e2ef009
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/ReviewCollectionActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/ReviewItemActivity.class b/android-old/bin/classes/foam/mongoose/ReviewItemActivity.class
new file mode 100644
index 0000000..a00d37d
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/ReviewItemActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/SyncActivity.class b/android-old/bin/classes/foam/mongoose/SyncActivity.class
new file mode 100644
index 0000000..582963e
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/SyncActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/TagLocationActivity.class b/android-old/bin/classes/foam/mongoose/TagLocationActivity.class
new file mode 100644
index 0000000..5950b1a
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/TagLocationActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/UpdateIndividualActivity.class b/android-old/bin/classes/foam/mongoose/UpdateIndividualActivity.class
new file mode 100644
index 0000000..1542ed0
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/UpdateIndividualActivity.class differ
diff --git a/android-old/bin/classes/foam/mongoose/starwisp.class b/android-old/bin/classes/foam/mongoose/starwisp.class
new file mode 100644
index 0000000..cc25ad1
Binary files /dev/null and b/android-old/bin/classes/foam/mongoose/starwisp.class differ
diff --git a/android-old/bin/classes/foam/starwisp/R$color.class b/android-old/bin/classes/foam/starwisp/R$color.class
new file mode 100644
index 0000000..e7fb836
Binary files /dev/null and b/android-old/bin/classes/foam/starwisp/R$color.class differ
diff --git a/android-old/bin/classes/foam/starwisp/R$drawable.class b/android-old/bin/classes/foam/starwisp/R$drawable.class
new file mode 100644
index 0000000..8f8d079
Binary files /dev/null and b/android-old/bin/classes/foam/starwisp/R$drawable.class differ
diff --git a/android-old/bin/classes/foam/starwisp/R$id.class b/android-old/bin/classes/foam/starwisp/R$id.class
new file mode 100644
index 0000000..c51d089
Binary files /dev/null and b/android-old/bin/classes/foam/starwisp/R$id.class differ
diff --git a/android-old/bin/classes/foam/starwisp/R$layout.class b/android-old/bin/classes/foam/starwisp/R$layout.class
new file mode 100644
index 0000000..72fadf9
Binary files /dev/null and b/android-old/bin/classes/foam/starwisp/R$layout.class differ
diff --git a/android-old/bin/classes/foam/starwisp/R$raw.class b/android-old/bin/classes/foam/starwisp/R$raw.class
new file mode 100644
index 0000000..0485650
Binary files /dev/null and b/android-old/bin/classes/foam/starwisp/R$raw.class differ
diff --git a/android-old/bin/classes/foam/starwisp/R$string.class b/android-old/bin/classes/foam/starwisp/R$string.class
new file mode 100644
index 0000000..ddf0484
Binary files /dev/null and b/android-old/bin/classes/foam/starwisp/R$string.class differ
diff --git a/android-old/bin/classes/foam/starwisp/R$style.class b/android-old/bin/classes/foam/starwisp/R$style.class
new file mode 100644
index 0000000..8a85ce5
Binary files /dev/null and b/android-old/bin/classes/foam/starwisp/R$style.class differ
diff --git a/android-old/bin/classes/foam/starwisp/R.class b/android-old/bin/classes/foam/starwisp/R.class
new file mode 100644
index 0000000..04a2006
Binary files /dev/null and b/android-old/bin/classes/foam/starwisp/R.class differ
diff --git a/android-old/bin/dexedLibs/android-support-v13-7224747ef056b5ee3b803aceed904ba6.jar b/android-old/bin/dexedLibs/android-support-v13-7224747ef056b5ee3b803aceed904ba6.jar
new file mode 100644
index 0000000..998e3ad
Binary files /dev/null and b/android-old/bin/dexedLibs/android-support-v13-7224747ef056b5ee3b803aceed904ba6.jar differ
diff --git a/android-old/bin/dexedLibs/android-support-v7-gridlayout-d6cb52cfe77dfe7b42ec6d69a576dee5.jar b/android-old/bin/dexedLibs/android-support-v7-gridlayout-d6cb52cfe77dfe7b42ec6d69a576dee5.jar
new file mode 100644
index 0000000..0f12296
Binary files /dev/null and b/android-old/bin/dexedLibs/android-support-v7-gridlayout-d6cb52cfe77dfe7b42ec6d69a576dee5.jar differ
diff --git a/android-old/bin/dexedLibs/classes-ba923427811e32a2e5388830ffe39d17.jar b/android-old/bin/dexedLibs/classes-ba923427811e32a2e5388830ffe39d17.jar
new file mode 100644
index 0000000..dc0529a
Binary files /dev/null and b/android-old/bin/dexedLibs/classes-ba923427811e32a2e5388830ffe39d17.jar differ
diff --git a/android-old/bin/dexedLibs/ouya-sdk-6f28e5ee942a0f2ab25bc6a51f78d35b.jar b/android-old/bin/dexedLibs/ouya-sdk-6f28e5ee942a0f2ab25bc6a51f78d35b.jar
new file mode 100644
index 0000000..1c0adb0
Binary files /dev/null and b/android-old/bin/dexedLibs/ouya-sdk-6f28e5ee942a0f2ab25bc6a51f78d35b.jar differ
diff --git a/android-old/bin/jarlist.cache b/android-old/bin/jarlist.cache
new file mode 100644
index 0000000..0565465
--- /dev/null
+++ b/android-old/bin/jarlist.cache
@@ -0,0 +1,3 @@
+# cache for current jar dependency. DO NOT EDIT.
+# format is
+# Encoding is UTF-8
diff --git a/android-old/bin/mongoose-debug-unaligned.apk b/android-old/bin/mongoose-debug-unaligned.apk
new file mode 100644
index 0000000..e9c86a2
Binary files /dev/null and b/android-old/bin/mongoose-debug-unaligned.apk differ
diff --git a/android-old/bin/mongoose-debug-unaligned.apk.d b/android-old/bin/mongoose-debug-unaligned.apk.d
new file mode 100644
index 0000000..4f24530
--- /dev/null
+++ b/android-old/bin/mongoose-debug-unaligned.apk.d
@@ -0,0 +1,8 @@
+/home/dave/code/mongoose-2000/android/bin/mongoose-debug-unaligned.apk : \
+/home/dave/code/mongoose-2000/android/bin/mongoose.ap_ \
+/home/dave/code/mongoose-2000/android/bin/classes.dex \
+/home/dave/code/starwisp/bin/classes.jar \
+/home/dave/code/starwisp/libs/android-support-v7-gridlayout.jar \
+/home/dave/code/starwisp/libs/ouya-sdk.jar \
+/home/dave/code/starwisp/libs/android-support-v13.jar \
+/home/dave/code/starwisp/libs/armeabi/libstarwisp-core.so \
diff --git a/android-old/bin/mongoose-debug.apk b/android-old/bin/mongoose-debug.apk
new file mode 100644
index 0000000..3412cf2
Binary files /dev/null and b/android-old/bin/mongoose-debug.apk differ
diff --git a/android-old/bin/mongoose.ap_ b/android-old/bin/mongoose.ap_
new file mode 100644
index 0000000..fcb6970
Binary files /dev/null and b/android-old/bin/mongoose.ap_ differ
diff --git a/android-old/bin/mongoose.ap_.d b/android-old/bin/mongoose.ap_.d
new file mode 100644
index 0000000..95f9c20
--- /dev/null
+++ b/android-old/bin/mongoose.ap_.d
@@ -0,0 +1,167 @@
+/home/dave/code/mongoose-2000/android/bin/mongoose.ap_ \
+ : /home/dave/code/starwisp/res/drawable-xhdpi/ic_launcher.png \
+/home/dave/code/starwisp/res/raw/ping.wav \
+/home/dave/code/starwisp/res/raw/active.wav \
+/home/dave/code/starwisp/res/drawable-ldpi/ic_launcher.png \
+/home/dave/code/starwisp/res/layout/main.xml \
+/home/dave/code/starwisp/res/layout/debug_text.xml \
+/home/dave/code/starwisp/res/layout/toggle_button_maybe.xml \
+/home/dave/code/starwisp/res/layout/toggle_button_fancy.xml \
+/home/dave/code/starwisp/res/layout/toggle_button_no.xml \
+/home/dave/code/starwisp/res/layout/spinner_layout.xml \
+/home/dave/code/starwisp/res/layout/toggle_button_yes.xml \
+/home/dave/code/starwisp/res/layout/spinner_item.xml \
+/home/dave/code/starwisp/res/layout/main_fragment.xml \
+/home/dave/code/starwisp/res/drawable/seekprogress_fill.xml \
+/home/dave/code/starwisp/res/drawable/button_bg.xml \
+/home/dave/code/starwisp/res/drawable/yes_off.png \
+/home/dave/code/starwisp/res/drawable/seekbg_fill.xml \
+/home/dave/code/starwisp/res/drawable/swarmtoggledrawable_maybe.xml \
+/home/dave/code/starwisp/res/drawable/bg_style.xml \
+/home/dave/code/starwisp/res/drawable/tick.png \
+/home/dave/code/starwisp/res/drawable/arrow_right.png \
+/home/dave/code/starwisp/res/drawable/swarmtoggledrawable_no.xml \
+/home/dave/code/starwisp/res/drawable/bgpaw.png \
+/home/dave/code/starwisp/res/drawable/swarmtoggledrawable_yes.xml \
+/home/dave/code/starwisp/res/drawable/no_on.png \
+/home/dave/code/starwisp/res/drawable/button_style.xml \
+/home/dave/code/starwisp/res/drawable/draggable.xml \
+/home/dave/code/starwisp/res/drawable/maybe_on.png \
+/home/dave/code/starwisp/res/drawable/maybe_off.png \
+/home/dave/code/starwisp/res/drawable/image_button_style.xml \
+/home/dave/code/starwisp/res/drawable/seekthumb.xml \
+/home/dave/code/starwisp/res/drawable/yes_on.png \
+/home/dave/code/starwisp/res/drawable/swarmbutton.xml \
+/home/dave/code/starwisp/res/drawable/swarmspinner.xml \
+/home/dave/code/starwisp/res/drawable/button_bg2.xml \
+/home/dave/code/starwisp/res/drawable/swarmtoggledrawable.xml \
+/home/dave/code/starwisp/res/drawable/arrow_left.png \
+/home/dave/code/starwisp/res/drawable/no_off.png \
+/home/dave/code/starwisp/res/drawable/bg.png \
+/home/dave/code/starwisp/res/drawable/cross.png \
+/home/dave/code/starwisp/res/drawable/button.png \
+/home/dave/code/starwisp/res/drawable/swarmtoggle.xml \
+/home/dave/code/starwisp/res/drawable/seekprogress.xml \
+/home/dave/code/starwisp/res/values/strings.xml \
+/home/dave/code/starwisp/res/values/styles.xml \
+/home/dave/code/starwisp/res/drawable-mdpi/ic_launcher.png \
+/home/dave/code/starwisp/res/drawable-hdpi/ic_launcher.png \
+/home/dave/code/starwisp/bin/res/drawable-xhdpi/ic_launcher.png \
+/home/dave/code/starwisp/bin/res/drawable-ldpi/ic_launcher.png \
+/home/dave/code/starwisp/bin/res/drawable/yes_off.png \
+/home/dave/code/starwisp/bin/res/drawable/tick.png \
+/home/dave/code/starwisp/bin/res/drawable/arrow_right.png \
+/home/dave/code/starwisp/bin/res/drawable/bgpaw.png \
+/home/dave/code/starwisp/bin/res/drawable/no_on.png \
+/home/dave/code/starwisp/bin/res/drawable/maybe_on.png \
+/home/dave/code/starwisp/bin/res/drawable/maybe_off.png \
+/home/dave/code/starwisp/bin/res/drawable/yes_on.png \
+/home/dave/code/starwisp/bin/res/drawable/arrow_left.png \
+/home/dave/code/starwisp/bin/res/drawable/no_off.png \
+/home/dave/code/starwisp/bin/res/drawable/bg.png \
+/home/dave/code/starwisp/bin/res/drawable/cross.png \
+/home/dave/code/starwisp/bin/res/drawable/button.png \
+/home/dave/code/starwisp/bin/res/drawable-mdpi/ic_launcher.png \
+/home/dave/code/starwisp/bin/res/drawable-hdpi/ic_launcher.png \
+/home/dave/code/mongoose-2000/android/res/drawable-xhdpi/ic_launcher.png \
+/home/dave/code/mongoose-2000/android/res/raw/ping.wav \
+/home/dave/code/mongoose-2000/android/res/raw/active.wav \
+/home/dave/code/mongoose-2000/android/res/drawable-ldpi/ic_launcher.png \
+/home/dave/code/mongoose-2000/android/res/layout/main.xml \
+/home/dave/code/mongoose-2000/android/res/layout/debug_text.xml \
+/home/dave/code/mongoose-2000/android/res/layout/toggle_button_maybe.xml \
+/home/dave/code/mongoose-2000/android/res/layout/toggle_button_fancy.xml \
+/home/dave/code/mongoose-2000/android/res/layout/toggle_button_no.xml \
+/home/dave/code/mongoose-2000/android/res/layout/spinner_layout.xml \
+/home/dave/code/mongoose-2000/android/res/layout/toggle_button_yes.xml \
+/home/dave/code/mongoose-2000/android/res/layout/spinner_item.xml \
+/home/dave/code/mongoose-2000/android/res/layout/main_fragment.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/seekprogress_fill.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/logo.png \
+/home/dave/code/mongoose-2000/android/res/drawable/yes_off.png \
+/home/dave/code/mongoose-2000/android/res/drawable/seekbg_fill.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/swarmtoggledrawable_maybe.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/bg_style.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/tick.png \
+/home/dave/code/mongoose-2000/android/res/drawable/arrow_right.png \
+/home/dave/code/mongoose-2000/android/res/drawable/swarmtoggledrawable_no.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/bgpaw.png \
+/home/dave/code/mongoose-2000/android/res/drawable/swarmtoggledrawable_yes.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/no_on.png \
+/home/dave/code/mongoose-2000/android/res/drawable/maybe_on.png \
+/home/dave/code/mongoose-2000/android/res/drawable/maybe_off.png \
+/home/dave/code/mongoose-2000/android/res/drawable/seekthumb.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/yes_on.png \
+/home/dave/code/mongoose-2000/android/res/drawable/swarmbutton.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/swarmspinner.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/swarmtoggledrawable.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/arrow_left.png \
+/home/dave/code/mongoose-2000/android/res/drawable/mongooses.png \
+/home/dave/code/mongoose-2000/android/res/drawable/no_off.png \
+/home/dave/code/mongoose-2000/android/res/drawable/bg.png \
+/home/dave/code/mongoose-2000/android/res/drawable/cross.png \
+/home/dave/code/mongoose-2000/android/res/drawable/swarmtoggle.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/seekprogress.xml \
+/home/dave/code/mongoose-2000/android/res/values/strings.xml \
+/home/dave/code/mongoose-2000/android/res/values/styles.xml \
+/home/dave/code/mongoose-2000/android/res/drawable-mdpi/ic_launcher.png \
+/home/dave/code/mongoose-2000/android/res/drawable-hdpi/ic_launcher.png \
+/home/dave/code/mongoose-2000/android/res/animator/card_flip_right_in.xml \
+/home/dave/code/mongoose-2000/android/res/animator/card_flip_right_out.xml \
+/home/dave/code/mongoose-2000/android/res/animator/card_flip_left_out.xml \
+/home/dave/code/mongoose-2000/android/res/animator/card_flip_left_in.xml \
+/home/dave/code/mongoose-2000/android/bin/res/drawable-xhdpi/ic_launcher.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable-ldpi/ic_launcher.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable/logo.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable/yes_off.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable/tick.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable/arrow_right.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable/bgpaw.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable/no_on.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable/maybe_on.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable/maybe_off.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable/yes_on.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable/arrow_left.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable/mongooses.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable/no_off.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable/bg.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable/cross.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable-mdpi/ic_launcher.png \
+/home/dave/code/mongoose-2000/android/bin/res/drawable-hdpi/ic_launcher.png \
+/home/dave/code/mongoose-2000/android/assets/lib.scm \
+/home/dave/code/mongoose-2000/android/assets/starwisp.scm \
+/home/dave/code/mongoose-2000/android/assets/#group-comp.scm# \
+/home/dave/code/mongoose-2000/android/assets/#dbsync.scm# \
+/home/dave/code/mongoose-2000/android/assets/pup-focal.scm \
+/home/dave/code/mongoose-2000/android/assets/dbsync.scm \
+/home/dave/code/mongoose-2000/android/assets/fonts \
+/home/dave/code/mongoose-2000/android/assets/group-events.scm \
+/home/dave/code/mongoose-2000/android/assets/json.scm \
+/home/dave/code/mongoose-2000/android/assets/racket-fix.scm \
+/home/dave/code/mongoose-2000/android/assets/eavdb.scm \
+/home/dave/code/mongoose-2000/android/assets/oestrus-focal.scm \
+/home/dave/code/mongoose-2000/android/assets/mongoose.scm \
+/home/dave/code/mongoose-2000/android/assets/test.scm \
+/home/dave/code/mongoose-2000/android/assets/unit-tests.scm \
+/home/dave/code/mongoose-2000/android/assets/eavdb \
+/home/dave/code/mongoose-2000/android/assets/translations.scm \
+/home/dave/code/mongoose-2000/android/assets/group-comp.scm \
+/home/dave/code/mongoose-2000/android/assets/init.scm \
+/home/dave/code/mongoose-2000/android/assets/preg-focal.scm \
+/home/dave/code/mongoose-2000/android/assets/testing.scm \
+/home/dave/code/mongoose-2000/android/assets/fonts/grstylus.ttf \
+/home/dave/code/mongoose-2000/android/assets/fonts/starwisp.ttf \
+/home/dave/code/mongoose-2000/android/assets/fonts/grobold.ttf \
+/home/dave/code/mongoose-2000/android/assets/fonts/Pfennig.ttf \
+/home/dave/code/mongoose-2000/android/assets/eavdb/entity-update.ss \
+/home/dave/code/mongoose-2000/android/assets/eavdb/entity-csv.ss \
+/home/dave/code/mongoose-2000/android/assets/eavdb/entity-sync.ss \
+/home/dave/code/mongoose-2000/android/assets/eavdb/entity-filter.ss \
+/home/dave/code/mongoose-2000/android/assets/eavdb/entity-get.ss \
+/home/dave/code/mongoose-2000/android/assets/eavdb/entity-values.ss \
+/home/dave/code/mongoose-2000/android/assets/eavdb/ktv.ss \
+/home/dave/code/mongoose-2000/android/assets/eavdb/ktv-list.ss \
+/home/dave/code/mongoose-2000/android/assets/eavdb/android-sync.ss \
+/home/dave/code/mongoose-2000/android/assets/eavdb/eavdb.ss \
+/home/dave/code/mongoose-2000/android/assets/eavdb/entity-insert.ss \
+/home/dave/code/mongoose-2000/android/bin/AndroidManifest.xml \
diff --git a/android-old/bin/proguard.txt b/android-old/bin/proguard.txt
new file mode 100644
index 0000000..51d146c
--- /dev/null
+++ b/android-old/bin/proguard.txt
@@ -0,0 +1,51 @@
+# view AndroidManifest.xml #generated:34
+-keep class foam.mongoose.ExportActivity { (...); }
+
+# view AndroidManifest.xml #generated:22
+-keep class foam.mongoose.GroupCompositionActivity { (...); }
+
+# view AndroidManifest.xml #generated:25
+-keep class foam.mongoose.GroupEventsActivity { (...); }
+
+# view AndroidManifest.xml #generated:29
+-keep class foam.mongoose.ManageIndividualActivity { (...); }
+
+# view AndroidManifest.xml #generated:27
+-keep class foam.mongoose.ManagePacksActivity { (...); }
+
+# view AndroidManifest.xml #generated:30
+-keep class foam.mongoose.NewIndividualActivity { (...); }
+
+# view AndroidManifest.xml #generated:28
+-keep class foam.mongoose.NewPackActivity { (...); }
+
+# view AndroidManifest.xml #generated:20
+-keep class foam.mongoose.ObservationsActivity { (...); }
+
+# view AndroidManifest.xml #generated:24
+-keep class foam.mongoose.PupFocalActivity { (...); }
+
+# view AndroidManifest.xml #generated:23
+-keep class foam.mongoose.PupFocalStartActivity { (...); }
+
+# view AndroidManifest.xml #generated:35
+-keep class foam.mongoose.ReviewActivity { (...); }
+
+# view AndroidManifest.xml #generated:37
+-keep class foam.mongoose.ReviewCollectionActivity { (...); }
+
+# view AndroidManifest.xml #generated:36
+-keep class foam.mongoose.ReviewItemActivity { (...); }
+
+# view AndroidManifest.xml #generated:33
+-keep class foam.mongoose.SyncActivity { (...); }
+
+# view AndroidManifest.xml #generated:32
+-keep class foam.mongoose.TagLocationActivity { (...); }
+
+# view AndroidManifest.xml #generated:31
+-keep class foam.mongoose.UpdateIndividualActivity { (...); }
+
+# view AndroidManifest.xml #generated:12
+-keep class foam.mongoose.starwisp { (...); }
+
diff --git a/android-old/bin/res/drawable-hdpi/ic_launcher.png b/android-old/bin/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..bcfa058
Binary files /dev/null and b/android-old/bin/res/drawable-hdpi/ic_launcher.png differ
diff --git a/android-old/bin/res/drawable-ldpi/ic_launcher.png b/android-old/bin/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000..dd7c05b
Binary files /dev/null and b/android-old/bin/res/drawable-ldpi/ic_launcher.png differ
diff --git a/android-old/bin/res/drawable-mdpi/ic_launcher.png b/android-old/bin/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..85848ff
Binary files /dev/null and b/android-old/bin/res/drawable-mdpi/ic_launcher.png differ
diff --git a/android-old/bin/res/drawable-xhdpi/ic_launcher.png b/android-old/bin/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..916901e
Binary files /dev/null and b/android-old/bin/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/android-old/bin/res/drawable/arrow_left.png b/android-old/bin/res/drawable/arrow_left.png
new file mode 100644
index 0000000..a170670
Binary files /dev/null and b/android-old/bin/res/drawable/arrow_left.png differ
diff --git a/android-old/bin/res/drawable/arrow_right.png b/android-old/bin/res/drawable/arrow_right.png
new file mode 100644
index 0000000..d0ff632
Binary files /dev/null and b/android-old/bin/res/drawable/arrow_right.png differ
diff --git a/android-old/bin/res/drawable/bg.png b/android-old/bin/res/drawable/bg.png
new file mode 100644
index 0000000..3eec211
Binary files /dev/null and b/android-old/bin/res/drawable/bg.png differ
diff --git a/android-old/bin/res/drawable/bgpaw.png b/android-old/bin/res/drawable/bgpaw.png
new file mode 100644
index 0000000..ac4fe71
Binary files /dev/null and b/android-old/bin/res/drawable/bgpaw.png differ
diff --git a/android-old/bin/res/drawable/cross.png b/android-old/bin/res/drawable/cross.png
new file mode 100644
index 0000000..d0b4732
Binary files /dev/null and b/android-old/bin/res/drawable/cross.png differ
diff --git a/android-old/bin/res/drawable/logo.png b/android-old/bin/res/drawable/logo.png
new file mode 100644
index 0000000..ccc35ee
Binary files /dev/null and b/android-old/bin/res/drawable/logo.png differ
diff --git a/android-old/bin/res/drawable/maybe_off.png b/android-old/bin/res/drawable/maybe_off.png
new file mode 100644
index 0000000..c7908cd
Binary files /dev/null and b/android-old/bin/res/drawable/maybe_off.png differ
diff --git a/android-old/bin/res/drawable/maybe_on.png b/android-old/bin/res/drawable/maybe_on.png
new file mode 100644
index 0000000..302673f
Binary files /dev/null and b/android-old/bin/res/drawable/maybe_on.png differ
diff --git a/android-old/bin/res/drawable/mongooses.png b/android-old/bin/res/drawable/mongooses.png
new file mode 100644
index 0000000..f393cf3
Binary files /dev/null and b/android-old/bin/res/drawable/mongooses.png differ
diff --git a/android-old/bin/res/drawable/no_off.png b/android-old/bin/res/drawable/no_off.png
new file mode 100644
index 0000000..238d49b
Binary files /dev/null and b/android-old/bin/res/drawable/no_off.png differ
diff --git a/android-old/bin/res/drawable/no_on.png b/android-old/bin/res/drawable/no_on.png
new file mode 100644
index 0000000..f3fbbdb
Binary files /dev/null and b/android-old/bin/res/drawable/no_on.png differ
diff --git a/android-old/bin/res/drawable/tick.png b/android-old/bin/res/drawable/tick.png
new file mode 100644
index 0000000..7a55c54
Binary files /dev/null and b/android-old/bin/res/drawable/tick.png differ
diff --git a/android-old/bin/res/drawable/yes_off.png b/android-old/bin/res/drawable/yes_off.png
new file mode 100644
index 0000000..f415bc8
Binary files /dev/null and b/android-old/bin/res/drawable/yes_off.png differ
diff --git a/android-old/bin/res/drawable/yes_on.png b/android-old/bin/res/drawable/yes_on.png
new file mode 100644
index 0000000..01739d8
Binary files /dev/null and b/android-old/bin/res/drawable/yes_on.png differ
diff --git a/android/build.xml b/android-old/build.xml
similarity index 100%
rename from android/build.xml
rename to android-old/build.xml
diff --git a/android-old/gen/R.java.d b/android-old/gen/R.java.d
new file mode 100644
index 0000000..bba73c8
--- /dev/null
+++ b/android-old/gen/R.java.d
@@ -0,0 +1,113 @@
+/home/dave/code/mongoose-2000/android/gen/foam/mongoose/R.java \
+ : /home/dave/code/starwisp/res/drawable-xhdpi/ic_launcher.png \
+/home/dave/code/starwisp/res/raw/ping.wav \
+/home/dave/code/starwisp/res/raw/active.wav \
+/home/dave/code/starwisp/res/drawable-ldpi/ic_launcher.png \
+/home/dave/code/starwisp/res/layout/main.xml \
+/home/dave/code/starwisp/res/layout/debug_text.xml \
+/home/dave/code/starwisp/res/layout/toggle_button_maybe.xml \
+/home/dave/code/starwisp/res/layout/toggle_button_fancy.xml \
+/home/dave/code/starwisp/res/layout/toggle_button_no.xml \
+/home/dave/code/starwisp/res/layout/spinner_layout.xml \
+/home/dave/code/starwisp/res/layout/toggle_button_yes.xml \
+/home/dave/code/starwisp/res/layout/spinner_item.xml \
+/home/dave/code/starwisp/res/layout/main_fragment.xml \
+/home/dave/code/starwisp/res/drawable/seekprogress_fill.xml \
+/home/dave/code/starwisp/res/drawable/button_bg.xml \
+/home/dave/code/starwisp/res/drawable/yes_off.png \
+/home/dave/code/starwisp/res/drawable/seekbg_fill.xml \
+/home/dave/code/starwisp/res/drawable/swarmtoggledrawable_maybe.xml \
+/home/dave/code/starwisp/res/drawable/bg_style.xml \
+/home/dave/code/starwisp/res/drawable/tick.png \
+/home/dave/code/starwisp/res/drawable/arrow_right.png \
+/home/dave/code/starwisp/res/drawable/swarmtoggledrawable_no.xml \
+/home/dave/code/starwisp/res/drawable/bgpaw.png \
+/home/dave/code/starwisp/res/drawable/swarmtoggledrawable_yes.xml \
+/home/dave/code/starwisp/res/drawable/no_on.png \
+/home/dave/code/starwisp/res/drawable/button_style.xml \
+/home/dave/code/starwisp/res/drawable/draggable.xml \
+/home/dave/code/starwisp/res/drawable/maybe_on.png \
+/home/dave/code/starwisp/res/drawable/maybe_off.png \
+/home/dave/code/starwisp/res/drawable/image_button_style.xml \
+/home/dave/code/starwisp/res/drawable/seekthumb.xml \
+/home/dave/code/starwisp/res/drawable/yes_on.png \
+/home/dave/code/starwisp/res/drawable/swarmbutton.xml \
+/home/dave/code/starwisp/res/drawable/swarmspinner.xml \
+/home/dave/code/starwisp/res/drawable/button_bg2.xml \
+/home/dave/code/starwisp/res/drawable/swarmtoggledrawable.xml \
+/home/dave/code/starwisp/res/drawable/arrow_left.png \
+/home/dave/code/starwisp/res/drawable/no_off.png \
+/home/dave/code/starwisp/res/drawable/bg.png \
+/home/dave/code/starwisp/res/drawable/cross.png \
+/home/dave/code/starwisp/res/drawable/button.png \
+/home/dave/code/starwisp/res/drawable/swarmtoggle.xml \
+/home/dave/code/starwisp/res/drawable/seekprogress.xml \
+/home/dave/code/starwisp/res/values/strings.xml \
+/home/dave/code/starwisp/res/values/styles.xml \
+/home/dave/code/starwisp/res/drawable-mdpi/ic_launcher.png \
+/home/dave/code/starwisp/res/drawable-hdpi/ic_launcher.png \
+/home/dave/code/starwisp/bin/res/drawable-xhdpi/ic_launcher.png \
+/home/dave/code/starwisp/bin/res/drawable-ldpi/ic_launcher.png \
+/home/dave/code/starwisp/bin/res/drawable/yes_off.png \
+/home/dave/code/starwisp/bin/res/drawable/tick.png \
+/home/dave/code/starwisp/bin/res/drawable/arrow_right.png \
+/home/dave/code/starwisp/bin/res/drawable/bgpaw.png \
+/home/dave/code/starwisp/bin/res/drawable/no_on.png \
+/home/dave/code/starwisp/bin/res/drawable/maybe_on.png \
+/home/dave/code/starwisp/bin/res/drawable/maybe_off.png \
+/home/dave/code/starwisp/bin/res/drawable/yes_on.png \
+/home/dave/code/starwisp/bin/res/drawable/arrow_left.png \
+/home/dave/code/starwisp/bin/res/drawable/no_off.png \
+/home/dave/code/starwisp/bin/res/drawable/bg.png \
+/home/dave/code/starwisp/bin/res/drawable/cross.png \
+/home/dave/code/starwisp/bin/res/drawable/button.png \
+/home/dave/code/starwisp/bin/res/drawable-mdpi/ic_launcher.png \
+/home/dave/code/starwisp/bin/res/drawable-hdpi/ic_launcher.png \
+/home/dave/code/mongoose-2000/android/res/drawable-xhdpi/ic_launcher.png \
+/home/dave/code/mongoose-2000/android/res/raw/ping.wav \
+/home/dave/code/mongoose-2000/android/res/raw/active.wav \
+/home/dave/code/mongoose-2000/android/res/drawable-ldpi/ic_launcher.png \
+/home/dave/code/mongoose-2000/android/res/layout/main.xml \
+/home/dave/code/mongoose-2000/android/res/layout/debug_text.xml \
+/home/dave/code/mongoose-2000/android/res/layout/toggle_button_maybe.xml \
+/home/dave/code/mongoose-2000/android/res/layout/toggle_button_fancy.xml \
+/home/dave/code/mongoose-2000/android/res/layout/toggle_button_no.xml \
+/home/dave/code/mongoose-2000/android/res/layout/spinner_layout.xml \
+/home/dave/code/mongoose-2000/android/res/layout/toggle_button_yes.xml \
+/home/dave/code/mongoose-2000/android/res/layout/spinner_item.xml \
+/home/dave/code/mongoose-2000/android/res/layout/main_fragment.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/seekprogress_fill.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/logo.png \
+/home/dave/code/mongoose-2000/android/res/drawable/yes_off.png \
+/home/dave/code/mongoose-2000/android/res/drawable/seekbg_fill.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/swarmtoggledrawable_maybe.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/bg_style.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/tick.png \
+/home/dave/code/mongoose-2000/android/res/drawable/arrow_right.png \
+/home/dave/code/mongoose-2000/android/res/drawable/swarmtoggledrawable_no.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/bgpaw.png \
+/home/dave/code/mongoose-2000/android/res/drawable/swarmtoggledrawable_yes.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/no_on.png \
+/home/dave/code/mongoose-2000/android/res/drawable/maybe_on.png \
+/home/dave/code/mongoose-2000/android/res/drawable/maybe_off.png \
+/home/dave/code/mongoose-2000/android/res/drawable/seekthumb.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/yes_on.png \
+/home/dave/code/mongoose-2000/android/res/drawable/swarmbutton.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/swarmspinner.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/swarmtoggledrawable.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/arrow_left.png \
+/home/dave/code/mongoose-2000/android/res/drawable/mongooses.png \
+/home/dave/code/mongoose-2000/android/res/drawable/no_off.png \
+/home/dave/code/mongoose-2000/android/res/drawable/bg.png \
+/home/dave/code/mongoose-2000/android/res/drawable/cross.png \
+/home/dave/code/mongoose-2000/android/res/drawable/swarmtoggle.xml \
+/home/dave/code/mongoose-2000/android/res/drawable/seekprogress.xml \
+/home/dave/code/mongoose-2000/android/res/values/strings.xml \
+/home/dave/code/mongoose-2000/android/res/values/styles.xml \
+/home/dave/code/mongoose-2000/android/res/drawable-mdpi/ic_launcher.png \
+/home/dave/code/mongoose-2000/android/res/drawable-hdpi/ic_launcher.png \
+/home/dave/code/mongoose-2000/android/res/animator/card_flip_right_in.xml \
+/home/dave/code/mongoose-2000/android/res/animator/card_flip_right_out.xml \
+/home/dave/code/mongoose-2000/android/res/animator/card_flip_left_out.xml \
+/home/dave/code/mongoose-2000/android/res/animator/card_flip_left_in.xml \
+/home/dave/code/mongoose-2000/android/bin/AndroidManifest.xml \
diff --git a/android-old/gen/foam/mongoose/BuildConfig.java b/android-old/gen/foam/mongoose/BuildConfig.java
new file mode 100644
index 0000000..d1eb5ca
--- /dev/null
+++ b/android-old/gen/foam/mongoose/BuildConfig.java
@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package foam.mongoose;
+
+public final class BuildConfig {
+ public final static boolean DEBUG = true;
+}
\ No newline at end of file
diff --git a/android-old/gen/foam/mongoose/R.java b/android-old/gen/foam/mongoose/R.java
new file mode 100644
index 0000000..a6c474b
--- /dev/null
+++ b/android-old/gen/foam/mongoose/R.java
@@ -0,0 +1,95 @@
+/* AUTO-GENERATED FILE. DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found. It
+ * should not be modified by hand.
+ */
+
+package foam.mongoose;
+
+public final class R {
+ public static final class animator {
+ public static final int card_flip_left_in=0x7f040000;
+ public static final int card_flip_left_out=0x7f040001;
+ public static final int card_flip_right_in=0x7f040002;
+ public static final int card_flip_right_out=0x7f040003;
+ }
+ public static final class attr {
+ }
+ public static final class color {
+ public static final int bg=0x7f070000;
+ public static final int buttonbg=0x7f070002;
+ public static final int text=0x7f070001;
+ }
+ public static final class drawable {
+ public static final int arrow_left=0x7f020000;
+ public static final int arrow_right=0x7f020001;
+ public static final int bg=0x7f020002;
+ public static final int bg_style=0x7f020003;
+ public static final int bgpaw=0x7f020004;
+ public static final int button=0x7f020005;
+ public static final int button_bg=0x7f020006;
+ public static final int button_bg2=0x7f020007;
+ public static final int button_style=0x7f020008;
+ public static final int cross=0x7f020009;
+ public static final int draggable=0x7f02000a;
+ public static final int ic_launcher=0x7f02000b;
+ public static final int image_button_style=0x7f02000c;
+ public static final int logo=0x7f02000d;
+ public static final int maybe_off=0x7f02000e;
+ public static final int maybe_on=0x7f02000f;
+ public static final int mongooses=0x7f020010;
+ public static final int no_off=0x7f020011;
+ public static final int no_on=0x7f020012;
+ public static final int seekbg_fill=0x7f020013;
+ public static final int seekprogress=0x7f020014;
+ public static final int seekprogress_fill=0x7f020015;
+ public static final int seekthumb=0x7f020016;
+ public static final int swarmbutton=0x7f020017;
+ public static final int swarmspinner=0x7f020018;
+ public static final int swarmtoggle=0x7f020019;
+ public static final int swarmtoggledrawable=0x7f02001a;
+ public static final int swarmtoggledrawable_maybe=0x7f02001b;
+ public static final int swarmtoggledrawable_no=0x7f02001c;
+ public static final int swarmtoggledrawable_yes=0x7f02001d;
+ public static final int tick=0x7f02001e;
+ public static final int yes_off=0x7f02001f;
+ public static final int yes_on=0x7f020020;
+ }
+ public static final class id {
+ public static final int inner_fragment=0x7f090001;
+ public static final int main=0x7f090000;
+ public static final int spinnerTarget=0x7f090003;
+ public static final int standard_spinner_format=0x7f090002;
+ }
+ public static final class layout {
+ public static final int debug_text=0x7f030000;
+ public static final int main=0x7f030001;
+ public static final int main_fragment=0x7f030002;
+ public static final int spinner_item=0x7f030003;
+ public static final int spinner_layout=0x7f030004;
+ public static final int toggle_button_fancy=0x7f030005;
+ public static final int toggle_button_maybe=0x7f030006;
+ public static final int toggle_button_no=0x7f030007;
+ public static final int toggle_button_yes=0x7f030008;
+ }
+ public static final class raw {
+ public static final int active=0x7f050000;
+ public static final int ping=0x7f050001;
+ }
+ public static final class string {
+ public static final int app_name=0x7f060000;
+ }
+ public static final class style {
+ public static final int StarwispButton=0x7f080000;
+ public static final int StarwispFancyToggleButton=0x7f080001;
+ public static final int StarwispMaybeToggleButton=0x7f080003;
+ public static final int StarwispNoToggleButton=0x7f080004;
+ public static final int StarwispSeekBar=0x7f080008;
+ public static final int StarwispSpinner=0x7f080007;
+ public static final int StarwispSpinnerItem=0x7f080005;
+ public static final int StarwispTextAppearanceSpinnerItem=0x7f080006;
+ public static final int StarwispTheme=0x7f080009;
+ public static final int StarwispYesToggleButton=0x7f080002;
+ }
+}
diff --git a/android-old/gen/foam/starwisp/R.java b/android-old/gen/foam/starwisp/R.java
new file mode 100644
index 0000000..1cca4b4
--- /dev/null
+++ b/android-old/gen/foam/starwisp/R.java
@@ -0,0 +1,84 @@
+/* AUTO-GENERATED FILE. DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found. It
+ * should not be modified by hand.
+ */
+package foam.starwisp;
+
+public final class R {
+ public static final class color {
+ public static final int bg = 0x7f070000;
+ public static final int buttonbg = 0x7f070002;
+ public static final int text = 0x7f070001;
+ }
+ public static final class drawable {
+ public static final int arrow_left = 0x7f020000;
+ public static final int arrow_right = 0x7f020001;
+ public static final int bg = 0x7f020002;
+ public static final int bg_style = 0x7f020003;
+ public static final int bgpaw = 0x7f020004;
+ public static final int button = 0x7f020005;
+ public static final int button_bg = 0x7f020006;
+ public static final int button_bg2 = 0x7f020007;
+ public static final int button_style = 0x7f020008;
+ public static final int cross = 0x7f020009;
+ public static final int draggable = 0x7f02000a;
+ public static final int ic_launcher = 0x7f02000b;
+ public static final int image_button_style = 0x7f02000c;
+ public static final int maybe_off = 0x7f02000e;
+ public static final int maybe_on = 0x7f02000f;
+ public static final int no_off = 0x7f020011;
+ public static final int no_on = 0x7f020012;
+ public static final int seekbg_fill = 0x7f020013;
+ public static final int seekprogress = 0x7f020014;
+ public static final int seekprogress_fill = 0x7f020015;
+ public static final int seekthumb = 0x7f020016;
+ public static final int swarmbutton = 0x7f020017;
+ public static final int swarmspinner = 0x7f020018;
+ public static final int swarmtoggle = 0x7f020019;
+ public static final int swarmtoggledrawable = 0x7f02001a;
+ public static final int swarmtoggledrawable_maybe = 0x7f02001b;
+ public static final int swarmtoggledrawable_no = 0x7f02001c;
+ public static final int swarmtoggledrawable_yes = 0x7f02001d;
+ public static final int tick = 0x7f02001e;
+ public static final int yes_off = 0x7f02001f;
+ public static final int yes_on = 0x7f020020;
+ }
+ public static final class id {
+ public static final int inner_fragment = 0x7f090001;
+ public static final int main = 0x7f090000;
+ public static final int spinnerTarget = 0x7f090003;
+ public static final int standard_spinner_format = 0x7f090002;
+ }
+ public static final class layout {
+ public static final int debug_text = 0x7f030000;
+ public static final int main = 0x7f030001;
+ public static final int main_fragment = 0x7f030002;
+ public static final int spinner_item = 0x7f030003;
+ public static final int spinner_layout = 0x7f030004;
+ public static final int toggle_button_fancy = 0x7f030005;
+ public static final int toggle_button_maybe = 0x7f030006;
+ public static final int toggle_button_no = 0x7f030007;
+ public static final int toggle_button_yes = 0x7f030008;
+ }
+ public static final class raw {
+ public static final int active = 0x7f050000;
+ public static final int ping = 0x7f050001;
+ }
+ public static final class string {
+ public static final int app_name = 0x7f060000;
+ }
+ public static final class style {
+ public static final int StarwispButton = 0x7f080000;
+ public static final int StarwispFancyToggleButton = 0x7f080001;
+ public static final int StarwispMaybeToggleButton = 0x7f080003;
+ public static final int StarwispNoToggleButton = 0x7f080004;
+ public static final int StarwispSeekBar = 0x7f080008;
+ public static final int StarwispSpinner = 0x7f080007;
+ public static final int StarwispSpinnerItem = 0x7f080005;
+ public static final int StarwispTextAppearanceSpinnerItem = 0x7f080006;
+ public static final int StarwispTheme = 0x7f080009;
+ public static final int StarwispYesToggleButton = 0x7f080002;
+ }
+}
diff --git a/android-old/jellyfish-log.txt b/android-old/jellyfish-log.txt
new file mode 100644
index 0000000..d2049f5
--- /dev/null
+++ b/android-old/jellyfish-log.txt
@@ -0,0 +1,17 @@
+TESTING FILTER URI CHARS
+1234
+1234
+1234
+1234
+hello from eavdb.ss
+dbsync.scm
+suck ent
+build-dirty defined...
+on-start
+setting up database
+setting up tables
+db setup
+db setup
+db setup
+(1) : duplicate column name: version
+on-start 2
diff --git a/android-old/local-mongoose.db b/android-old/local-mongoose.db
new file mode 100644
index 0000000..df6a35e
Binary files /dev/null and b/android-old/local-mongoose.db differ
diff --git a/android/local.properties b/android-old/local.properties
similarity index 100%
rename from android/local.properties
rename to android-old/local.properties
diff --git a/android-old/mongoose-2.0-release.apk b/android-old/mongoose-2.0-release.apk
new file mode 100644
index 0000000..2799460
Binary files /dev/null and b/android-old/mongoose-2.0-release.apk differ
diff --git a/android/proguard-project.txt b/android-old/proguard-project.txt
similarity index 100%
rename from android/proguard-project.txt
rename to android-old/proguard-project.txt
diff --git a/android/project.properties b/android-old/project.properties
similarity index 100%
rename from android/project.properties
rename to android-old/project.properties
diff --git a/android/assets/dbsync.scm b/app-src/assets/dbsync.scm
similarity index 100%
rename from android/assets/dbsync.scm
rename to app-src/assets/dbsync.scm
diff --git a/android/assets/eavdb.scm b/app-src/assets/eavdb.scm
similarity index 100%
rename from android/assets/eavdb.scm
rename to app-src/assets/eavdb.scm
diff --git a/android/assets/fonts/Pfennig.ttf b/app-src/assets/fonts/Pfennig.ttf
similarity index 100%
rename from android/assets/fonts/Pfennig.ttf
rename to app-src/assets/fonts/Pfennig.ttf
diff --git a/android/assets/fonts/grobold.ttf b/app-src/assets/fonts/grobold.ttf
similarity index 100%
rename from android/assets/fonts/grobold.ttf
rename to app-src/assets/fonts/grobold.ttf
diff --git a/android/assets/fonts/grstylus.ttf b/app-src/assets/fonts/grstylus.ttf
similarity index 100%
rename from android/assets/fonts/grstylus.ttf
rename to app-src/assets/fonts/grstylus.ttf
diff --git a/android/assets/fonts/starwisp.ttf b/app-src/assets/fonts/starwisp.ttf
similarity index 100%
rename from android/assets/fonts/starwisp.ttf
rename to app-src/assets/fonts/starwisp.ttf
diff --git a/android/assets/group-comp.scm b/app-src/assets/group-comp.scm
similarity index 100%
rename from android/assets/group-comp.scm
rename to app-src/assets/group-comp.scm
diff --git a/android/assets/group-events.scm b/app-src/assets/group-events.scm
similarity index 100%
rename from android/assets/group-events.scm
rename to app-src/assets/group-events.scm
diff --git a/android/assets/init.scm b/app-src/assets/init.scm
similarity index 100%
rename from android/assets/init.scm
rename to app-src/assets/init.scm
diff --git a/android/assets/json.scm b/app-src/assets/json.scm
similarity index 100%
rename from android/assets/json.scm
rename to app-src/assets/json.scm
diff --git a/android/assets/lib.scm b/app-src/assets/lib.scm
similarity index 100%
rename from android/assets/lib.scm
rename to app-src/assets/lib.scm
diff --git a/android/assets/mongoose.scm b/app-src/assets/mongoose.scm
similarity index 100%
rename from android/assets/mongoose.scm
rename to app-src/assets/mongoose.scm
diff --git a/android/assets/oestrus-focal.scm b/app-src/assets/oestrus-focal.scm
similarity index 100%
rename from android/assets/oestrus-focal.scm
rename to app-src/assets/oestrus-focal.scm
diff --git a/android/assets/preg-focal.scm b/app-src/assets/preg-focal.scm
similarity index 100%
rename from android/assets/preg-focal.scm
rename to app-src/assets/preg-focal.scm
diff --git a/android/assets/pup-focal.scm b/app-src/assets/pup-focal.scm
similarity index 100%
rename from android/assets/pup-focal.scm
rename to app-src/assets/pup-focal.scm
diff --git a/android/assets/racket-fix.scm b/app-src/assets/racket-fix.scm
similarity index 100%
rename from android/assets/racket-fix.scm
rename to app-src/assets/racket-fix.scm
diff --git a/android/assets/starwisp.scm b/app-src/assets/starwisp.scm
similarity index 100%
rename from android/assets/starwisp.scm
rename to app-src/assets/starwisp.scm
diff --git a/android/assets/test.scm b/app-src/assets/test.scm
similarity index 100%
rename from android/assets/test.scm
rename to app-src/assets/test.scm
diff --git a/android/assets/testing.scm b/app-src/assets/testing.scm
similarity index 100%
rename from android/assets/testing.scm
rename to app-src/assets/testing.scm
diff --git a/android/assets/translations.scm b/app-src/assets/translations.scm
similarity index 100%
rename from android/assets/translations.scm
rename to app-src/assets/translations.scm
diff --git a/android/assets/unit-tests.scm b/app-src/assets/unit-tests.scm
similarity index 100%
rename from android/assets/unit-tests.scm
rename to app-src/assets/unit-tests.scm
diff --git a/android/res/animator/card_flip_left_in.xml b/app-src/res/animator/card_flip_left_in.xml
similarity index 100%
rename from android/res/animator/card_flip_left_in.xml
rename to app-src/res/animator/card_flip_left_in.xml
diff --git a/android/res/animator/card_flip_left_out.xml b/app-src/res/animator/card_flip_left_out.xml
similarity index 100%
rename from android/res/animator/card_flip_left_out.xml
rename to app-src/res/animator/card_flip_left_out.xml
diff --git a/android/res/animator/card_flip_right_in.xml b/app-src/res/animator/card_flip_right_in.xml
similarity index 100%
rename from android/res/animator/card_flip_right_in.xml
rename to app-src/res/animator/card_flip_right_in.xml
diff --git a/android/res/animator/card_flip_right_out.xml b/app-src/res/animator/card_flip_right_out.xml
similarity index 100%
rename from android/res/animator/card_flip_right_out.xml
rename to app-src/res/animator/card_flip_right_out.xml
diff --git a/android/res/drawable-hdpi/ic_launcher.png b/app-src/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-hdpi/ic_launcher.png
rename to app-src/res/drawable-hdpi/ic_launcher.png
diff --git a/android/res/drawable-ldpi/ic_launcher.png b/app-src/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-ldpi/ic_launcher.png
rename to app-src/res/drawable-ldpi/ic_launcher.png
diff --git a/android/res/drawable-mdpi/ic_launcher.png b/app-src/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-mdpi/ic_launcher.png
rename to app-src/res/drawable-mdpi/ic_launcher.png
diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/app-src/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-xhdpi/ic_launcher.png
rename to app-src/res/drawable-xhdpi/ic_launcher.png
diff --git a/android/res/drawable/arrow_left.png b/app-src/res/drawable/arrow_left.png
similarity index 100%
rename from android/res/drawable/arrow_left.png
rename to app-src/res/drawable/arrow_left.png
diff --git a/android/res/drawable/arrow_right.png b/app-src/res/drawable/arrow_right.png
similarity index 100%
rename from android/res/drawable/arrow_right.png
rename to app-src/res/drawable/arrow_right.png
diff --git a/android/res/drawable/bg.png b/app-src/res/drawable/bg.png
similarity index 100%
rename from android/res/drawable/bg.png
rename to app-src/res/drawable/bg.png
diff --git a/android/res/drawable/bg_style.xml b/app-src/res/drawable/bg_style.xml
similarity index 100%
rename from android/res/drawable/bg_style.xml
rename to app-src/res/drawable/bg_style.xml
diff --git a/android/res/drawable/bgpaw.png b/app-src/res/drawable/bgpaw.png
similarity index 100%
rename from android/res/drawable/bgpaw.png
rename to app-src/res/drawable/bgpaw.png
diff --git a/android/res/drawable/cross.png b/app-src/res/drawable/cross.png
similarity index 100%
rename from android/res/drawable/cross.png
rename to app-src/res/drawable/cross.png
diff --git a/android/res/drawable/logo.png b/app-src/res/drawable/logo.png
similarity index 100%
rename from android/res/drawable/logo.png
rename to app-src/res/drawable/logo.png
diff --git a/android/res/drawable/maybe_off.png b/app-src/res/drawable/maybe_off.png
similarity index 100%
rename from android/res/drawable/maybe_off.png
rename to app-src/res/drawable/maybe_off.png
diff --git a/android/res/drawable/maybe_on.png b/app-src/res/drawable/maybe_on.png
similarity index 100%
rename from android/res/drawable/maybe_on.png
rename to app-src/res/drawable/maybe_on.png
diff --git a/android/res/drawable/mongooses.png b/app-src/res/drawable/mongooses.png
similarity index 100%
rename from android/res/drawable/mongooses.png
rename to app-src/res/drawable/mongooses.png
diff --git a/android/res/drawable/no_off.png b/app-src/res/drawable/no_off.png
similarity index 100%
rename from android/res/drawable/no_off.png
rename to app-src/res/drawable/no_off.png
diff --git a/android/res/drawable/no_on.png b/app-src/res/drawable/no_on.png
similarity index 100%
rename from android/res/drawable/no_on.png
rename to app-src/res/drawable/no_on.png
diff --git a/android/res/drawable/seekbg_fill.xml b/app-src/res/drawable/seekbg_fill.xml
similarity index 100%
rename from android/res/drawable/seekbg_fill.xml
rename to app-src/res/drawable/seekbg_fill.xml
diff --git a/android/res/drawable/seekprogress.xml b/app-src/res/drawable/seekprogress.xml
similarity index 100%
rename from android/res/drawable/seekprogress.xml
rename to app-src/res/drawable/seekprogress.xml
diff --git a/android/res/drawable/seekprogress_fill.xml b/app-src/res/drawable/seekprogress_fill.xml
similarity index 100%
rename from android/res/drawable/seekprogress_fill.xml
rename to app-src/res/drawable/seekprogress_fill.xml
diff --git a/android/res/drawable/seekthumb.xml b/app-src/res/drawable/seekthumb.xml
similarity index 100%
rename from android/res/drawable/seekthumb.xml
rename to app-src/res/drawable/seekthumb.xml
diff --git a/android/res/drawable/swarmbutton.xml b/app-src/res/drawable/swarmbutton.xml
similarity index 100%
rename from android/res/drawable/swarmbutton.xml
rename to app-src/res/drawable/swarmbutton.xml
diff --git a/android/res/drawable/swarmspinner.xml b/app-src/res/drawable/swarmspinner.xml
similarity index 100%
rename from android/res/drawable/swarmspinner.xml
rename to app-src/res/drawable/swarmspinner.xml
diff --git a/android/res/drawable/swarmtoggle.xml b/app-src/res/drawable/swarmtoggle.xml
similarity index 100%
rename from android/res/drawable/swarmtoggle.xml
rename to app-src/res/drawable/swarmtoggle.xml
diff --git a/android/res/drawable/swarmtoggledrawable.xml b/app-src/res/drawable/swarmtoggledrawable.xml
similarity index 100%
rename from android/res/drawable/swarmtoggledrawable.xml
rename to app-src/res/drawable/swarmtoggledrawable.xml
diff --git a/android/res/drawable/swarmtoggledrawable_maybe.xml b/app-src/res/drawable/swarmtoggledrawable_maybe.xml
similarity index 100%
rename from android/res/drawable/swarmtoggledrawable_maybe.xml
rename to app-src/res/drawable/swarmtoggledrawable_maybe.xml
diff --git a/android/res/drawable/swarmtoggledrawable_no.xml b/app-src/res/drawable/swarmtoggledrawable_no.xml
similarity index 100%
rename from android/res/drawable/swarmtoggledrawable_no.xml
rename to app-src/res/drawable/swarmtoggledrawable_no.xml
diff --git a/android/res/drawable/swarmtoggledrawable_yes.xml b/app-src/res/drawable/swarmtoggledrawable_yes.xml
similarity index 100%
rename from android/res/drawable/swarmtoggledrawable_yes.xml
rename to app-src/res/drawable/swarmtoggledrawable_yes.xml
diff --git a/android/res/drawable/tick.png b/app-src/res/drawable/tick.png
similarity index 100%
rename from android/res/drawable/tick.png
rename to app-src/res/drawable/tick.png
diff --git a/android/res/drawable/yes_off.png b/app-src/res/drawable/yes_off.png
similarity index 100%
rename from android/res/drawable/yes_off.png
rename to app-src/res/drawable/yes_off.png
diff --git a/android/res/drawable/yes_on.png b/app-src/res/drawable/yes_on.png
similarity index 100%
rename from android/res/drawable/yes_on.png
rename to app-src/res/drawable/yes_on.png
diff --git a/android/res/layout/debug_text.xml b/app-src/res/layout/debug_text.xml
similarity index 100%
rename from android/res/layout/debug_text.xml
rename to app-src/res/layout/debug_text.xml
diff --git a/android/res/layout/main.xml b/app-src/res/layout/main.xml
similarity index 100%
rename from android/res/layout/main.xml
rename to app-src/res/layout/main.xml
diff --git a/android/res/layout/main_fragment.xml b/app-src/res/layout/main_fragment.xml
similarity index 100%
rename from android/res/layout/main_fragment.xml
rename to app-src/res/layout/main_fragment.xml
diff --git a/android/res/layout/spinner_item.xml b/app-src/res/layout/spinner_item.xml
similarity index 100%
rename from android/res/layout/spinner_item.xml
rename to app-src/res/layout/spinner_item.xml
diff --git a/android/res/layout/spinner_layout.xml b/app-src/res/layout/spinner_layout.xml
similarity index 100%
rename from android/res/layout/spinner_layout.xml
rename to app-src/res/layout/spinner_layout.xml
diff --git a/android/res/layout/toggle_button_fancy.xml b/app-src/res/layout/toggle_button_fancy.xml
similarity index 100%
rename from android/res/layout/toggle_button_fancy.xml
rename to app-src/res/layout/toggle_button_fancy.xml
diff --git a/android/res/layout/toggle_button_maybe.xml b/app-src/res/layout/toggle_button_maybe.xml
similarity index 100%
rename from android/res/layout/toggle_button_maybe.xml
rename to app-src/res/layout/toggle_button_maybe.xml
diff --git a/android/res/layout/toggle_button_no.xml b/app-src/res/layout/toggle_button_no.xml
similarity index 100%
rename from android/res/layout/toggle_button_no.xml
rename to app-src/res/layout/toggle_button_no.xml
diff --git a/android/res/layout/toggle_button_yes.xml b/app-src/res/layout/toggle_button_yes.xml
similarity index 100%
rename from android/res/layout/toggle_button_yes.xml
rename to app-src/res/layout/toggle_button_yes.xml
diff --git a/android/res/raw/active.wav b/app-src/res/raw/active.wav
similarity index 100%
rename from android/res/raw/active.wav
rename to app-src/res/raw/active.wav
diff --git a/android/res/raw/ping.wav b/app-src/res/raw/ping.wav
similarity index 100%
rename from android/res/raw/ping.wav
rename to app-src/res/raw/ping.wav
diff --git a/android/res/values/strings.xml b/app-src/res/values/strings.xml
similarity index 100%
rename from android/res/values/strings.xml
rename to app-src/res/values/strings.xml
diff --git a/android/res/values/styles.xml b/app-src/res/values/styles.xml
similarity index 100%
rename from android/res/values/styles.xml
rename to app-src/res/values/styles.xml
diff --git a/android/src/foam/mongoose/ExportActivity.java b/app-src/src/foam/mongoose/ExportActivity.java
similarity index 100%
rename from android/src/foam/mongoose/ExportActivity.java
rename to app-src/src/foam/mongoose/ExportActivity.java
diff --git a/android/src/foam/mongoose/GroupCompositionActivity.java b/app-src/src/foam/mongoose/GroupCompositionActivity.java
similarity index 100%
rename from android/src/foam/mongoose/GroupCompositionActivity.java
rename to app-src/src/foam/mongoose/GroupCompositionActivity.java
diff --git a/android/src/foam/mongoose/GroupEventsActivity.java b/app-src/src/foam/mongoose/GroupEventsActivity.java
similarity index 100%
rename from android/src/foam/mongoose/GroupEventsActivity.java
rename to app-src/src/foam/mongoose/GroupEventsActivity.java
diff --git a/android/src/foam/mongoose/MainActivity.java b/app-src/src/foam/mongoose/MainActivity.java
similarity index 100%
rename from android/src/foam/mongoose/MainActivity.java
rename to app-src/src/foam/mongoose/MainActivity.java
diff --git a/android/src/foam/mongoose/ManageIndividualActivity.java b/app-src/src/foam/mongoose/ManageIndividualActivity.java
similarity index 100%
rename from android/src/foam/mongoose/ManageIndividualActivity.java
rename to app-src/src/foam/mongoose/ManageIndividualActivity.java
diff --git a/android/src/foam/mongoose/ManagePacksActivity.java b/app-src/src/foam/mongoose/ManagePacksActivity.java
similarity index 100%
rename from android/src/foam/mongoose/ManagePacksActivity.java
rename to app-src/src/foam/mongoose/ManagePacksActivity.java
diff --git a/android/src/foam/mongoose/NewIndividualActivity.java b/app-src/src/foam/mongoose/NewIndividualActivity.java
similarity index 100%
rename from android/src/foam/mongoose/NewIndividualActivity.java
rename to app-src/src/foam/mongoose/NewIndividualActivity.java
diff --git a/android/src/foam/mongoose/NewPackActivity.java b/app-src/src/foam/mongoose/NewPackActivity.java
similarity index 100%
rename from android/src/foam/mongoose/NewPackActivity.java
rename to app-src/src/foam/mongoose/NewPackActivity.java
diff --git a/android/src/foam/mongoose/ObservationsActivity.java b/app-src/src/foam/mongoose/ObservationsActivity.java
similarity index 100%
rename from android/src/foam/mongoose/ObservationsActivity.java
rename to app-src/src/foam/mongoose/ObservationsActivity.java
diff --git a/android/src/foam/mongoose/PupFocalActivity.java b/app-src/src/foam/mongoose/PupFocalActivity.java
similarity index 100%
rename from android/src/foam/mongoose/PupFocalActivity.java
rename to app-src/src/foam/mongoose/PupFocalActivity.java
diff --git a/android/src/foam/mongoose/PupFocalStartActivity.java b/app-src/src/foam/mongoose/PupFocalStartActivity.java
similarity index 100%
rename from android/src/foam/mongoose/PupFocalStartActivity.java
rename to app-src/src/foam/mongoose/PupFocalStartActivity.java
diff --git a/android/src/foam/mongoose/ReviewActivity.java b/app-src/src/foam/mongoose/ReviewActivity.java
similarity index 100%
rename from android/src/foam/mongoose/ReviewActivity.java
rename to app-src/src/foam/mongoose/ReviewActivity.java
diff --git a/android/src/foam/mongoose/ReviewCollectionActivity.java b/app-src/src/foam/mongoose/ReviewCollectionActivity.java
similarity index 100%
rename from android/src/foam/mongoose/ReviewCollectionActivity.java
rename to app-src/src/foam/mongoose/ReviewCollectionActivity.java
diff --git a/android/src/foam/mongoose/ReviewItemActivity.java b/app-src/src/foam/mongoose/ReviewItemActivity.java
similarity index 100%
rename from android/src/foam/mongoose/ReviewItemActivity.java
rename to app-src/src/foam/mongoose/ReviewItemActivity.java
diff --git a/android/src/foam/mongoose/SyncActivity.java b/app-src/src/foam/mongoose/SyncActivity.java
similarity index 100%
rename from android/src/foam/mongoose/SyncActivity.java
rename to app-src/src/foam/mongoose/SyncActivity.java
diff --git a/android/src/foam/mongoose/TagLocationActivity.java b/app-src/src/foam/mongoose/TagLocationActivity.java
similarity index 100%
rename from android/src/foam/mongoose/TagLocationActivity.java
rename to app-src/src/foam/mongoose/TagLocationActivity.java
diff --git a/android/src/foam/mongoose/UpdateIndividualActivity.java b/app-src/src/foam/mongoose/UpdateIndividualActivity.java
similarity index 100%
rename from android/src/foam/mongoose/UpdateIndividualActivity.java
rename to app-src/src/foam/mongoose/UpdateIndividualActivity.java
diff --git a/android/src/foam/mongoose/starwisp.java b/app-src/src/foam/mongoose/starwisp.java
similarity index 100%
rename from android/src/foam/mongoose/starwisp.java
rename to app-src/src/foam/mongoose/starwisp.java