diff --git a/zcash-android-wallet-app/.gitignore b/zcash-android-wallet-app/.gitignore
new file mode 100644
index 0000000..2b75303
--- /dev/null
+++ b/zcash-android-wallet-app/.gitignore
@@ -0,0 +1,13 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
diff --git a/zcash-android-wallet-app/app/build.gradle b/zcash-android-wallet-app/app/build.gradle
new file mode 100644
index 0000000..2a450ce
--- /dev/null
+++ b/zcash-android-wallet-app/app/build.gradle
@@ -0,0 +1,39 @@
+apply plugin: 'com.android.application'
+
+apply plugin: 'kotlin-android'
+
+apply plugin: 'kotlin-android-extensions'
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        applicationId "cash.z.android.wallet"
+        minSdkVersion 16
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'android.arch.navigation:navigation-fragment:1.0.0-alpha06'
+    implementation 'android.arch.navigation:navigation-ui:1.0.0-alpha06'
+    implementation 'android.arch.navigation:navigation-fragment-ktx:1.0.0-alpha06'
+    implementation 'android.arch.navigation:navigation-ui-ktx:1.0.0-alpha06'
+    implementation 'androidx.core:core-ktx:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+}
diff --git a/zcash-android-wallet-app/app/build.gradle.kts b/zcash-android-wallet-app/app/build.gradle.kts
deleted file mode 100644
index f0f1d68..0000000
--- a/zcash-android-wallet-app/app/build.gradle.kts
+++ /dev/null
@@ -1,44 +0,0 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
-
-plugins {
-    id("com.android.application")
-    id("kotlin-android-extensions")
-    id("kotlin-android")
-}
-
-android {
-    compileSdkVersion(28)
-    defaultConfig {
-        minSdkVersion(21)
-        targetSdkVersion(28)
-        applicationId = "cash.z.wallet.app"
-        versionCode = 1
-        versionName = "1.0"
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
-        }
-    }
-}
-
-// Note: we use string primitives for dependencies rather than something fancy (like buildSrc
-// variables) so that we can leverage the built-in lint check that alerts us about new versions
-dependencies {
-    implementation(kotlin("stdlib-jdk7", KotlinCompilerVersion.VERSION))
-    implementation(project(":zcash-android-welding"))
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-    implementation("androidx.appcompat:appcompat:1.0.0")
-    implementation("android.arch.navigation:navigation-fragment:1.0.0-alpha06")
-    implementation("android.arch.navigation:navigation-ui:1.0.0-alpha06")
-    implementation("android.arch.navigation:navigation-fragment-ktx:1.0.0-alpha06")
-    implementation("android.arch.navigation:navigation-ui-ktx:1.0.0-alpha06")
-    implementation("androidx.core:core-ktx:1.0.0")
-    implementation("com.google.android.material:material:1.0.0")
-    implementation("androidx.constraintlayout:constraintlayout:1.1.3")
-    testImplementation("junit:junit:4.12")
-    androidTestImplementation("androidx.test:runner:1.1.0-beta01")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.1.0-beta01")
-}
diff --git a/zcash-android-wallet-app/app/src/androidTest/java/cash/z/wallet/app/ExampleInstrumentedTest.kt b/zcash-android-wallet-app/app/src/androidTest/java/cash/z/android/wallet/ExampleInstrumentedTest.kt
similarity index 84%
rename from zcash-android-wallet-app/app/src/androidTest/java/cash/z/wallet/app/ExampleInstrumentedTest.kt
rename to zcash-android-wallet-app/app/src/androidTest/java/cash/z/android/wallet/ExampleInstrumentedTest.kt
index d4f36b1..7e603a5 100644
--- a/zcash-android-wallet-app/app/src/androidTest/java/cash/z/wallet/app/ExampleInstrumentedTest.kt
+++ b/zcash-android-wallet-app/app/src/androidTest/java/cash/z/android/wallet/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package cash.z.wallet.app
+package cash.z.android.wallet
 
 import androidx.test.InstrumentationRegistry
 import androidx.test.runner.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getTargetContext()
-        assertEquals("cash.z.wallet.app", appContext.packageName)
+        assertEquals("cash.z.android.wallet", appContext.packageName)
     }
 }
diff --git a/zcash-android-wallet-app/app/src/main/AndroidManifest.xml b/zcash-android-wallet-app/app/src/main/AndroidManifest.xml
index ee73090..1632635 100644
--- a/zcash-android-wallet-app/app/src/main/AndroidManifest.xml
+++ b/zcash-android-wallet-app/app/src/main/AndroidManifest.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:dist="http://schemas.android.com/apk/distribution"
-          package="cash.z.wallet.app">
+          package="cash.z.android.wallet">
 
     <dist:module dist:instant="true"/>
 
     <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+            android:allowBackup="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name"
+            android:roundIcon="@mipmap/ic_launcher_round"
+            android:supportsRtl="true"
+            android:theme="@style/AppTheme">
         <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name">
