diff --git a/.gitignore b/.gitignore
index 1e967e2..b94479b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ target/
 obj/
 build/
 .gradle/
+local.properties
diff --git a/android/.gitignore b/android/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/android/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/android/build.gradle b/android/build.gradle
new file mode 100644
index 0000000..26ff498
--- /dev/null
+++ b/android/build.gradle
@@ -0,0 +1,94 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.0.0'
+    }
+}
+
+apply plugin: 'com.android.library'
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+archivesBaseName = "curve25519-android"
+version          = version_number
+group            = group_info
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
+
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs']
+        }
+    }
+
+    libraryVariants.all { variant ->
+        variant.outputs.each { output ->
+            def outputFile = output.outputFile
+            if (outputFile != null && outputFile.name.endsWith('.aar')) {
+                def fileName = "${archivesBaseName}-${version}.aar"
+                output.outputFile = new File(outputFile.parent, fileName)
+            }
+        }
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile project(':java')
+
+    androidTestCompile project(":tests")
+}
+
+signing {
+    required { has("release") && gradle.taskGraph.hasTask("uploadArchives") }
+    sign configurations.archives
+}
+
+uploadArchives {
+    configuration = configurations.archives
+    repositories.mavenDeployer {
+        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+        repository(url: sonatypeRepo) {
+            authentication(userName: whisperSonatypeUsername, password: whisperSonatypePassword)
+        }
+
+        pom.project {
+            name 'curve25519-android'
+            packaging 'aar'
+            description 'Curve25519 library for Android'
+            url 'https://github.com/WhisperSystems/curve25519-java'
+
+            scm {
+                url 'scm:git@github.com:WhisperSystems/curve25519-java.git'
+                connection 'scm:git@github.com:WhisperSystems/curve25519-java.git'
+                developerConnection 'scm:git@github.com:WhisperSystems/curve25519-java.git'
+            }
+
+            developers {
+                developer {
+                    name 'Trevor Perrin'
+                    name 'Moxie Marlinspike'
+                }
+            }
+        }
+    }
+}
+
+task installArchives(type: Upload) {
+    description "Installs the artifacts to the local Maven repository."
+    configuration = configurations['archives']
+    repositories {
+        mavenDeployer {
+            repository url: "file://${System.properties['user.home']}/.m2/repository"
+        }
+    }
+}
diff --git a/jni/Android.mk b/android/jni/Android.mk
similarity index 100%
rename from jni/Android.mk
rename to android/jni/Android.mk
diff --git a/jni/Application.mk b/android/jni/Application.mk
similarity index 100%
rename from jni/Application.mk
rename to android/jni/Application.mk
diff --git a/jni/curve25519-donna.c b/android/jni/curve25519-donna.c
similarity index 100%
rename from jni/curve25519-donna.c
rename to android/jni/curve25519-donna.c
diff --git a/jni/curve25519-donna.h b/android/jni/curve25519-donna.h
similarity index 100%
rename from jni/curve25519-donna.h
rename to android/jni/curve25519-donna.h
diff --git a/jni/curve25519-jni.c b/android/jni/curve25519-jni.c
similarity index 100%
rename from jni/curve25519-jni.c
rename to android/jni/curve25519-jni.c
diff --git a/jni/ed25519/additions/compare.c b/android/jni/ed25519/additions/compare.c
similarity index 100%
rename from jni/ed25519/additions/compare.c
rename to android/jni/ed25519/additions/compare.c
diff --git a/jni/ed25519/additions/compare.h b/android/jni/ed25519/additions/compare.h
similarity index 100%
rename from jni/ed25519/additions/compare.h
rename to android/jni/ed25519/additions/compare.h
diff --git a/jni/ed25519/additions/crypto_hash_sha512.h b/android/jni/ed25519/additions/crypto_hash_sha512.h
similarity index 100%
rename from jni/ed25519/additions/crypto_hash_sha512.h
rename to android/jni/ed25519/additions/crypto_hash_sha512.h
diff --git a/jni/ed25519/additions/curve_sigs.c b/android/jni/ed25519/additions/curve_sigs.c
similarity index 100%
rename from jni/ed25519/additions/curve_sigs.c
rename to android/jni/ed25519/additions/curve_sigs.c
diff --git a/jni/ed25519/additions/curve_sigs.h b/android/jni/ed25519/additions/curve_sigs.h
similarity index 100%
rename from jni/ed25519/additions/curve_sigs.h
rename to android/jni/ed25519/additions/curve_sigs.h
diff --git a/jni/ed25519/additions/sign_modified.c b/android/jni/ed25519/additions/sign_modified.c
similarity index 100%
rename from jni/ed25519/additions/sign_modified.c
rename to android/jni/ed25519/additions/sign_modified.c
diff --git a/jni/ed25519/additions/zeroize.c b/android/jni/ed25519/additions/zeroize.c
similarity index 100%
rename from jni/ed25519/additions/zeroize.c
rename to android/jni/ed25519/additions/zeroize.c
diff --git a/jni/ed25519/additions/zeroize.h b/android/jni/ed25519/additions/zeroize.h
similarity index 100%
rename from jni/ed25519/additions/zeroize.h
rename to android/jni/ed25519/additions/zeroize.h
diff --git a/jni/ed25519/api.h b/android/jni/ed25519/api.h
similarity index 100%
rename from jni/ed25519/api.h
rename to android/jni/ed25519/api.h
diff --git a/jni/ed25519/base.h b/android/jni/ed25519/base.h
similarity index 100%
rename from jni/ed25519/base.h
rename to android/jni/ed25519/base.h
diff --git a/jni/ed25519/base2.h b/android/jni/ed25519/base2.h
similarity index 100%
rename from jni/ed25519/base2.h
rename to android/jni/ed25519/base2.h
diff --git a/jni/ed25519/d.h b/android/jni/ed25519/d.h
similarity index 100%
rename from jni/ed25519/d.h
rename to android/jni/ed25519/d.h
diff --git a/jni/ed25519/d2.h b/android/jni/ed25519/d2.h
similarity index 100%
rename from jni/ed25519/d2.h
rename to android/jni/ed25519/d2.h
diff --git a/jni/ed25519/fe.h b/android/jni/ed25519/fe.h
similarity index 100%
rename from jni/ed25519/fe.h
rename to android/jni/ed25519/fe.h
diff --git a/jni/ed25519/fe_0.c b/android/jni/ed25519/fe_0.c
similarity index 100%
rename from jni/ed25519/fe_0.c
rename to android/jni/ed25519/fe_0.c
diff --git a/jni/ed25519/fe_1.c b/android/jni/ed25519/fe_1.c
similarity index 100%
rename from jni/ed25519/fe_1.c
rename to android/jni/ed25519/fe_1.c
diff --git a/jni/ed25519/fe_add.c b/android/jni/ed25519/fe_add.c
similarity index 100%
rename from jni/ed25519/fe_add.c
rename to android/jni/ed25519/fe_add.c
diff --git a/jni/ed25519/fe_cmov.c b/android/jni/ed25519/fe_cmov.c
similarity index 100%
rename from jni/ed25519/fe_cmov.c
rename to android/jni/ed25519/fe_cmov.c
diff --git a/jni/ed25519/fe_copy.c b/android/jni/ed25519/fe_copy.c
similarity index 100%
rename from jni/ed25519/fe_copy.c
rename to android/jni/ed25519/fe_copy.c
diff --git a/jni/ed25519/fe_frombytes.c b/android/jni/ed25519/fe_frombytes.c
similarity index 100%
rename from jni/ed25519/fe_frombytes.c
rename to android/jni/ed25519/fe_frombytes.c
diff --git a/jni/ed25519/fe_invert.c b/android/jni/ed25519/fe_invert.c
similarity index 100%
rename from jni/ed25519/fe_invert.c
rename to android/jni/ed25519/fe_invert.c
diff --git a/jni/ed25519/fe_isnegative.c b/android/jni/ed25519/fe_isnegative.c
similarity index 100%
rename from jni/ed25519/fe_isnegative.c
rename to android/jni/ed25519/fe_isnegative.c
diff --git a/jni/ed25519/fe_isnonzero.c b/android/jni/ed25519/fe_isnonzero.c
similarity index 100%
rename from jni/ed25519/fe_isnonzero.c
rename to android/jni/ed25519/fe_isnonzero.c
diff --git a/jni/ed25519/fe_mul.c b/android/jni/ed25519/fe_mul.c
similarity index 100%
rename from jni/ed25519/fe_mul.c
rename to android/jni/ed25519/fe_mul.c
diff --git a/jni/ed25519/fe_neg.c b/android/jni/ed25519/fe_neg.c
similarity index 100%
rename from jni/ed25519/fe_neg.c
rename to android/jni/ed25519/fe_neg.c
diff --git a/jni/ed25519/fe_pow22523.c b/android/jni/ed25519/fe_pow22523.c
similarity index 100%
rename from jni/ed25519/fe_pow22523.c
rename to android/jni/ed25519/fe_pow22523.c
diff --git a/jni/ed25519/fe_sq.c b/android/jni/ed25519/fe_sq.c
similarity index 100%
rename from jni/ed25519/fe_sq.c
rename to android/jni/ed25519/fe_sq.c
diff --git a/jni/ed25519/fe_sq2.c b/android/jni/ed25519/fe_sq2.c
similarity index 100%
rename from jni/ed25519/fe_sq2.c
rename to android/jni/ed25519/fe_sq2.c
diff --git a/jni/ed25519/fe_sub.c b/android/jni/ed25519/fe_sub.c
similarity index 100%
rename from jni/ed25519/fe_sub.c
rename to android/jni/ed25519/fe_sub.c
diff --git a/jni/ed25519/fe_tobytes.c b/android/jni/ed25519/fe_tobytes.c
similarity index 100%
rename from jni/ed25519/fe_tobytes.c
rename to android/jni/ed25519/fe_tobytes.c
diff --git a/jni/ed25519/ge.h b/android/jni/ed25519/ge.h
similarity index 100%
rename from jni/ed25519/ge.h
rename to android/jni/ed25519/ge.h
diff --git a/jni/ed25519/ge_add.c b/android/jni/ed25519/ge_add.c
similarity index 100%
rename from jni/ed25519/ge_add.c
rename to android/jni/ed25519/ge_add.c
diff --git a/jni/ed25519/ge_add.h b/android/jni/ed25519/ge_add.h
similarity index 100%
rename from jni/ed25519/ge_add.h
rename to android/jni/ed25519/ge_add.h
diff --git a/jni/ed25519/ge_double_scalarmult.c b/android/jni/ed25519/ge_double_scalarmult.c
similarity index 100%
rename from jni/ed25519/ge_double_scalarmult.c
rename to android/jni/ed25519/ge_double_scalarmult.c
diff --git a/jni/ed25519/ge_frombytes.c b/android/jni/ed25519/ge_frombytes.c
similarity index 100%
rename from jni/ed25519/ge_frombytes.c
rename to android/jni/ed25519/ge_frombytes.c
diff --git a/jni/ed25519/ge_madd.c b/android/jni/ed25519/ge_madd.c
similarity index 100%
rename from jni/ed25519/ge_madd.c
rename to android/jni/ed25519/ge_madd.c
diff --git a/jni/ed25519/ge_madd.h b/android/jni/ed25519/ge_madd.h
similarity index 100%
rename from jni/ed25519/ge_madd.h
rename to android/jni/ed25519/ge_madd.h
diff --git a/jni/ed25519/ge_msub.c b/android/jni/ed25519/ge_msub.c
similarity index 100%
rename from jni/ed25519/ge_msub.c
rename to android/jni/ed25519/ge_msub.c
diff --git a/jni/ed25519/ge_msub.h b/android/jni/ed25519/ge_msub.h
similarity index 100%
rename from jni/ed25519/ge_msub.h
rename to android/jni/ed25519/ge_msub.h
diff --git a/jni/ed25519/ge_p1p1_to_p2.c b/android/jni/ed25519/ge_p1p1_to_p2.c
similarity index 100%
rename from jni/ed25519/ge_p1p1_to_p2.c
rename to android/jni/ed25519/ge_p1p1_to_p2.c
diff --git a/jni/ed25519/ge_p1p1_to_p3.c b/android/jni/ed25519/ge_p1p1_to_p3.c
similarity index 100%
rename from jni/ed25519/ge_p1p1_to_p3.c
rename to android/jni/ed25519/ge_p1p1_to_p3.c
diff --git a/jni/ed25519/ge_p2_0.c b/android/jni/ed25519/ge_p2_0.c
similarity index 100%
rename from jni/ed25519/ge_p2_0.c
rename to android/jni/ed25519/ge_p2_0.c
diff --git a/jni/ed25519/ge_p2_dbl.c b/android/jni/ed25519/ge_p2_dbl.c
similarity index 100%
rename from jni/ed25519/ge_p2_dbl.c
rename to android/jni/ed25519/ge_p2_dbl.c
diff --git a/jni/ed25519/ge_p2_dbl.h b/android/jni/ed25519/ge_p2_dbl.h
similarity index 100%
rename from jni/ed25519/ge_p2_dbl.h
rename to android/jni/ed25519/ge_p2_dbl.h
diff --git a/jni/ed25519/ge_p3_0.c b/android/jni/ed25519/ge_p3_0.c
similarity index 100%
rename from jni/ed25519/ge_p3_0.c
rename to android/jni/ed25519/ge_p3_0.c
diff --git a/jni/ed25519/ge_p3_dbl.c b/android/jni/ed25519/ge_p3_dbl.c
similarity index 100%
rename from jni/ed25519/ge_p3_dbl.c
rename to android/jni/ed25519/ge_p3_dbl.c
diff --git a/jni/ed25519/ge_p3_to_cached.c b/android/jni/ed25519/ge_p3_to_cached.c
similarity index 100%
rename from jni/ed25519/ge_p3_to_cached.c
rename to android/jni/ed25519/ge_p3_to_cached.c
diff --git a/jni/ed25519/ge_p3_to_p2.c b/android/jni/ed25519/ge_p3_to_p2.c
similarity index 100%
rename from jni/ed25519/ge_p3_to_p2.c
rename to android/jni/ed25519/ge_p3_to_p2.c
diff --git a/jni/ed25519/ge_p3_tobytes.c b/android/jni/ed25519/ge_p3_tobytes.c
similarity index 100%
rename from jni/ed25519/ge_p3_tobytes.c
rename to android/jni/ed25519/ge_p3_tobytes.c
diff --git a/jni/ed25519/ge_precomp_0.c b/android/jni/ed25519/ge_precomp_0.c
similarity index 100%
rename from jni/ed25519/ge_precomp_0.c
rename to android/jni/ed25519/ge_precomp_0.c
diff --git a/jni/ed25519/ge_scalarmult_base.c b/android/jni/ed25519/ge_scalarmult_base.c
similarity index 100%
rename from jni/ed25519/ge_scalarmult_base.c
rename to android/jni/ed25519/ge_scalarmult_base.c
diff --git a/jni/ed25519/ge_sub.c b/android/jni/ed25519/ge_sub.c
similarity index 100%
rename from jni/ed25519/ge_sub.c
rename to android/jni/ed25519/ge_sub.c
diff --git a/jni/ed25519/ge_sub.h b/android/jni/ed25519/ge_sub.h
similarity index 100%
rename from jni/ed25519/ge_sub.h
rename to android/jni/ed25519/ge_sub.h
diff --git a/jni/ed25519/ge_tobytes.c b/android/jni/ed25519/ge_tobytes.c
similarity index 100%
rename from jni/ed25519/ge_tobytes.c
rename to android/jni/ed25519/ge_tobytes.c
diff --git a/jni/ed25519/main/main.c b/android/jni/ed25519/main/main.c
similarity index 100%
rename from jni/ed25519/main/main.c
rename to android/jni/ed25519/main/main.c
diff --git a/jni/ed25519/nacl_includes/crypto_int32.h b/android/jni/ed25519/nacl_includes/crypto_int32.h
similarity index 100%
rename from jni/ed25519/nacl_includes/crypto_int32.h
rename to android/jni/ed25519/nacl_includes/crypto_int32.h
diff --git a/jni/ed25519/nacl_includes/crypto_int64.h b/android/jni/ed25519/nacl_includes/crypto_int64.h
similarity index 100%
rename from jni/ed25519/nacl_includes/crypto_int64.h
rename to android/jni/ed25519/nacl_includes/crypto_int64.h
diff --git a/jni/ed25519/nacl_includes/crypto_sign.h b/android/jni/ed25519/nacl_includes/crypto_sign.h
similarity index 100%
rename from jni/ed25519/nacl_includes/crypto_sign.h
rename to android/jni/ed25519/nacl_includes/crypto_sign.h
diff --git a/jni/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h b/android/jni/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h
similarity index 100%
rename from jni/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h
rename to android/jni/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h
diff --git a/jni/ed25519/nacl_includes/crypto_uint32.h b/android/jni/ed25519/nacl_includes/crypto_uint32.h
similarity index 100%
rename from jni/ed25519/nacl_includes/crypto_uint32.h
rename to android/jni/ed25519/nacl_includes/crypto_uint32.h
diff --git a/jni/ed25519/nacl_includes/crypto_uint64.h b/android/jni/ed25519/nacl_includes/crypto_uint64.h
similarity index 100%
rename from jni/ed25519/nacl_includes/crypto_uint64.h
rename to android/jni/ed25519/nacl_includes/crypto_uint64.h
diff --git a/jni/ed25519/nacl_includes/crypto_verify_32.h b/android/jni/ed25519/nacl_includes/crypto_verify_32.h
similarity index 100%
rename from jni/ed25519/nacl_includes/crypto_verify_32.h
rename to android/jni/ed25519/nacl_includes/crypto_verify_32.h
diff --git a/jni/ed25519/nacl_sha512/blocks.c b/android/jni/ed25519/nacl_sha512/blocks.c
similarity index 100%
rename from jni/ed25519/nacl_sha512/blocks.c
rename to android/jni/ed25519/nacl_sha512/blocks.c
diff --git a/jni/ed25519/nacl_sha512/hash.c b/android/jni/ed25519/nacl_sha512/hash.c
similarity index 100%
rename from jni/ed25519/nacl_sha512/hash.c
rename to android/jni/ed25519/nacl_sha512/hash.c
diff --git a/jni/ed25519/open.c b/android/jni/ed25519/open.c
similarity index 100%
rename from jni/ed25519/open.c
rename to android/jni/ed25519/open.c
diff --git a/jni/ed25519/pow22523.h b/android/jni/ed25519/pow22523.h
similarity index 100%
rename from jni/ed25519/pow22523.h
rename to android/jni/ed25519/pow22523.h
diff --git a/jni/ed25519/pow225521.h b/android/jni/ed25519/pow225521.h
similarity index 100%
rename from jni/ed25519/pow225521.h
rename to android/jni/ed25519/pow225521.h
diff --git a/jni/ed25519/sc.h b/android/jni/ed25519/sc.h
similarity index 100%
rename from jni/ed25519/sc.h
rename to android/jni/ed25519/sc.h
diff --git a/jni/ed25519/sc_muladd.c b/android/jni/ed25519/sc_muladd.c
similarity index 100%
rename from jni/ed25519/sc_muladd.c
rename to android/jni/ed25519/sc_muladd.c
diff --git a/jni/ed25519/sc_reduce.c b/android/jni/ed25519/sc_reduce.c
similarity index 100%
rename from jni/ed25519/sc_reduce.c
rename to android/jni/ed25519/sc_reduce.c
diff --git a/jni/ed25519/sign.c b/android/jni/ed25519/sign.c
similarity index 100%
rename from jni/ed25519/sign.c
rename to android/jni/ed25519/sign.c
diff --git a/jni/ed25519/sqrtm1.h b/android/jni/ed25519/sqrtm1.h
similarity index 100%
rename from jni/ed25519/sqrtm1.h
rename to android/jni/ed25519/sqrtm1.h
diff --git a/libs/armeabi-v7a/libcurve25519.so b/android/libs/armeabi-v7a/libcurve25519.so
similarity index 100%
rename from libs/armeabi-v7a/libcurve25519.so
rename to android/libs/armeabi-v7a/libcurve25519.so
diff --git a/libs/armeabi/libcurve25519.so b/android/libs/armeabi/libcurve25519.so
similarity index 100%
rename from libs/armeabi/libcurve25519.so
rename to android/libs/armeabi/libcurve25519.so
diff --git a/libs/mips/libcurve25519.so b/android/libs/mips/libcurve25519.so
similarity index 100%
rename from libs/mips/libcurve25519.so
rename to android/libs/mips/libcurve25519.so
diff --git a/libs/x86/libcurve25519.so b/android/libs/x86/libcurve25519.so
similarity index 100%
rename from libs/x86/libcurve25519.so
rename to android/libs/x86/libcurve25519.so
diff --git a/src/androidTest/java/org/whispersystems/curve25519/NativeCurve25519ProviderTest.java b/android/src/androidTest/java/org/whispersystems/curve25519/NativeCurve25519ProviderTest.java
similarity index 100%
rename from src/androidTest/java/org/whispersystems/curve25519/NativeCurve25519ProviderTest.java
rename to android/src/androidTest/java/org/whispersystems/curve25519/NativeCurve25519ProviderTest.java
diff --git a/src/androidTest/java/org/whispersystems/curve25519/NativeCurve25519Test.java b/android/src/androidTest/java/org/whispersystems/curve25519/NativeCurve25519Test.java
similarity index 81%
rename from src/androidTest/java/org/whispersystems/curve25519/NativeCurve25519Test.java
rename to android/src/androidTest/java/org/whispersystems/curve25519/NativeCurve25519Test.java
index f5397ae..75a9410 100644
--- a/src/androidTest/java/org/whispersystems/curve25519/NativeCurve25519Test.java
+++ b/android/src/androidTest/java/org/whispersystems/curve25519/NativeCurve25519Test.java
@@ -1,8 +1,5 @@
 package org.whispersystems.curve25519;
 
