diff --git a/ed25519jni/.cargo/config b/ed25519jni/.cargo/config
new file mode 100644
index 0000000..ebbc406
--- /dev/null
+++ b/ed25519jni/.cargo/config
@@ -0,0 +1,2 @@
+[build]
+target-dir = "target/rust"
diff --git a/ed25519jni/ed25519jni_rust/Cargo.toml b/ed25519jni/Cargo.toml
similarity index 53%
rename from ed25519jni/ed25519jni_rust/Cargo.toml
rename to ed25519jni/Cargo.toml
index 18f13bf..3eb2c38 100644
--- a/ed25519jni/ed25519jni_rust/Cargo.toml
+++ b/ed25519jni/Cargo.toml
@@ -2,13 +2,17 @@
 name = "ed25519jni"
 version = "0.0.1"
 authors = ["Douglas Roark <douglas.roark@gemini.com>"]
+license = "MIT OR Apache-2.0"
+publish = false
 edition = "2018"
 
 [dependencies]
-ed25519-zebra = { path = "../../" }
+ed25519-zebra = { path = "../" }
 failure = "0.1.8"
 jni = "0.18.0"
 rand = "0.7.3"
 
 [lib]
-crate_type = ["cdylib"]
+name = "ed25519jni"
+path = "src/main/rust/lib.rs"
+crate-type = ["staticlib", "cdylib"]
diff --git a/ed25519jni/ed25519jni_rust/README.md b/ed25519jni/ed25519jni_rust/README.md
deleted file mode 100644
index 02c638b..0000000
--- a/ed25519jni/ed25519jni_rust/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# ed25519_zebra JNI code - Rust underpinnings
-The code that implements the JNI calls.
-
-## Compilation
-`cargo build`
-
-## Miscellaneous notes
-* Due to `sbt` quirks, the Rust code is included as a subfolder inside the master JNI folder.
diff --git a/ed25519jni/ed25519jni_rust/src/lib.rs b/ed25519jni/src/main/rust/lib.rs
similarity index 100%
rename from ed25519jni/ed25519jni_rust/src/lib.rs
rename to ed25519jni/src/main/rust/lib.rs
diff --git a/ed25519jni/ed25519jni_rust/src/utils.rs b/ed25519jni/src/main/rust/utils.rs
similarity index 100%
rename from ed25519jni/ed25519jni_rust/src/utils.rs
rename to ed25519jni/src/main/rust/utils.rs
diff --git a/ed25519jni/ed25519jni_rust/src/utils/exception.rs b/ed25519jni/src/main/rust/utils/exception.rs
similarity index 100%
rename from ed25519jni/ed25519jni_rust/src/utils/exception.rs
rename to ed25519jni/src/main/rust/utils/exception.rs