+                android:name=".MainActivity"
+                android:label="@string/app_name"
+                android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
diff --git a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/MainActivity.kt b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/MainActivity.kt
new file mode 100644
index 0000000..bfaa43a
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/MainActivity.kt
@@ -0,0 +1,85 @@
+package cash.z.android.wallet
+
+import android.os.Bundle
+import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.navigation.NavigationView
+import androidx.core.view.GravityCompat
+import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.appcompat.app.AppCompatActivity
+import android.view.Menu
+import android.view.MenuItem
+import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.app_bar_main.*
+
+class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+        setSupportActionBar(toolbar)
+
+        fab.setOnClickListener { view ->
+            Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+                .setAction("Action", null).show()
+        }
+
+        val toggle = ActionBarDrawerToggle(
+            this, drawer_layout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close
+        )
+        drawer_layout.addDrawerListener(toggle)
+        toggle.syncState()
+
+        nav_view.setNavigationItemSelectedListener(this)
+    }
+
+    override fun onBackPressed() {
+        if (drawer_layout.isDrawerOpen(GravityCompat.START)) {
+            drawer_layout.closeDrawer(GravityCompat.START)
+        } else {
+            super.onBackPressed()
+        }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        menuInflater.inflate(R.menu.main, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        when (item.itemId) {
+            R.id.action_settings -> return true
+            else -> return super.onOptionsItemSelected(item)
+        }
+    }
+
+    override fun onNavigationItemSelected(item: MenuItem): Boolean {
+        // Handle navigation view item clicks here.
+        when (item.itemId) {
+            R.id.nav_camera -> {
+                // Handle the camera action
+            }
+            R.id.nav_gallery -> {
+
+            }
+            R.id.nav_slideshow -> {
+
+            }
+            R.id.nav_manage -> {
+
+            }
+            R.id.nav_share -> {
+
+            }
+            R.id.nav_send -> {
+
+            }
+        }
+
+        drawer_layout.closeDrawer(GravityCompat.START)
+        return true
+    }
+}
diff --git a/zcash-android-wallet-app/app/src/main/java/cash/z/wallet/app/MainActivity.kt b/zcash-android-wallet-app/app/src/main/java/cash/z/wallet/app/MainActivity.kt
deleted file mode 100644
index 6ae8efd..0000000
--- a/zcash-android-wallet-app/app/src/main/java/cash/z/wallet/app/MainActivity.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package cash.z.wallet.app
-
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import cash.z.wallet.sdk.jni.JniConverter
-import cash.z.wallet.sdk.proto.WalletData
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import kotlinx.android.synthetic.main.activity_main.*
-
-class MainActivity : AppCompatActivity() {
-
-    var converter: JniConverter = JniConverter()
-
-    private val mOnNavigationItemSelectedListener = BottomNavigationView.OnNavigationItemSelectedListener { item ->
-        when (item.itemId) {
-            R.id.navigation_send -> {
-                message.setText(R.string.title_send)
-                return@OnNavigationItemSelectedListener true
-            }
-            R.id.navigation_receive -> {
-                message.setText(R.string.title_recieve)
-                return@OnNavigationItemSelectedListener true
-            }
-            R.id.navigation_invoice -> {
-                val homeText = "${getString(R.string.title_invoice)}\n${getString(R.string.sdk_test_message)}\n${checkJni()}"
-                message.setText(homeText)
-                return@OnNavigationItemSelectedListener true
-            }
-        }
-        false
-    }
-
-    private fun checkJni(): String {
-        try {
-            val walletDataArray = WalletData("Kevin", 42, "email@hotmail.com").encode()
-            val result = converter.sendComplexData(walletDataArray)
-            return when(result) {
-                42 -> "Rust lib is connected!"
-                else -> "sent(${walletDataArray.size}) JNI call returned unexpected value: $result"
-            }
-        } catch (t: Throwable) {}
-        return "Failure reading from JNI"
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-
-        navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
-    }
-}
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_camera.xml b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_camera.xml
new file mode 100644
index 0000000..41688d5
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_camera.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+            android:fillColor="#FF000000"
+            android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
+    <path
+            android:fillColor="#FF000000"
+            android:pathData="M9,2L7.17,4H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2H9zm3,15c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+</vector>
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_gallery.xml b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_gallery.xml
new file mode 100644
index 0000000..ff8ce52
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_gallery.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+            android:fillColor="#FF000000"
+            android:pathData="M22,16V4c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zm-11,-4l2.03,2.71L16,11l4,5H8l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2H4V6H2z"/>
+</vector>
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_manage.xml b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_manage.xml
new file mode 100644
index 0000000..a0e423c
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_manage.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+            android:fillColor="#FF000000"
+            android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/>
+</vector>
\ No newline at end of file
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable/ic_send_black_24dp.xml b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_send.xml
similarity index 66%
rename from zcash-android-wallet-app/app/src/main/res/drawable/ic_send_black_24dp.xml
rename to zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_send.xml
index e145ca8..9745066 100644
--- a/zcash-android-wallet-app/app/src/main/res/drawable/ic_send_black_24dp.xml
+++ b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_send.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
+            android:fillColor="#FF000000"
+            android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
 </vector>
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_share.xml b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_share.xml
new file mode 100644
index 0000000..b3e39e2
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_share.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+            android:fillColor="#FF000000"
+            android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_slideshow.xml b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_slideshow.xml
new file mode 100644
index 0000000..ae51e49
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_menu_slideshow.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+            android:fillColor="#FF000000"
+            android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6zm16,-4H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zm-8,12.5v-9l6,4.5 -6,4.5z"/>
+</vector>
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/zcash-android-wallet-app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
index 485bbd3..6348baa 100644
--- a/zcash-android-wallet-app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/zcash-android-wallet-app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -2,33 +2,33 @@
         xmlns:aapt="http://schemas.android.com/aapt"
         android:width="108dp"
         android:height="108dp"
-        android:viewportWidth="108"
-        android:viewportHeight="108">
+        android:viewportHeight="108"
+        android:viewportWidth="108">
     <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000">
+            android:fillType="evenOdd"
+            android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+            android:strokeColor="#00000000"
+            android:strokeWidth="1">
         <aapt:attr name="android:fillColor">
             <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
+                    android:endX="78.5885"
+                    android:endY="90.9159"
+                    android:startX="48.7653"
+                    android:startY="61.0927"
+                    android:type="linear">
                 <item
-                    android:color="#44000000"
-                    android:offset="0.0"/>
+                        android:color="#44000000"
+                        android:offset="0.0"/>
                 <item
-                    android:color="#00000000"
-                    android:offset="1.0"/>
+                        android:color="#00000000"
+                        android:offset="1.0"/>
             </gradient>
         </aapt:attr>
     </path>
     <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000"/>