-import static org.junit.Assert.assertTrue;
-
-
 public class NativeCurve25519Test extends Curve25519Test {
 
   @Override
diff --git a/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
similarity index 100%
rename from src/main/AndroidManifest.xml
rename to android/src/main/AndroidManifest.xml
diff --git a/build.gradle b/build.gradle
index c007f60..a2799be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,95 +1,2 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
-    }
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'maven'
-apply plugin: 'signing'
-
-archivesBaseName = "curve25519-android"
-version          = "0.0.1"
-group            = "org.whispersystems"
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    androidTestCompile 'junit:junit:4.11'
-}
-
-android {
-    compileSdkVersion 21
-    buildToolsVersion '21.1.1'
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
-    android {
-        sourceSets {
-            main {
-                jniLibs.srcDirs = ['libs']
-            }
-            androidTest {
-                java.srcDirs = ['src/androidTest/java', 'src/commonTest/java']
-            }
-        }
-        packagingOptions {
-            exclude 'LICENSE.txt'
-        }
-    }
-
-    libraryVariants.all { variant ->
-        variant.outputs.each { output ->
-            def outputFile = output.outputFile
-            if (outputFile != null && outputFile.name.endsWith('.aar')) {
-                def fileName = "${archivesBaseName}-${version}.aar"
-                output.outputFile = new File(outputFile.parent, fileName)
-            }
-        }
-    }
-}
-
-signing {
-    required { has("release") && gradle.taskGraph.hasTask("uploadArchives") }
-    sign configurations.archives
-}
-
-uploadArchives {
-    configuration = configurations.archives
-    repositories.mavenDeployer {
-        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-        repository(url: sonatypeRepo) {
-            authentication(userName: whisperSonatypeUsername, password: whisperSonatypePassword)
-        }
-
-        pom.project {
-            name 'curve25519-android'
-            packaging 'aar'
-            description 'Curve25519 library for Android'
-            url 'https://github.com/WhisperSystems/curve25519-java'
-
-            scm {
-                url 'scm:git@github.com:WhisperSystems/curve25519-java.git'
-                connection 'scm:git@github.com:WhisperSystems/curve25519-java.git'
-                developerConnection 'scm:git@github.com:WhisperSystems/curve25519-java.git'
-            }
-
-            developers {
-                developer {
-                    name 'Trevor Perrin'
-                    name 'Moxie Marlinspike'
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
+ext.version_number = "0.1.3"
+ext.group_info     = "org.whispersystems"
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..2322723
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..c51665c
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Jan 06 14:11:31 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# 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
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# 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\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+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" ] ; 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"`
+
+    # 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"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..aec9973
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@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
+
+@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=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@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 Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_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=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+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/java/build.gradle b/java/build.gradle
new file mode 100644
index 0000000..62c61fc
--- /dev/null
+++ b/java/build.gradle
@@ -0,0 +1,63 @@
+apply plugin: 'java'
+
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+sourceCompatibility = 1.7
+archivesBaseName = "curve25519-java"
+version          = version_number
+group            = group_info
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile project(':tests')
+}
+
+signing {
+    required { has("release") && gradle.taskGraph.hasTask("uploadArchives") }
+    sign configurations.archives
+}
+
+uploadArchives {
+    configuration = configurations.archives
+    repositories.mavenDeployer {
+        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+        repository(url: sonatypeRepo) {
+            authentication(userName: whisperSonatypeUsername, password: whisperSonatypePassword)
+        }
+
+        pom.project {
+            name 'curve25519-java'
+            packaging 'jar'
+            description 'Curve25519 library for Java'
+            url 'https://github.com/WhisperSystems/curve25519-java'
+
+            scm {
+                url 'scm:git@github.com:WhisperSystems/curve25519-java.git'
+                connection 'scm:git@github.com:WhisperSystems/curve25519-java.git'
+                developerConnection 'scm:git@github.com:WhisperSystems/curve25519-java.git'
+            }
+
+            developers {
+                developer {
+                    name 'Trevor Perrin'
+                    name 'Moxie Marlinspike'
+                }
+            }
+        }
+    }
+}
+
+task installArchives(type: Upload) {
+    description "Installs the artifacts to the local Maven repository."
+    configuration = configurations['archives']
+    repositories {
+        mavenDeployer {
+            repository url: "file://${System.properties['user.home']}/.m2/repository"
+        }
+    }
+}
diff --git a/src/main/java/org/whispersystems/curve25519/Curve25519.java b/java/src/main/java/org/whispersystems/curve25519/Curve25519.java
similarity index 97%
rename from src/main/java/org/whispersystems/curve25519/Curve25519.java
rename to java/src/main/java/org/whispersystems/curve25519/Curve25519.java
index 672adb8..69bc920 100644
--- a/src/main/java/org/whispersystems/curve25519/Curve25519.java
+++ b/java/src/main/java/org/whispersystems/curve25519/Curve25519.java
@@ -21,7 +21,7 @@ public class Curve25519 {
   }
 
   /**
-   * {@link org.whispersystems.curve25519.Curve25519} is backed by either a native (via JNI)
+   * {@link Curve25519} is backed by either a native (via JNI)
    * or pure-Java provider.  By default it prefers the native provider, and falls back to the
    * pure-Java provider if the native library fails to load.
    *
diff --git a/src/main/java/org/whispersystems/curve25519/Curve25519KeyPair.java b/java/src/main/java/org/whispersystems/curve25519/Curve25519KeyPair.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/Curve25519KeyPair.java
rename to java/src/main/java/org/whispersystems/curve25519/Curve25519KeyPair.java
diff --git a/src/main/java/org/whispersystems/curve25519/Curve25519Provider.java b/java/src/main/java/org/whispersystems/curve25519/Curve25519Provider.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/Curve25519Provider.java
rename to java/src/main/java/org/whispersystems/curve25519/Curve25519Provider.java
diff --git a/src/main/java/org/whispersystems/curve25519/JavaCurve25519Provider.java b/java/src/main/java/org/whispersystems/curve25519/JavaCurve25519Provider.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/JavaCurve25519Provider.java
rename to java/src/main/java/org/whispersystems/curve25519/JavaCurve25519Provider.java
diff --git a/src/main/java/org/whispersystems/curve25519/NativeCurve25519Provider.java b/java/src/main/java/org/whispersystems/curve25519/NativeCurve25519Provider.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/NativeCurve25519Provider.java
rename to java/src/main/java/org/whispersystems/curve25519/NativeCurve25519Provider.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/crypto_hash_sha512.java b/java/src/main/java/org/whispersystems/curve25519/java/crypto_hash_sha512.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/crypto_hash_sha512.java
rename to java/src/main/java/org/whispersystems/curve25519/java/crypto_hash_sha512.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/crypto_verify_32.java b/java/src/main/java/org/whispersystems/curve25519/java/crypto_verify_32.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/crypto_verify_32.java
rename to java/src/main/java/org/whispersystems/curve25519/java/crypto_verify_32.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/curve_sigs.java b/java/src/main/java/org/whispersystems/curve25519/java/curve_sigs.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/curve_sigs.java
rename to java/src/main/java/org/whispersystems/curve25519/java/curve_sigs.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_0.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_0.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_0.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_0.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_1.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_1.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_1.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_1.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_add.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_add.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_add.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_add.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_cmov.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_cmov.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_cmov.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_cmov.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_copy.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_copy.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_copy.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_copy.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_cswap.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_cswap.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_cswap.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_cswap.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_frombytes.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_frombytes.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_frombytes.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_frombytes.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_invert.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_invert.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_invert.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_invert.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_isnegative.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_isnegative.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_isnegative.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_isnegative.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_isnonzero.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_isnonzero.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_isnonzero.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_isnonzero.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_mul.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_mul.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_mul.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_mul.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_mul121666.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_mul121666.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_mul121666.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_mul121666.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_neg.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_neg.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_neg.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_neg.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_pow22523.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_pow22523.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_pow22523.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_pow22523.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_sq.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_sq.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_sq.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_sq.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_sq2.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_sq2.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_sq2.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_sq2.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_sub.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_sub.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_sub.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_sub.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/fe_tobytes.java b/java/src/main/java/org/whispersystems/curve25519/java/fe_tobytes.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/fe_tobytes.java
rename to java/src/main/java/org/whispersystems/curve25519/java/fe_tobytes.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_add.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_add.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_add.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_add.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_cached.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_cached.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_cached.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_cached.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_double_scalarmult.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_double_scalarmult.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_double_scalarmult.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_double_scalarmult.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_frombytes.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_frombytes.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_frombytes.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_frombytes.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_madd.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_madd.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_madd.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_madd.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_msub.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_msub.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_msub.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_msub.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_p1p1.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_p1p1.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_p1p1.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_p1p1.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_p1p1_to_p2.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_p1p1_to_p2.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_p1p1_to_p2.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_p1p1_to_p2.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_p1p1_to_p3.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_p1p1_to_p3.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_p1p1_to_p3.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_p1p1_to_p3.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_p2.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_p2.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_p2.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_p2.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_p2_0.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_p2_0.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_p2_0.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_p2_0.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_p2_dbl.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_p2_dbl.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_p2_dbl.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_p2_dbl.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_p3.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_p3.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_p3.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_p3.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_p3_0.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_p3_0.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_p3_0.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_p3_0.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_p3_dbl.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_p3_dbl.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_p3_dbl.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_p3_dbl.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_p3_to_cached.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_p3_to_cached.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_p3_to_cached.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_p3_to_cached.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_p3_to_p2.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_p3_to_p2.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_p3_to_p2.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_p3_to_p2.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_p3_tobytes.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_p3_tobytes.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_p3_tobytes.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_p3_tobytes.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_precomp.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_precomp.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_precomp.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_precomp.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_precomp_0.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_precomp_0.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_precomp_0.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_precomp_0.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_scalarmult_base.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_scalarmult_base.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_scalarmult_base.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_scalarmult_base.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_sub.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_sub.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_sub.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_sub.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/ge_tobytes.java b/java/src/main/java/org/whispersystems/curve25519/java/ge_tobytes.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/ge_tobytes.java
rename to java/src/main/java/org/whispersystems/curve25519/java/ge_tobytes.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/open.java b/java/src/main/java/org/whispersystems/curve25519/java/open.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/open.java
rename to java/src/main/java/org/whispersystems/curve25519/java/open.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/sc_muladd.java b/java/src/main/java/org/whispersystems/curve25519/java/sc_muladd.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/sc_muladd.java
rename to java/src/main/java/org/whispersystems/curve25519/java/sc_muladd.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/sc_reduce.java b/java/src/main/java/org/whispersystems/curve25519/java/sc_reduce.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/sc_reduce.java
rename to java/src/main/java/org/whispersystems/curve25519/java/sc_reduce.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/scalarmult.java b/java/src/main/java/org/whispersystems/curve25519/java/scalarmult.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/scalarmult.java
rename to java/src/main/java/org/whispersystems/curve25519/java/scalarmult.java
diff --git a/src/main/java/org/whispersystems/curve25519/java/sign_modified.java b/java/src/main/java/org/whispersystems/curve25519/java/sign_modified.java
similarity index 100%
rename from src/main/java/org/whispersystems/curve25519/java/sign_modified.java
rename to java/src/main/java/org/whispersystems/curve25519/java/sign_modified.java
diff --git a/src/javaTest/java/org/whispersystems/curve25519/JavaCurve25519ProviderTest.java b/java/src/test/java/org/whispersystems/curve25519/JavaCurve25519ProviderTest.java
similarity index 100%
rename from src/javaTest/java/org/whispersystems/curve25519/JavaCurve25519ProviderTest.java
rename to java/src/test/java/org/whispersystems/curve25519/JavaCurve25519ProviderTest.java
diff --git a/src/javaTest/java/org/whispersystems/curve25519/JavaCurve25519Test.java b/java/src/test/java/org/whispersystems/curve25519/JavaCurve25519Test.java
similarity index 100%
rename from src/javaTest/java/org/whispersystems/curve25519/JavaCurve25519Test.java
rename to java/src/test/java/org/whispersystems/curve25519/JavaCurve25519Test.java
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index ef93757..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <prerequisites>
-        <maven>3.0.0</maven>
-    </prerequisites>
-
-    <groupId>org.whispersystems</groupId>
-    <artifactId>curve25519</artifactId>
-    <version>0.0.1</version>
-
-    <name>curve25519</name>
-    <description>A Curve25519 implementation.</description>
-    <url>https://github.com/WhisperSystems/curve25519-java</url>
-
-    <developers>
-        <developer>
-            <name>Trevor Perrin</name>
-        </developer>
-        <developer>
-            <name>Moxie Marlinspike</name>
-        </developer>
-    </developers>
-
-    <scm>
-        <url>https://github.com/WhisperSystems/curve25519-java</url>
-        <connection>scm:git:https://github.com/WhisperSystems/curve25519-java.git</connection>
-        <developerConnection>scm:git:https://github.com/WhisperSystems/curve25519-java.git</developerConnection>
-    </scm>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>1.9.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.9.1</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/commonTest/java/</source>
-                                <source>src/javaTest/java/</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..7412250
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':java', ':android', ':tests'
diff --git a/src/androidTest/java/org/whispersystems/curve25519/AndroidWrapper.java b/src/androidTest/java/org/whispersystems/curve25519/AndroidWrapper.java
deleted file mode 100644
index 2bfe906..0000000
--- a/src/androidTest/java/org/whispersystems/curve25519/AndroidWrapper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.whispersystems.curve25519;
-
-import android.test.AndroidTestCase;
-
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-
-public class AndroidWrapper extends AndroidTestCase {
-
-  private final NativeCurve25519ProviderTest providerTest = new NativeCurve25519ProviderTest();
-  private final NativeCurve25519Test         curveTest    = new NativeCurve25519Test        ();
-
-  public void testEcDh() {
-    providerTest.testEcDh();
-  }
-
-  public void testKeyGen() {
-    providerTest.testKeyGen();
-  }
-
-  public void testSignVerify() {
-    providerTest.testSignVerify();
-  }
-
-  public void testNative() {
-    curveTest.testCheckProvider();
-  }
-
-  public void testAgreement() {
-    curveTest.testAgreement();
-  }
-
-  public void testRandomAgreements() throws NoSuchAlgorithmException {
-    curveTest.testRandomAgreements();
-  }
-
-  public void testSignature() {
-    curveTest.testSignature();
-  }
-
-  public void testSignatureOverflow() throws InvalidKeyException, NoSuchAlgorithmException {
-    curveTest.testSignatureOverflow();
-  }
-}
diff --git a/tests/build.gradle b/tests/build.gradle
new file mode 100644
index 0000000..5b30561
--- /dev/null
+++ b/tests/build.gradle
@@ -0,0 +1,13 @@
+apply plugin: 'java'
+
+sourceCompatibility = 1.7
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile project(':java')
+    compile 'junit:junit:3.8.2'
+    compile 'org.easytesting:fest-assert:1.4'
+}
\ No newline at end of file
diff --git a/src/commonTest/java/org/whispersystems/curve25519/Curve25519ProviderTest.java b/tests/src/main/java/org/whispersystems/curve25519/Curve25519ProviderTest.java
similarity index 90%
rename from src/commonTest/java/org/whispersystems/curve25519/Curve25519ProviderTest.java
rename to tests/src/main/java/org/whispersystems/curve25519/Curve25519ProviderTest.java
index d7235f0..a7b7af6 100644
--- a/src/commonTest/java/org/whispersystems/curve25519/Curve25519ProviderTest.java
+++ b/tests/src/main/java/org/whispersystems/curve25519/Curve25519ProviderTest.java
@@ -1,16 +1,13 @@
 package org.whispersystems.curve25519;
 
-import org.junit.Test;
-import org.whispersystems.curve25519.Curve25519Provider;
+import junit.framework.TestCase;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertTrue;
+import static org.fest.assertions.Assertions.assertThat;
 
-public abstract class Curve25519ProviderTest {
+public abstract class Curve25519ProviderTest extends TestCase {
 
   protected abstract Curve25519Provider createProvider();
 
-  @Test
   public void testKeyGen() {
     Curve25519Provider provider = createProvider();
 
@@ -32,10 +29,9 @@ public abstract class Curve25519ProviderTest {
                                 (byte)0xdd, (byte)0xfa, (byte)0x05, (byte)0xf8, (byte)0xbc,
                                 (byte)0x7f, (byte)0x37};
 
-    assertArrayEquals(out, result2);
+    assertThat(out).isEqualTo(result2);
   }
 
-  @Test
   public void testEcDh() {
     Curve25519Provider provider = createProvider();
 
@@ -64,12 +60,11 @@ public abstract class Curve25519ProviderTest {
                                (byte)0x1b, (byte)0x4b, (byte)0x13, (byte)0x8d, (byte)0x17,
                                (byte)0xf9, (byte)0x34};
 
-    assertArrayEquals(q, result);
+    assertThat(q).isEqualTo(result);
   }
 
   // FIXME: There's no actual vector here.  If verifySignature is broken and always returns true,
   // this test will pass.
-  @Test
   public void testSignVerify() {
     Curve25519Provider provider = createProvider();
 
diff --git a/src/commonTest/java/org/whispersystems/curve25519/Curve25519Test.java b/tests/src/main/java/org/whispersystems/curve25519/Curve25519Test.java
similarity index 95%
rename from src/commonTest/java/org/whispersystems/curve25519/Curve25519Test.java
rename to tests/src/main/java/org/whispersystems/curve25519/Curve25519Test.java
index 37f2d00..6641cbd 100644
--- a/src/commonTest/java/org/whispersystems/curve25519/Curve25519Test.java
+++ b/tests/src/main/java/org/whispersystems/curve25519/Curve25519Test.java
@@ -1,22 +1,18 @@
 package org.whispersystems.curve25519;
 
-import org.junit.Test;
-import org.whispersystems.curve25519.Curve25519;
-import org.whispersystems.curve25519.Curve25519KeyPair;
+import junit.framework.TestCase;
 
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.fest.assertions.Assertions.assertThat;
 
 
-public abstract class Curve25519Test {
+public abstract class Curve25519Test extends TestCase {
 
-  @Test
   public abstract void testCheckProvider();
 
-  @Test
   public void testAgreement() {
 
     byte[] alicePublic  = {(byte) 0x1b, (byte) 0xb7, (byte) 0x59, (byte) 0x66,
@@ -62,11 +58,10 @@ public abstract class Curve25519Test {
     byte[] sharedOne = Curve25519.calculateAgreement(bobPublic, alicePrivate);
     byte[] sharedTwo = Curve25519.calculateAgreement(alicePublic, bobPrivate);
 
-    assertArrayEquals(sharedOne, shared);
-    assertArrayEquals(sharedTwo, shared);
+    assertThat(sharedOne).isEqualTo(shared);
+    assertThat(sharedTwo).isEqualTo(shared);
   }
 
-  @Test
   public void testRandomAgreements() throws NoSuchAlgorithmException {
     SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
 
@@ -77,11 +72,10 @@ public abstract class Curve25519Test {
       byte[] sharedAlice = Curve25519.calculateAgreement(bob.getPublicKey(), alice.getPrivateKey());
       byte[] sharedBob   = Curve25519.calculateAgreement(alice.getPublicKey(), bob.getPrivateKey());
 
-      assertArrayEquals(sharedAlice, sharedBob);
+      assertThat(sharedAlice).isEqualTo(sharedBob);
     }
   }
 
-  @Test
   public void testSignature() {
     byte[] aliceIdentityPrivate = {(byte)0xc0, (byte)0x97, (byte)0x24, (byte)0x84, (byte)0x12,
                                    (byte)0xe5, (byte)0x8b, (byte)0xf0, (byte)0x5d, (byte)0xf4,
@@ -137,7 +131,6 @@ public abstract class Curve25519Test {
     }
   }
 
-  @Test
   public void testSignatureOverflow() throws NoSuchAlgorithmException, InvalidKeyException {
     SecureRandom      secureRandom = SecureRandom.getInstance("SHA1PRNG");
     Curve25519KeyPair keys         = Curve25519.generateKeyPair(secureRandom);