diff --git a/MasterPassword/Java/.gitignore b/MasterPassword/Java/.gitignore
index aa2d97a7..b76a4699 100644
--- a/MasterPassword/Java/.gitignore
+++ b/MasterPassword/Java/.gitignore
@@ -1,2 +1,8 @@
+# Gradle
+build
+.gradle
+local.properties
+
+# Maven
 target
 dependency-reduced-pom.xml
diff --git a/MasterPassword/Java/build.gradle b/MasterPassword/Java/build.gradle
new file mode 100644
index 00000000..f69dfc8d
--- /dev/null
+++ b/MasterPassword/Java/build.gradle
@@ -0,0 +1,35 @@
+allprojects    {
+    apply plugin: 'maven'
+    //apply plugin: 'findbugs'
+
+    group = 'com.lyndir.masterpassword'
+    version = 'GIT-SNAPSHOT'
+
+    tasks.withType(JavaCompile) {
+        sourceCompatibility = "1.7"
+        targetCompatibility = "1.7"
+    }
+    tasks.withType(FindBugs) {
+        reports {
+            xml.enabled false
+            html.enabled true
+        }
+    }
+}
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath group: 'com.android.tools.build', name: 'gradle', version: '2.2.3'
+    }
+}
+
+subprojects {
+    repositories {
+        mavenCentral()
+        maven { url "http://maven.lyndir.com" }
+    }
+}
diff --git a/MasterPassword/Java/gradle.properties b/MasterPassword/Java/gradle.properties
new file mode 100644
index 00000000..8bd86f68
--- /dev/null
+++ b/MasterPassword/Java/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx1536M
diff --git a/MasterPassword/Java/gradle/wrapper/gradle-wrapper.jar b/MasterPassword/Java/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..6ffa2378
Binary files /dev/null and b/MasterPassword/Java/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/MasterPassword/Java/gradle/wrapper/gradle-wrapper.properties b/MasterPassword/Java/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..220dc3d9
--- /dev/null
+++ b/MasterPassword/Java/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Feb 06 10:38:22 EST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
diff --git a/MasterPassword/Java/gradlew b/MasterPassword/Java/gradlew
new file mode 100755
index 00000000..9aa616c2
--- /dev/null
+++ b/MasterPassword/Java/gradlew
@@ -0,0 +1,169 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/MasterPassword/Java/gradlew.bat b/MasterPassword/Java/gradlew.bat
new file mode 100644
index 00000000..e95643d6
--- /dev/null
+++ b/MasterPassword/Java/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/MasterPassword/Java/masterpassword-algorithm/build.gradle b/MasterPassword/Java/masterpassword-algorithm/build.gradle
new file mode 100644
index 00000000..edc54e16
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-algorithm/build.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'java'
+
+description = 'Master Password Algorithm Implementation'
+
+dependencies {
+    compile( 'com.lyndir.lhunath.opal:opal-system:1.6-p9' ) {
+        exclude( module: 'joda-time' )
+    }
+    compile 'com.lambdaworks:scrypt:1.4.0'
+    compile 'org.jetbrains:annotations:13.0'
+    compile 'com.google.code.findbugs:jsr305:3.0.1'
+}
diff --git a/MasterPassword/Java/masterpassword-android/AndroidManifest.xml b/MasterPassword/Java/masterpassword-android/AndroidManifest.xml
deleted file mode 100644
index 948c49eb..00000000
--- a/MasterPassword/Java/masterpassword-android/AndroidManifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.lyndir.masterpassword"
-          android:versionCode="2003"
-          android:versionName="2.3">
-
-    <uses-sdk
-            android:minSdkVersion="19"
-            android:targetSdkVersion="21" />
-
-    <application
-            android:icon="@drawable/icon"
-            android:label="@string/app_name"
-            android:allowBackup="true"
-            android:debuggable="true">
-        <activity android:name=".EmergencyActivity" android:theme="@style/MPTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name=".TestActivity" android:theme="@style/MPTheme" />
-    </application>
-    
-</manifest>
-
diff --git a/MasterPassword/Java/masterpassword-android/build.gradle b/MasterPassword/Java/masterpassword-android/build.gradle
new file mode 100644
index 00000000..4aed8a5c
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-android/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.0"
+
+    defaultConfig {
+        applicationId "com.lyndir.masterpassword"
+        minSdkVersion 19
+        targetSdkVersion 25
+        versionCode 2003
+        versionName "2.3"
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+}
+
+dependencies {
+    compile project( ':masterpassword-algorithm' )
+    compile project( ':masterpassword-tests' )
+    compile 'com.android.support:appcompat-v7:25.1.1'
+    compile 'com.jakewharton:butterknife:8.5.1'
+    compile 'com.lambdaworks:scrypt:1.4.0-android'
+    compile 'org.slf4j:slf4j-android:1.7.13-underscore'
+}
diff --git a/MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/BuildConfig.java b/MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/BuildConfig.java
deleted file mode 100644
index 2bfb61e8..00000000
--- a/MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/BuildConfig.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/*___Generated_by_IDEA___*/
-
-package com.lyndir.masterpassword;
-
-/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
-public final class BuildConfig {
-  public final static boolean DEBUG = Boolean.parseBoolean(null);
-}
\ No newline at end of file
diff --git a/MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/Manifest.java b/MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/Manifest.java
deleted file mode 100644
index 6ba03ae6..00000000
--- a/MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/Manifest.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/*___Generated_by_IDEA___*/
-
-package com.lyndir.masterpassword;
-
-/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
-public final class Manifest {
-}
diff --git a/MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/R.java b/MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/R.java
deleted file mode 100644
index 550daf6c..00000000
--- a/MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/R.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/*___Generated_by_IDEA___*/
-
-package com.lyndir.masterpassword;
-
-/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
-public final class R {
-}
diff --git a/MasterPassword/Java/masterpassword-android/src/main/AndroidManifest.xml b/MasterPassword/Java/masterpassword-android/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..f19a1e01
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-android/src/main/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.lyndir.masterpassword">
+
+    <application
+            android:allowBackup="true"
+            android:icon="@drawable/icon"
+            android:label="@string/app_name">
+        <activity
+                android:name=".EmergencyActivity"
+                android:theme="@style/MPTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+                android:name=".TestActivity"
+                android:theme="@style/MPTheme" />
+        <activity android:name=".MainActivity">
+        </activity>
+    </application>
+
+</manifest>
diff --git a/MasterPassword/Java/masterpassword-android/assets/Exo2.0-Bold.otf b/MasterPassword/Java/masterpassword-android/src/main/assets/Exo2.0-Bold.otf
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/assets/Exo2.0-Bold.otf
rename to MasterPassword/Java/masterpassword-android/src/main/assets/Exo2.0-Bold.otf
diff --git a/MasterPassword/Java/masterpassword-android/assets/Exo2.0-ExtraBold.otf b/MasterPassword/Java/masterpassword-android/src/main/assets/Exo2.0-ExtraBold.otf
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/assets/Exo2.0-ExtraBold.otf
rename to MasterPassword/Java/masterpassword-android/src/main/assets/Exo2.0-ExtraBold.otf
diff --git a/MasterPassword/Java/masterpassword-android/assets/Exo2.0-Regular.otf b/MasterPassword/Java/masterpassword-android/src/main/assets/Exo2.0-Regular.otf
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/assets/Exo2.0-Regular.otf
rename to MasterPassword/Java/masterpassword-android/src/main/assets/Exo2.0-Regular.otf
diff --git a/MasterPassword/Java/masterpassword-android/assets/Exo2.0-Thin.otf b/MasterPassword/Java/masterpassword-android/src/main/assets/Exo2.0-Thin.otf
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/assets/Exo2.0-Thin.otf
rename to MasterPassword/Java/masterpassword-android/src/main/assets/Exo2.0-Thin.otf
diff --git a/MasterPassword/Java/masterpassword-android/assets/SourceCodePro-Black.otf b/MasterPassword/Java/masterpassword-android/src/main/assets/SourceCodePro-Black.otf
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/assets/SourceCodePro-Black.otf
rename to MasterPassword/Java/masterpassword-android/src/main/assets/SourceCodePro-Black.otf
diff --git a/MasterPassword/Java/masterpassword-android/assets/SourceCodePro-ExtraLight.otf b/MasterPassword/Java/masterpassword-android/src/main/assets/SourceCodePro-ExtraLight.otf
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/assets/SourceCodePro-ExtraLight.otf
rename to MasterPassword/Java/masterpassword-android/src/main/assets/SourceCodePro-ExtraLight.otf
diff --git a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/EmergencyActivity.java b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/EmergencyActivity.java
index 43706f74..981a1908 100644
--- a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/EmergencyActivity.java
+++ b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/EmergencyActivity.java
@@ -13,8 +13,8 @@ import android.text.method.PasswordTransformationMethod;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.*;
+import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.UnsignedInteger;
@@ -40,40 +40,40 @@ public class EmergencyActivity extends Activity {
 
     private ListenableFuture<MasterKey> masterKeyFuture;
 
-    @InjectView(R.id.progressView)
+    @BindView(R.id.progressView)
     ProgressBar progressView;
 
-    @InjectView(R.id.fullNameField)
+    @BindView(R.id.fullNameField)
     EditText fullNameField;
 
-    @InjectView(R.id.masterPasswordField)
+    @BindView(R.id.masterPasswordField)
     EditText masterPasswordField;
 
-    @InjectView(R.id.siteNameField)
+    @BindView(R.id.siteNameField)
     EditText siteNameField;
 
-    @InjectView(R.id.siteTypeButton)
+    @BindView(R.id.siteTypeButton)
     Button siteTypeButton;
 
-    @InjectView(R.id.counterField)
+    @BindView(R.id.counterField)
     Button siteCounterButton;
 
-    @InjectView(R.id.siteVersionButton)
+    @BindView(R.id.siteVersionButton)
     Button siteVersionButton;
 
-    @InjectView(R.id.sitePasswordField)
+    @BindView(R.id.sitePasswordField)
     Button sitePasswordField;
 
-    @InjectView(R.id.sitePasswordTip)
+    @BindView(R.id.sitePasswordTip)
     TextView sitePasswordTip;
 
-    @InjectView(R.id.rememberFullNameField)
+    @BindView(R.id.rememberFullNameField)
     CheckBox rememberFullNameField;
 
-    @InjectView(R.id.rememberPasswordField)
+    @BindView(R.id.rememberPasswordField)
     CheckBox forgetPasswordField;
 
-    @InjectView(R.id.maskPasswordField)
+    @BindView(R.id.maskPasswordField)
     CheckBox maskPasswordField;
 
     private int    id_userName;
@@ -92,7 +92,7 @@ public class EmergencyActivity extends Activity {
 
         getWindow().setFlags( WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE );
         setContentView( R.layout.activity_emergency );
-        ButterKnife.inject( this );
+        ButterKnife.bind( this );
 
         fullNameField.setOnFocusChangeListener( new ValueChangedListener() {
             @Override
diff --git a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/TestActivity.java b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/TestActivity.java
index d344d475..a54753e4 100644
--- a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/TestActivity.java
+++ b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/TestActivity.java
@@ -8,8 +8,8 @@ import android.content.Intent;
 import android.os.*;
 import android.view.View;
 import android.widget.*;
+import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
 import com.google.common.base.*;
 import com.google.common.collect.*;
 import com.google.common.util.concurrent.*;
@@ -27,19 +27,19 @@ public class TestActivity extends Activity implements MPTestSuite.Listener {
     private final ListeningExecutorService backgroundExecutor = MoreExecutors.listeningDecorator( Executors.newSingleThreadExecutor() );
     private final ListeningExecutorService mainExecutor       = MoreExecutors.listeningDecorator( new MainThreadExecutor() );
 
-    @InjectView(R.id.progressView)
+    @BindView(R.id.progressView)
     ProgressBar progressView;
 
-    @InjectView(R.id.statusView)
+    @BindView(R.id.statusView)
     TextView statusView;
 
-    @InjectView(R.id.logView)
+    @BindView(R.id.logView)
     TextView logView;
 
-    @InjectView(R.id.actionButton)
+    @BindView(R.id.actionButton)
     Button actionButton;
 
-    @InjectView(R.id.nativeKDFField)
+    @BindView(R.id.nativeKDFField)
     CheckBox nativeKDFField;
 
     private MPTestSuite               testSuite;
@@ -57,7 +57,7 @@ public class TestActivity extends Activity implements MPTestSuite.Listener {
         Res.init( getResources() );
 
         setContentView( R.layout.activity_test );
-        ButterKnife.inject( this );
+        ButterKnife.bind( this );
 
         nativeKDFField.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
             @Override
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/background.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/background.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/background.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/background.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/icon.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/icon.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/icon.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/icon.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/icon_gears.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/icon_gears.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/icon_gears.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/icon_gears.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/icon_key.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/icon_key.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/icon_key.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/icon_key.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/icon_plus.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/icon_plus.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/icon_plus.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/icon_plus.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/img_identity.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/img_identity.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/img_identity.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/img_identity.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/img_key.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/img_key.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/img_key.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/img_key.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/img_stats.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/img_stats.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/img_stats.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-mdpi/img_stats.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/background.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/background.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/background.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/background.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/icon.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/icon.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/icon.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/icon.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/icon_gears.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/icon_gears.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/icon_gears.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/icon_gears.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/icon_key.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/icon_key.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/icon_key.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/icon_key.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/icon_plus.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/icon_plus.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/icon_plus.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/icon_plus.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/img_identity.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/img_identity.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/img_identity.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/img_identity.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/img_key.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/img_key.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/img_key.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/img_key.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/img_stats.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/img_stats.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/img_stats.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-xhdpi/img_stats.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-xxxhdpi/background.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-xxxhdpi/background.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-xxxhdpi/background.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-xxxhdpi/background.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-xxxhdpi/icon.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable-xxxhdpi/icon.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-xxxhdpi/icon.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable-xxxhdpi/icon.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable/divider.png b/MasterPassword/Java/masterpassword-android/src/main/res/drawable/divider.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable/divider.png
rename to MasterPassword/Java/masterpassword-android/src/main/res/drawable/divider.png
diff --git a/MasterPassword/Java/masterpassword-android/res/layout/activity_emergency.xml b/MasterPassword/Java/masterpassword-android/src/main/res/layout/activity_emergency.xml
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/layout/activity_emergency.xml
rename to MasterPassword/Java/masterpassword-android/src/main/res/layout/activity_emergency.xml
diff --git a/MasterPassword/Java/masterpassword-android/res/layout/activity_test.xml b/MasterPassword/Java/masterpassword-android/src/main/res/layout/activity_test.xml
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/layout/activity_test.xml
rename to MasterPassword/Java/masterpassword-android/src/main/res/layout/activity_test.xml
diff --git a/MasterPassword/Java/masterpassword-android/res/layout/spinner_item.xml b/MasterPassword/Java/masterpassword-android/src/main/res/layout/spinner_item.xml
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/layout/spinner_item.xml
rename to MasterPassword/Java/masterpassword-android/src/main/res/layout/spinner_item.xml
diff --git a/MasterPassword/Java/masterpassword-android/res/values/strings.xml b/MasterPassword/Java/masterpassword-android/src/main/res/values/strings.xml
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/values/strings.xml
rename to MasterPassword/Java/masterpassword-android/src/main/res/values/strings.xml
diff --git a/MasterPassword/Java/masterpassword-android/res/values/styles.xml b/MasterPassword/Java/masterpassword-android/src/main/res/values/styles.xml
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/values/styles.xml
rename to MasterPassword/Java/masterpassword-android/src/main/res/values/styles.xml
diff --git a/MasterPassword/Java/masterpassword-cli/build.gradle b/MasterPassword/Java/masterpassword-cli/build.gradle
new file mode 100644
index 00000000..41a2f099
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-cli/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    id 'java'
+    id 'application'
+    id 'com.github.johnrengelman.shadow' version '1.2.4'
+}
+
+description = 'Master Password CLI'
+mainClassName = 'com.lyndir.masterpassword.CLI'
+
+dependencies {
+    compile project(':masterpassword-algorithm')
+
+    compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'
+}
diff --git a/MasterPassword/Java/masterpassword-gui/build.gradle b/MasterPassword/Java/masterpassword-gui/build.gradle
new file mode 100644
index 00000000..867ec31d
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-gui/build.gradle
@@ -0,0 +1,15 @@
+plugins {
+    id 'java'
+    id 'application'
+    id 'com.github.johnrengelman.shadow' version '1.2.4'
+}
+
+description = 'Master Password GUI'
+mainClassName = 'com.lyndir.masterpassword.gui.GUI'
+
+dependencies {
+    compile project(':masterpassword-model')
+
+    compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'
+    compile group: 'com.yuvimasory', name: 'orange-extensions', version:'1.3.0'
+}
diff --git a/MasterPassword/Java/masterpassword-model/build.gradle b/MasterPassword/Java/masterpassword-model/build.gradle
new file mode 100644
index 00000000..4b513baa
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-model/build.gradle
@@ -0,0 +1,19 @@
+plugins {
+    id 'java'
+    id 'net.ltgt.apt' version '0.9'
+}
+
+description = 'Master Password Site Model'
+
+dependencies {
+    compile     project(':masterpassword-algorithm')
+
+    compile     group: 'joda-time', name: 'joda-time', version:'2.4'
+
+    compileOnly group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
+    apt         group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
+
+    testCompile group: 'org.testng', name: 'testng', version:'6.8.5'
+    testCompile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'
+}
+test.useTestNG()
diff --git a/MasterPassword/Java/masterpassword-tests/build.gradle b/MasterPassword/Java/masterpassword-tests/build.gradle
new file mode 100644
index 00000000..8d9ff652
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-tests/build.gradle
@@ -0,0 +1,11 @@
+apply plugin: 'java'
+
+description = 'Master Password Test Suite'
+
+dependencies {
+    compile project(':masterpassword-algorithm')
+
+    testCompile group: 'org.testng', name: 'testng', version:'6.8.5'
+    testCompile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'
+}
+test.useTestNG()
diff --git a/MasterPassword/Java/settings.gradle b/MasterPassword/Java/settings.gradle
new file mode 100644
index 00000000..af5962e5
--- /dev/null
+++ b/MasterPassword/Java/settings.gradle
@@ -0,0 +1,7 @@
+rootProject.name = 'masterpassword'
+include ':masterpassword-tests'
+include ':masterpassword-algorithm'
+include ':masterpassword-model'
+include ':masterpassword-cli'
+include ':masterpassword-gui'
+include ':masterpassword-android'