+            android:fillColor="#FFFFFF"
+            android:fillType="nonZero"
+            android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+            android:strokeColor="#00000000"
+            android:strokeWidth="1"/>
 </vector>
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable/ic_launcher_background.xml b/zcash-android-wallet-app/app/src/main/res/drawable/ic_launcher_background.xml
index 7ca0909..a0ad202 100644
--- a/zcash-android-wallet-app/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/zcash-android-wallet-app/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,171 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#008577"
-        android:pathData="M0,0h108v108h-108z"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF"/>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="108dp"
+        android:width="108dp"
+        android:viewportHeight="108"
+        android:viewportWidth="108">
+    <path android:fillColor="#008577"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
 </vector>
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable/ic_qrcode_black_24dp.xml b/zcash-android-wallet-app/app/src/main/res/drawable/ic_qrcode_black_24dp.xml
deleted file mode 100644
index ecfee41..0000000
--- a/zcash-android-wallet-app/app/src/main/res/drawable/ic_qrcode_black_24dp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,11H5V13H3V11M11,5H13V9H11V5M9,11H13V15H11V13H9V11M15,11H17V13H19V11H21V13H19V15H21V19H19V21H17V19H13V21H11V17H15V15H17V13H15V11M19,19V15H17V19H19M15,3H21V9H15V3M17,5V7H19V5H17M3,3H9V9H3V3M5,5V7H7V5H5M3,15H9V21H3V15M5,17V19H7V17H5Z"/>
-</vector>
\ No newline at end of file
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable/ic_receipt_black_24dp.xml b/zcash-android-wallet-app/app/src/main/res/drawable/ic_receipt_black_24dp.xml
deleted file mode 100644
index 4714dde..0000000
--- a/zcash-android-wallet-app/app/src/main/res/drawable/ic_receipt_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18,17L6,17v-2h12v2zM18,13L6,13v-2h12v2zM18,9L6,9L6,7h12v2zM3,22l1.5,-1.5L6,22l1.5,-1.5L9,22l1.5,-1.5L12,22l1.5,-1.5L15,22l1.5,-1.5L18,22l1.5,-1.5L21,22L21,2l-1.5,1.5L18,2l-1.5,1.5L15,2l-1.5,1.5L12,2l-1.5,1.5L9,2 7.5,3.5 6,2 4.5,3.5 3,2v20z"/>
-</vector>
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable/side_nav_bar.xml b/zcash-android-wallet-app/app/src/main/res/drawable/side_nav_bar.xml
new file mode 100644
index 0000000..a33798b
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/drawable/side_nav_bar.xml
@@ -0,0 +1,9 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <gradient
+            android:angle="135"
+            android:centerColor="#009688"
+            android:endColor="#00695C"
+            android:startColor="#4DB6AC"
+            android:type="linear"/>
+</shape>
\ No newline at end of file
diff --git a/zcash-android-wallet-app/app/src/main/res/layout/activity_main.xml b/zcash-android-wallet-app/app/src/main/res/layout/activity_main.xml
index 090c654..ac9a123 100644
--- a/zcash-android-wallet-app/app/src/main/res/layout/activity_main.xml
+++ b/zcash-android-wallet-app/app/src/main/res/layout/activity_main.xml
@@ -1,34 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
+<androidx.drawerlayout.widget.DrawerLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
+        tools:openDrawer="start">
 
-    <TextView
-        android:id="@+id/message"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/activity_horizontal_margin"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
-        android:text="@string/title_send"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+    <include
+            layout="@layout/app_bar_main"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
 
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/navigation"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
-        android:background="?android:attr/windowBackground"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:menu="@menu/navigation"/>
+    <com.google.android.material.navigation.NavigationView
+            android:id="@+id/nav_view"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:fitsSystemWindows="true"
+            app:headerLayout="@layout/nav_header_main"
+            app:menu="@menu/activity_main_drawer"/>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/zcash-android-wallet-app/app/src/main/res/layout/app_bar_main.xml b/zcash-android-wallet-app/app/src/main/res/layout/app_bar_main.xml
new file mode 100644
index 0000000..2826dca
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/layout/app_bar_main.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".MainActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:theme="@style/AppTheme.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/colorPrimary"
+                app:popupTheme="@style/AppTheme.PopupOverlay"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <include layout="@layout/content_main"/>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="@dimen/fab_margin"
+            app:srcCompat="@drawable/ic_menu_send"
+            android:tint="@android:color/black"/>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/zcash-android-wallet-app/app/src/main/res/layout/content_main.xml b/zcash-android-wallet-app/app/src/main/res/layout/content_main.xml
new file mode 100644
index 0000000..a77788d
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/layout/content_main.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:showIn="@layout/app_bar_main"
+        tools:context=".MainActivity">
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Insert Funds Here!"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/zcash-android-wallet-app/app/src/main/res/layout/nav_header_main.xml b/zcash-android-wallet-app/app/src/main/res/layout/nav_header_main.xml
new file mode 100644
index 0000000..92ca611
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/layout/nav_header_main.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/nav_header_height"
+        android:background="@drawable/side_nav_bar"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark"
+        android:orientation="vertical"
+        android:gravity="bottom">
+
+    <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/nav_header_vertical_spacing"
+            app:srcCompat="@mipmap/ic_launcher_round"
+            android:contentDescription="@string/nav_header_desc"
+            android:id="@+id/imageView"/>
+
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/nav_header_vertical_spacing"
+            android:text="@string/nav_header_title"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/nav_header_subtitle"
+            android:id="@+id/textView"/>
+
+</LinearLayout>
diff --git a/zcash-android-wallet-app/app/src/main/res/menu/activity_main_drawer.xml b/zcash-android-wallet-app/app/src/main/res/menu/activity_main_drawer.xml
new file mode 100644
index 0000000..be8b0d1
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/menu/activity_main_drawer.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:showIn="navigation_view">
+
+    <group android:checkableBehavior="single">
+        <item
+                android:id="@+id/nav_camera"
+                android:icon="@drawable/ic_menu_camera"
+                android:title="Import"/>
+        <item
+                android:id="@+id/nav_gallery"
+                android:icon="@drawable/ic_menu_gallery"
+                android:title="Gallery"/>
+        <item
+                android:id="@+id/nav_slideshow"
+                android:icon="@drawable/ic_menu_slideshow"
+                android:title="Slideshow"/>
+        <item
+                android:id="@+id/nav_manage"
+                android:icon="@drawable/ic_menu_manage"
+                android:title="Tools"/>
+    </group>
+
+    <item android:title="Communicate">
+        <menu>
+            <item
+                    android:id="@+id/nav_share"
+                    android:icon="@drawable/ic_menu_share"
+                    android:title="Share"/>
+            <item
+                    android:id="@+id/nav_send"
+                    android:icon="@drawable/ic_menu_send"
+                    android:title="Send"/>
+        </menu>
+    </item>
+
+</menu>
diff --git a/zcash-android-wallet-app/app/src/main/res/menu/main.xml b/zcash-android-wallet-app/app/src/main/res/menu/main.xml
new file mode 100644
index 0000000..d579f6f
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/menu/main.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/action_settings"
+          android:title="@string/action_settings"
+          android:orderInCategory="100"
+          app:showAsAction="never"/>
+</menu>
diff --git a/zcash-android-wallet-app/app/src/main/res/menu/navigation.xml b/zcash-android-wallet-app/app/src/main/res/menu/navigation.xml
deleted file mode 100644
index 57e02bc..0000000
--- a/zcash-android-wallet-app/app/src/main/res/menu/navigation.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/navigation_send"
-        android:icon="@drawable/ic_send_black_24dp"
-        android:title="@string/title_send"/>
-
-    <item
-        android:id="@+id/navigation_receive"
-        android:icon="@drawable/ic_qrcode_black_24dp"
-        android:title="@string/title_recieve"/>
-
-    <item
-        android:id="@+id/navigation_invoice"
-        android:icon="@drawable/ic_receipt_black_24dp"
-        android:title="@string/title_invoice"/>
-
-</menu>
diff --git a/zcash-android-wallet-app/app/src/main/res/values-v21/styles.xml b/zcash-android-wallet-app/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 0000000..e546804
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,7 @@
+<resources>
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>
diff --git a/zcash-android-wallet-app/app/src/main/res/values/colors.xml b/zcash-android-wallet-app/app/src/main/res/values/colors.xml
index 69b2233..ecb3278 100644
--- a/zcash-android-wallet-app/app/src/main/res/values/colors.xml
+++ b/zcash-android-wallet-app/app/src/main/res/values/colors.xml
@@ -2,5 +2,5 @@
 <resources>
     <color name="colorPrimary">#008577</color>
     <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
+    <color name="colorAccent">#F1B53B</color>
 </resources>
diff --git a/zcash-android-wallet-app/app/src/main/res/values/dimens.xml b/zcash-android-wallet-app/app/src/main/res/values/dimens.xml
index 47c8224..4ab4520 100644
--- a/zcash-android-wallet-app/app/src/main/res/values/dimens.xml
+++ b/zcash-android-wallet-app/app/src/main/res/values/dimens.xml
@@ -2,4 +2,7 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
-</resources>
+    <dimen name="nav_header_vertical_spacing">8dp</dimen>
+    <dimen name="nav_header_height">176dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/zcash-android-wallet-app/app/src/main/res/values/drawables.xml b/zcash-android-wallet-app/app/src/main/res/values/drawables.xml
new file mode 100644
index 0000000..52c6a6c
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/values/drawables.xml
@@ -0,0 +1,8 @@
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <item name="ic_menu_camera" type="drawable">@android:drawable/ic_menu_camera</item>
+    <item name="ic_menu_gallery" type="drawable">@android:drawable/ic_menu_gallery</item>
+    <item name="ic_menu_slideshow" type="drawable">@android:drawable/ic_menu_slideshow</item>
+    <item name="ic_menu_manage" type="drawable">@android:drawable/ic_menu_manage</item>
+    <item name="ic_menu_share" type="drawable">@android:drawable/ic_menu_share</item>
+    <item name="ic_menu_send" type="drawable">@android:drawable/ic_menu_send</item>
+</resources>
diff --git a/zcash-android-wallet-app/app/src/main/res/values/strings.xml b/zcash-android-wallet-app/app/src/main/res/values/strings.xml
index 5f14330..7cb973b 100644
--- a/zcash-android-wallet-app/app/src/main/res/values/strings.xml
+++ b/zcash-android-wallet-app/app/src/main/res/values/strings.xml
@@ -1,6 +1,9 @@
 <resources>
     <string name="app_name">Zcash Wallet</string>
-    <string name="title_send">Send</string>
-    <string name="title_recieve">Recieve</string>
-    <string name="title_invoice">Invoice</string>
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+    <string name="nav_header_title">Android Studio</string>
+    <string name="nav_header_subtitle">android.studio@android.com</string>
+    <string name="nav_header_desc">Navigation header</string>
+    <string name="action_settings">Settings</string>
 </resources>
diff --git a/zcash-android-wallet-app/app/src/main/res/values/styles.xml b/zcash-android-wallet-app/app/src/main/res/values/styles.xml
index 5885930..c283e58 100644
--- a/zcash-android-wallet-app/app/src/main/res/values/styles.xml
+++ b/zcash-android-wallet-app/app/src/main/res/values/styles.xml
@@ -7,5 +7,13 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+    <style name="AppTheme.AppBarOverlay"
+           parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+    <style name="AppTheme.PopupOverlay"
+           parent="ThemeOverlay.AppCompat.Light"/>
 
 </resources>
diff --git a/zcash-android-wallet-app/app/src/test/java/cash/z/wallet/app/ExampleUnitTest.kt b/zcash-android-wallet-app/app/src/test/java/cash/z/android/wallet/ExampleUnitTest.kt
similarity index 91%
rename from zcash-android-wallet-app/app/src/test/java/cash/z/wallet/app/ExampleUnitTest.kt
rename to zcash-android-wallet-app/app/src/test/java/cash/z/android/wallet/ExampleUnitTest.kt
index 23d877d..bb242c7 100644
--- a/zcash-android-wallet-app/app/src/test/java/cash/z/wallet/app/ExampleUnitTest.kt
+++ b/zcash-android-wallet-app/app/src/test/java/cash/z/android/wallet/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package cash.z.wallet.app
+package cash.z.android.wallet
 
 import org.junit.Test
 
diff --git a/zcash-android-wallet-app/build.gradle b/zcash-android-wallet-app/build.gradle
new file mode 100644
index 0000000..e2e49a1
--- /dev/null
+++ b/zcash-android-wallet-app/build.gradle
@@ -0,0 +1,28 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    ext.kotlin_version = '1.2.71'
+    repositories {
+        google()
+        jcenter()
+        
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.4.0-alpha02'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+        
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/zcash-android-wallet-app/build.gradle.kts b/zcash-android-wallet-app/build.gradle.kts
deleted file mode 100644
index 3f18615..0000000
--- a/zcash-android-wallet-app/build.gradle.kts
+++ /dev/null
@@ -1,24 +0,0 @@
-buildscript {
-//    ext.kotlin_version = '1.2.71'
-    repositories {
-        google()
-        jcenter()
-        
-    }
-    dependencies {
-        classpath("com.android.tools.build:gradle:3.4.0-alpha02")
-        classpath(kotlin("gradle-plugin", version = "1.2.71"))
-    }
-}
-
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-    }
-}
-
-tasks.register("clean", Delete::class) {
-    delete(rootProject.buildDir)
-}
diff --git a/zcash-android-wallet-app/gradle.properties b/zcash-android-wallet-app/gradle.properties
index c73d239..23339e0 100644
--- a/zcash-android-wallet-app/gradle.properties
+++ b/zcash-android-wallet-app/gradle.properties
@@ -17,3 +17,5 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
diff --git a/zcash-android-wallet-app/gradle/wrapper/gradle-wrapper.properties b/zcash-android-wallet-app/gradle/wrapper/gradle-wrapper.properties
index 0ff6d98..27e59ef 100644
--- a/zcash-android-wallet-app/gradle/wrapper/gradle-wrapper.properties
+++ b/zcash-android-wallet-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Mon Oct 08 16:02:00 EDT 2018
+#Mon Oct 29 20:02:01 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/zcash-android-wallet-app/settings.gradle b/zcash-android-wallet-app/settings.gradle
new file mode 100644
index 0000000..e7b4def
--- /dev/null
+++ b/zcash-android-wallet-app/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/zcash-android-wallet-app/settings.gradle.kts b/zcash-android-wallet-app/settings.gradle.kts
deleted file mode 100644
index 578e183..0000000
--- a/zcash-android-wallet-app/settings.gradle.kts
+++ /dev/null
@@ -1,5 +0,0 @@
-//Explicitly set `rootProject.buildFileName`
-// avoids project import issues caused by Android Studio silently adding a `build.gradle` file
-rootProject.buildFileName = "build.gradle.kts"
-
-include(":app", ":zcash-android-welding")
diff --git a/zcash-android-wallet-app/zcash-android-welding/.cargo/config b/zcash-android-wallet-app/zcash-android-welding/.cargo/config
deleted file mode 100644
index 5514fc8..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/.cargo/config
+++ /dev/null
@@ -1,2 +0,0 @@
-[build]
-target-dir = "build/rust/target"
\ No newline at end of file
diff --git a/zcash-android-wallet-app/zcash-android-welding/.gitignore b/zcash-android-wallet-app/zcash-android-welding/.gitignore
deleted file mode 100644
index 39b6783..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/.gitignore
+++ /dev/null
@@ -1,65 +0,0 @@
-# Built application files
-*.apk
-*.ap_
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# IntelliJ
-*.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-.idea/caches
-
-# Keystore files
-# Uncomment the following line if you do not want to check your keystore files in.
-#*.jks
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
-
-# Google Services (e.g. APIs or Firebase)
-google-services.json
-
-# Freeline
-freeline.py
-freeline/
-freeline_project_description.json
-
-# fastlane
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
-fastlane/test_output
-fastlane/readme.md
diff --git a/zcash-android-wallet-app/zcash-android-welding/.gitrepo b/zcash-android-wallet-app/zcash-android-welding/.gitrepo
deleted file mode 100644
index eccaed4..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/.gitrepo
+++ /dev/null
@@ -1,11 +0,0 @@
-; DO NOT EDIT (unless you know what you are doing)
-;
-; This subdirectory is a git "subrepo", and this file is maintained by the
-; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
-;
-[subrepo]
-	remote = git@github.com:gmale/zcash-android-wallet-sdk-poc.git
-	branch = master
-	commit = 9d5cec753d59e8abb92575aa4bcbe874b8f09ad7
-	parent = 4fca6aa112952b572703e3f99e5f877385c6286e
-	cmdver = 0.3.1
diff --git a/zcash-android-wallet-app/zcash-android-welding/Cargo.lock b/zcash-android-wallet-app/zcash-android-welding/Cargo.lock
deleted file mode 100644
index a7c017e..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/Cargo.lock
+++ /dev/null
@@ -1,177 +0,0 @@
-[[package]]
-name = "ascii"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "bitflags"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "byteorder"
-version = "1.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "combine"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "ascii 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "error-chain"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "jni"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cesu8 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "combine 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "jni-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libc"
-version = "0.2.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "log"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "log"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "same-file"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "walkdir"
-version = "2.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "same-file 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "zcash-wallet-sdk-poc"
-version = "0.0.1"
-dependencies = [
- "jni 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[metadata]
-"checksum ascii 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae7d751998c189c1d4468cf0a39bb2eae052a9c58d50ebb3b9591ee3813ad50"
-"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
-"checksum byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "90492c5858dd7d2e78691cfb89f90d273a2800fc11d98f60786e5d87e2f83781"
-"checksum cesu8 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-"checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
-"checksum combine 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1645a65a99c7c8d345761f4b75a6ffe5be3b3b27a93ee731fccc5050ba6be97c"
-"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
-"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-"checksum jni 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef6a7c128e004695664548814f96ea78b458d94e52eb88c42a3b1d4e9a14ac1e"
-"checksum jni-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-"checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d"
-"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-"checksum log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fcce5fa49cc693c312001daf1d13411c4a5283796bac1084299ea3e567113f"
-"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
-"checksum same-file 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "10f7794e2fda7f594866840e95f5c5962e886e228e68b6505885811a94dd728c"
-"checksum walkdir 2.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "af464bc7be7b785c7ac72e266a6b67c4c9070155606f51655a650a6686204e35"
-"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "afc5508759c5bf4285e61feb862b6083c8480aec864fa17a81fdec6f69b461ab"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/zcash-android-wallet-app/zcash-android-welding/Cargo.toml b/zcash-android-wallet-app/zcash-android-welding/Cargo.toml
deleted file mode 100644
index e26b4c6..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "zcash-wallet-sdk-poc"
-version = "0.0.1"
-authors = ["Kevin Gorham <kevin.gorham@z.cash>"]
-description = "Simple PoC that rust can work with protobufs over JNI"
-publish = false
-
-[dependencies]
-rand = "0.4"
-
-[target.'cfg(target_os="android")'.dependencies]
-jni = { version = "0.9", default-features = false }
-
-[lib]
-name = "zcashwalletsdk"
-path = "src/main/rust/lib.rs"
-crate-type = ["staticlib", "cdylib"]
diff --git a/zcash-android-wallet-app/zcash-android-welding/LICENSE b/zcash-android-wallet-app/zcash-android-welding/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/zcash-android-wallet-app/zcash-android-welding/README.md b/zcash-android-wallet-app/zcash-android-welding/README.md
deleted file mode 100644
index 85c9c0b..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# zcash-android-wallet-sdk-poc
-Proof of concept for an Android Wallet SDK
diff --git a/zcash-android-wallet-app/zcash-android-welding/build-ndk-standalone.sh b/zcash-android-wallet-app/zcash-android-welding/build-ndk-standalone.sh
deleted file mode 100755
index 68731fc..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/build-ndk-standalone.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/zsh
-
-# put this somewhere that's often ignored by git
-output_dir=out/ndk/standalone
-
-# check for NDK standalone 
-[[ -d "$output_dir" ]] && echo "Standalone NDK files found!" && exit 1
-
-standalone_script=$(find $ANDROID_HOME -name "*make_standalone_toolchain.py")
-
-# Try to find and print some info about the NDK based on the location of the toolchain script
-if [ ! -f "$standalone_script" ]; then
-	echo "NDK not found. Please make sure that ANDROID_HOME is set and the NDK has been installed there"
-else
-	echo "Standalone NDK files appear to be missing.\n    Attempting to install them..."
-	ndk_dir=$(dirname $(dirname $(dirname $standalone_script 2>/dev/null) 2>/dev/null) 2>/dev/null)
-	ndk_version=$(grep -oE "[0-9.]{5,}" /home/gmale/kg/setup/android/sdk/ndk-bundle/source.properties 2>/dev/null)
-	echo "        NDK version $ndk_version found at $ndk_dir"
-fi
-
-echo "        Installing the standalone NDK for x86|arm|arm64 into $output_dir"
-mkdir -p $output_dir
-"$standalone_script" --arch x86 --api 16 --install-dir "$output_dir/x86"
-"$standalone_script" --arch arm --api 16 --install-dir "$output_dir/arm"
-"$standalone_script" --arch arm64 --api 21 --install-dir "$output_dir/arm64"
-
-# check for our generated cargo file
-generated_cargo_config=../.cargo/config
-
-if [ -f "$generated_cargo_config" ]; then
-	backup_config_filename="config.$(date +%s).backup"
-	echo "    existing config found. Backing it up from $generated_cargo_config to $(dirname $generated_cargo_config)/$backup_config_filename"	
-	cp $generated_cargo_config $(dirname $generated_cargo_config)/$backup_config_filename
-fi
-
-echo "    generating cargo config at $generated_cargo_config"
-
-mkdir -p $(dirname $generated_cargo_config)
-
-awk -v SA_NDK=$output_dir -v SCRIPT_DIR=$PWD 'BEGIN{
-
-printf "#auto-generated by build-ndk-standalone.sh\n\n"
-
-printf "[target.i686-linux-android]\n"
-printf "ar = \"%s/%s/x86/bin/i686-linux-android-ar\"\n", SCRIPT_DIR, SA_NDK
-printf "linker = \"%s/%s/x86/bin/i686-linux-android-clang\"\n\n", SCRIPT_DIR, SA_NDK
-
-printf "[target.armv7-linux-androideabi]\n"
-printf "ar = \"%s/%s/arm/bin/arm-linux-androideabi-ar\"\n", SCRIPT_DIR, SA_NDK
-printf "linker = \"%s/%s/arm/bin/arm-linux-androideabi-clang\"\n\n", SCRIPT_DIR, SA_NDK
-
-printf "[target.aarch64-linux-android]\n"
-printf "ar = \"%s/%s/arm64/bin/aarch64-linux-android-ar\"\n", SCRIPT_DIR, SA_NDK
-printf "linker = \"%s/%s/arm64/bin/aarch64-linux-android-clang\"\n\n", SCRIPT_DIR, SA_NDK
-
-}' > $generated_cargo_config
-
-echo "Done"
-
-
diff --git a/zcash-android-wallet-app/zcash-android-welding/build-rust.sh b/zcash-android-wallet-app/zcash-android-welding/build-rust.sh
deleted file mode 100755
index ae756b9..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/build-rust.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/zsh
-
-# check for cargo installation
-if ! type -p ~/.cargo/bin/cargo > /dev/null; then
-	echo "Cargo appears to be missing.\nTry installing it with the following command:\n    curl https://sh.rustup.rs -sSf | sh"
-	echo "and then run this script again."
-	exit 1
-fi
-echo "Cargo found!"
-
-# check for android targets
-installed_android_target_count=$(~/.cargo/bin/rustup target list | grep android | grep installed | wc -l)
-if [ "$installed_android_target_count" -lt "3" ]; then
-	echo "The android targets do not appear to be installed."
-        echo "attempting to install them...\n    ~/.cargo/bin/rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android"
-	~/.cargo/bin/rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android
-	[[ $(~/.cargo/bin/rustup target list | grep android | grep installed | wc -l) -lt 3 ]] && echo "install failed. Aborting!" && exit 1
-	echo "Done."
-fi
-
-echo "Android targets found!" 
-
-# check for standalone  NDK
-./build-ndk-standalone.sh
-
-
-echo "Building..."
-cargo build --target aarch64-linux-android --release
-cargo build --target i686-linux-android --release
-cargo build --target armv7-linux-androideabi --release
-
-echo "Done."
diff --git a/zcash-android-wallet-app/zcash-android-welding/build.gradle.kts b/zcash-android-wallet-app/zcash-android-welding/build.gradle.kts
deleted file mode 100644
index 2f25676..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/build.gradle.kts
+++ /dev/null
@@ -1,41 +0,0 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
-
-apply(from = "custom-tasks.gradle.kts")
-
-plugins {
-    id("com.android.library")
-    id("kotlin-android-extensions")
-    id("kotlin-android")
-}
-
-android {
-    compileSdkVersion(28)
-
-    defaultConfig {
-        minSdkVersion(16)
-        targetSdkVersion(28)
-        versionCode = 1
-        versionName = "1.0"
-        testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
-        }
-    }
-
-    sourceSets["main"].java.srcDirs("build/generated/source/wire")
-}
-
-dependencies {
-    api("com.squareup.wire:wire-runtime:2.2.0")
-
-    implementation(kotlin("stdlib-jdk7", KotlinCompilerVersion.VERSION))
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-    implementation("com.android.support:appcompat-v7:28.0.0")
-    testImplementation("junit:junit:4.12")
-    androidTestImplementation("com.android.support.test:runner:1.0.2")
-    androidTestImplementation("com.android.support.test.espresso:espresso-core:3.0.2")
-}
\ No newline at end of file
diff --git a/zcash-android-wallet-app/zcash-android-welding/custom-tasks.gradle.kts b/zcash-android-wallet-app/zcash-android-welding/custom-tasks.gradle.kts
deleted file mode 100644
index e2d52c3..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/custom-tasks.gradle.kts
+++ /dev/null
@@ -1,64 +0,0 @@
-val protoSrcDir = "src/main/proto"
-val protoDestDir = "build/generated/source/wire"
-val jniSrcDir = "src/main/rust"
-val jniDestDir = "build/rust/target"
-
-
-fun fileTreeWith(dir: String, vararg include: String): ConfigurableFileTree {
-    return fileTree(mapOf("dir" to dir, "include" to include))
-}
-
-buildscript {
-    dependencies {
-        classpath("com.squareup.wire:wire-compiler:2.2.0")
-    }
-
-    repositories {
-        mavenCentral()
-    }
-
-}
-
-val generateProtobufClasses: TaskProvider<Task> = tasks.register("generateProtobufClasses").apply {
-    configure {
-        doFirst {
-            println("**** CREATING PROTOS ****")
-            delete(protoDestDir)
-            mkdir(protoDestDir)
-        }
-        description = "Generate Java classes from protocol buffer (.proto) schema files for use with Square's Wire library"
-
-        fileTreeWith(protoSrcDir, "**/*.proto").forEach { file ->
-            doLast {
-                javaexec {
-                    main = "com.squareup.wire.WireCompiler"
-                    classpath = buildscript.configurations.getByName("classpath")
-                    args = listOf("--proto_path=$protoSrcDir", "--java_out=$protoDestDir", file.path)
-                }
-            }
-        }
-        inputs.files(fileTreeWith(protoSrcDir, "**/*.proto"))
-        outputs.files(fileTreeWith(protoDestDir, "**"))
-    }
-}
-
-val generateJniLibs: TaskProvider<Task> = tasks.register("generateJniLibs").apply {
-    configure {
-        doFirst {
-            println("**** CREATING JNI LIBS ****")
-            delete(jniDestDir)
-            mkdir(jniDestDir)
-        }
-        description = "Generate *.so files for connecting to the Rust wallet logic through the JNI"
-        doLast {
-            exec {
-                commandLine("./build-rust.sh")
-            }
-        }
-        inputs.files(fileTreeWith(jniSrcDir, "**/*"))
-        outputs.files(fileTreeWith(jniDestDir, "**/*.so"))
-    }
-}
-
-tasks["preBuild"]!!.dependsOn(generateProtobufClasses)
-tasks["preBuild"]!!.dependsOn(generateJniLibs)
diff --git a/zcash-android-wallet-app/zcash-android-welding/proguard-rules.pro b/zcash-android-wallet-app/zcash-android-welding/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/zcash-android-wallet-app/zcash-android-welding/src/androidTest/java/cash/z/wallet/sdk/ExampleInstrumentedTest.java b/zcash-android-wallet-app/zcash-android-welding/src/androidTest/java/cash/z/wallet/sdk/ExampleInstrumentedTest.java
deleted file mode 100644
index 3a330ad..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/src/androidTest/java/cash/z/wallet/sdk/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cash.z.wallet.sdk;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-	@Test
-	public void useAppContext() {
-		// Context of the app under test.
-		Context appContext = InstrumentationRegistry.getTargetContext();
-
-		assertEquals("cash.z.wallet.sdk.test", appContext.getPackageName());
-	}
-}
diff --git a/zcash-android-wallet-app/zcash-android-welding/src/main/AndroidManifest.xml b/zcash-android-wallet-app/zcash-android-welding/src/main/AndroidManifest.xml
deleted file mode 100644
index fdcda29..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="cash.z.wallet.sdk"/>
diff --git a/zcash-android-wallet-app/zcash-android-welding/src/main/java/cash/z/wallet/sdk/jni/JniConverter.kt b/zcash-android-wallet-app/zcash-android-welding/src/main/java/cash/z/wallet/sdk/jni/JniConverter.kt
deleted file mode 100644
index df460df..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/src/main/java/cash/z/wallet/sdk/jni/JniConverter.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package cash.z.wallet.sdk.jni
-
-class JniConverter {
-
-    external fun getMagicInt(value: String): Int
-
-    external fun sendComplexData(walletData: ByteArray): Int
-
-    companion object {
-        init {
-            System.loadLibrary("zcashwalletsdk")
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/zcash-android-wallet-app/zcash-android-welding/src/main/jniLibs/arm64-v8a/libzcashwalletsdk.so b/zcash-android-wallet-app/zcash-android-welding/src/main/jniLibs/arm64-v8a/libzcashwalletsdk.so
deleted file mode 120000
index 59f9952..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/src/main/jniLibs/arm64-v8a/libzcashwalletsdk.so
+++ /dev/null
@@ -1 +0,0 @@
-../../../../build/rust/target/aarch64-linux-android/release/libzcashwalletsdk.so
\ No newline at end of file
diff --git a/zcash-android-wallet-app/zcash-android-welding/src/main/jniLibs/armeabi-v7a/libzcashwalletsdk.so b/zcash-android-wallet-app/zcash-android-welding/src/main/jniLibs/armeabi-v7a/libzcashwalletsdk.so
deleted file mode 120000
index 8777ab3..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/src/main/jniLibs/armeabi-v7a/libzcashwalletsdk.so
+++ /dev/null
@@ -1 +0,0 @@
-../../../../build/rust/target/armv7-linux-androideabi/release/libzcashwalletsdk.so
\ No newline at end of file
diff --git a/zcash-android-wallet-app/zcash-android-welding/src/main/jniLibs/x86/libzcashwalletsdk.so b/zcash-android-wallet-app/zcash-android-welding/src/main/jniLibs/x86/libzcashwalletsdk.so
deleted file mode 120000
index 966a199..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/src/main/jniLibs/x86/libzcashwalletsdk.so
+++ /dev/null
@@ -1 +0,0 @@
-../../../../build/rust/target/i686-linux-android/release/libzcashwalletsdk.so
\ No newline at end of file
diff --git a/zcash-android-wallet-app/zcash-android-welding/src/main/proto/WalletData.proto b/zcash-android-wallet-app/zcash-android-welding/src/main/proto/WalletData.proto
deleted file mode 100644
index e69384c..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/src/main/proto/WalletData.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-package cash.z.wallet.sdk.proto;
-message WalletData {
-  required string name = 1;
-  required int32 id = 2;
-  optional string emails = 3;
-}
\ No newline at end of file
diff --git a/zcash-android-wallet-app/zcash-android-welding/src/main/res/values/strings.xml b/zcash-android-wallet-app/zcash-android-welding/src/main/res/values/strings.xml
deleted file mode 100644
index 2ecbf2e..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="sdk_test_message">Library linking is working!</string>
-</resources>
diff --git a/zcash-android-wallet-app/zcash-android-welding/src/main/rust/lib.rs b/zcash-android-wallet-app/zcash-android-welding/src/main/rust/lib.rs
deleted file mode 100644
index 331c3e7..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/src/main/rust/lib.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use std::os::raw::{c_char, c_int};
-
-/// For now, this just returns a magic number
-#[no_mangle]
-pub extern "C" fn test_response(input: *const c_char) -> c_int {
-    let magic_number = 42;
-    magic_number
-}
-
-/// JNI interface
-#[cfg(target_os="android")]
-#[allow(non_snake_case)]
-pub mod android {
-    extern crate jni;
-
-    use super::*;
-    use self::jni::JNIEnv;
-    use self::jni::objects::{JClass, JString};
-    use self::jni::sys::*;
-
-    #[no_mangle]
-    pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getMagicInt(env: JNIEnv, _: JClass, test_input: JString) -> jint {
-        let jvm_text = env.get_string(test_input).expect("unable to find text for test input");
-        test_response(jvm_text.as_ptr())
-    }
-
-    #[no_mangle]
-    pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_sendComplexData(env: JNIEnv, _: JClass, wallet_data: jbyteArray) -> jint {
-        let bytes = env.convert_byte_array(wallet_data);
-        bytes.unwrap().len() as i32
-    }
-}
-
-
-
diff --git a/zcash-android-wallet-app/zcash-android-welding/src/test/java/cash/z/wallet/sdk/ExampleUnitTest.java b/zcash-android-wallet-app/zcash-android-welding/src/test/java/cash/z/wallet/sdk/ExampleUnitTest.java
deleted file mode 100644
index e335846..0000000
--- a/zcash-android-wallet-app/zcash-android-welding/src/test/java/cash/z/wallet/sdk/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cash.z.wallet.sdk;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-	@Test
-	public void addition_isCorrect() {
-		assertEquals(4, 2 + 2);
-	}
-}
\ No newline at end of file