diff --git a/android/rustls-platform-verifier/build.gradle b/android/rustls-platform-verifier/build.gradle
index c285d5ac..8171ef72 100644
--- a/android/rustls-platform-verifier/build.gradle
+++ b/android/rustls-platform-verifier/build.gradle
@@ -50,7 +50,7 @@ android {
 
     task buildTestLib(type: Exec) {
         workingDir "../../"
-        commandLine "cargo", "ndk", "-t", getOsArch(), "-o", "android/rustls-platform-verifier/src/androidTest/jniLibs", "build", "--features", "ffi-testing"
+        commandLine "cargo", "ndk", "-t", getOsArch(), "-o", "android/rustls-platform-verifier/src/androidTest/jniLibs", "build", "-p", "rustls-platform-verifier", "--features", "ffi-testing"
     }
 
     // Only compile the test library if this package is being built for testing by itself.
diff --git a/Cargo.toml b/rustls-platform-verifier/Cargo.toml
similarity index 100%
rename from Cargo.toml
rename to rustls-platform-verifier/Cargo.toml
diff --git a/rustls-platform-verifier/README.md b/rustls-platform-verifier/README.md
new file mode 120000
index 00000000..32d46ee8
--- /dev/null
+++ b/rustls-platform-verifier/README.md
@@ -0,0 +1 @@
+../README.md
\ No newline at end of file
diff --git a/src/android.rs b/rustls-platform-verifier/src/android.rs
similarity index 100%
rename from src/android.rs
rename to rustls-platform-verifier/src/android.rs
diff --git a/src/lib.rs b/rustls-platform-verifier/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to rustls-platform-verifier/src/lib.rs
diff --git a/src/tests/ffi.rs b/rustls-platform-verifier/src/tests/ffi.rs
similarity index 100%
rename from src/tests/ffi.rs
rename to rustls-platform-verifier/src/tests/ffi.rs
diff --git a/src/tests/mod.rs b/rustls-platform-verifier/src/tests/mod.rs
similarity index 100%
rename from src/tests/mod.rs
rename to rustls-platform-verifier/src/tests/mod.rs
diff --git a/src/tests/verification_mock/ca.go b/rustls-platform-verifier/src/tests/verification_mock/ca.go
similarity index 100%
rename from src/tests/verification_mock/ca.go
rename to rustls-platform-verifier/src/tests/verification_mock/ca.go
diff --git a/src/tests/verification_mock/go.mod b/rustls-platform-verifier/src/tests/verification_mock/go.mod
similarity index 100%
rename from src/tests/verification_mock/go.mod
rename to rustls-platform-verifier/src/tests/verification_mock/go.mod
diff --git a/src/tests/verification_mock/go.sum b/rustls-platform-verifier/src/tests/verification_mock/go.sum
similarity index 100%
rename from src/tests/verification_mock/go.sum
rename to rustls-platform-verifier/src/tests/verification_mock/go.sum
diff --git a/src/tests/verification_mock/mod.rs b/rustls-platform-verifier/src/tests/verification_mock/mod.rs
similarity index 100%
rename from src/tests/verification_mock/mod.rs
rename to rustls-platform-verifier/src/tests/verification_mock/mod.rs
diff --git a/src/tests/verification_mock/root1-int1-ee_1-good.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-good.crt
similarity index 100%
rename from src/tests/verification_mock/root1-int1-ee_1-good.crt
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-good.crt
diff --git a/src/tests/verification_mock/root1-int1-ee_1-good.ocsp b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-good.ocsp
similarity index 100%
rename from src/tests/verification_mock/root1-int1-ee_1-good.ocsp
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-good.ocsp
diff --git a/src/tests/verification_mock/root1-int1-ee_1-revoked.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-revoked.crt
similarity index 100%
rename from src/tests/verification_mock/root1-int1-ee_1-revoked.crt
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-revoked.crt
diff --git a/src/tests/verification_mock/root1-int1-ee_1-revoked.ocsp b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-revoked.ocsp
similarity index 100%
rename from src/tests/verification_mock/root1-int1-ee_1-revoked.ocsp
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-revoked.ocsp
diff --git a/src/tests/verification_mock/root1-int1-ee_1-wrong_eku.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-wrong_eku.crt
similarity index 100%
rename from src/tests/verification_mock/root1-int1-ee_1-wrong_eku.crt
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-wrong_eku.crt
diff --git a/src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.crt
similarity index 100%
rename from src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.crt
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.crt
diff --git a/src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.ocsp b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.ocsp
similarity index 100%
rename from src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.ocsp
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.ocsp
diff --git a/src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.crt
similarity index 100%
rename from src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.crt
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.crt
diff --git a/src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.ocsp b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.ocsp
similarity index 100%
rename from src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.ocsp
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.ocsp
diff --git a/src/tests/verification_mock/root1-int1-ee_127.0.0.1-wrong_eku.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-wrong_eku.crt
similarity index 100%
rename from src/tests/verification_mock/root1-int1-ee_127.0.0.1-wrong_eku.crt
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-wrong_eku.crt
diff --git a/src/tests/verification_mock/root1-int1-ee_example.com-good.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-good.crt
similarity index 100%
rename from src/tests/verification_mock/root1-int1-ee_example.com-good.crt
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-good.crt
diff --git a/src/tests/verification_mock/root1-int1-ee_example.com-good.ocsp b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-good.ocsp
similarity index 100%
rename from src/tests/verification_mock/root1-int1-ee_example.com-good.ocsp
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-good.ocsp
diff --git a/src/tests/verification_mock/root1-int1-ee_example.com-revoked.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-revoked.crt
similarity index 100%
rename from src/tests/verification_mock/root1-int1-ee_example.com-revoked.crt
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-revoked.crt
diff --git a/src/tests/verification_mock/root1-int1-ee_example.com-revoked.ocsp b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-revoked.ocsp
similarity index 100%
rename from src/tests/verification_mock/root1-int1-ee_example.com-revoked.ocsp
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-revoked.ocsp
diff --git a/src/tests/verification_mock/root1-int1-ee_example.com-wrong_eku.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-wrong_eku.crt
similarity index 100%
rename from src/tests/verification_mock/root1-int1-ee_example.com-wrong_eku.crt
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-wrong_eku.crt
diff --git a/src/tests/verification_mock/root1-int1.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1.crt
similarity index 100%
rename from src/tests/verification_mock/root1-int1.crt
rename to rustls-platform-verifier/src/tests/verification_mock/root1-int1.crt
diff --git a/src/tests/verification_mock/root1.crt b/rustls-platform-verifier/src/tests/verification_mock/root1.crt
similarity index 100%
rename from src/tests/verification_mock/root1.crt
rename to rustls-platform-verifier/src/tests/verification_mock/root1.crt
diff --git a/src/tests/verification_real_world/1password_com_valid_1.crt b/rustls-platform-verifier/src/tests/verification_real_world/1password_com_valid_1.crt
similarity index 100%
rename from src/tests/verification_real_world/1password_com_valid_1.crt
rename to rustls-platform-verifier/src/tests/verification_real_world/1password_com_valid_1.crt
diff --git a/src/tests/verification_real_world/1password_com_valid_2.crt b/rustls-platform-verifier/src/tests/verification_real_world/1password_com_valid_2.crt
similarity index 100%
rename from src/tests/verification_real_world/1password_com_valid_2.crt
rename to rustls-platform-verifier/src/tests/verification_real_world/1password_com_valid_2.crt
diff --git a/src/tests/verification_real_world/1password_com_valid_3.crt b/rustls-platform-verifier/src/tests/verification_real_world/1password_com_valid_3.crt
similarity index 100%
rename from src/tests/verification_real_world/1password_com_valid_3.crt
rename to rustls-platform-verifier/src/tests/verification_real_world/1password_com_valid_3.crt
diff --git a/src/tests/verification_real_world/1password_com_valid_4.crt b/rustls-platform-verifier/src/tests/verification_real_world/1password_com_valid_4.crt
similarity index 100%
rename from src/tests/verification_real_world/1password_com_valid_4.crt
rename to rustls-platform-verifier/src/tests/verification_real_world/1password_com_valid_4.crt
diff --git a/src/tests/verification_real_world/agilebits_com_valid_1.crt b/rustls-platform-verifier/src/tests/verification_real_world/agilebits_com_valid_1.crt
similarity index 100%
rename from src/tests/verification_real_world/agilebits_com_valid_1.crt
rename to rustls-platform-verifier/src/tests/verification_real_world/agilebits_com_valid_1.crt
diff --git a/src/tests/verification_real_world/agilebits_com_valid_2.crt b/rustls-platform-verifier/src/tests/verification_real_world/agilebits_com_valid_2.crt
similarity index 100%
rename from src/tests/verification_real_world/agilebits_com_valid_2.crt
rename to rustls-platform-verifier/src/tests/verification_real_world/agilebits_com_valid_2.crt
diff --git a/src/tests/verification_real_world/agilebits_com_valid_3.crt b/rustls-platform-verifier/src/tests/verification_real_world/agilebits_com_valid_3.crt
similarity index 100%
rename from src/tests/verification_real_world/agilebits_com_valid_3.crt
rename to rustls-platform-verifier/src/tests/verification_real_world/agilebits_com_valid_3.crt
diff --git a/src/tests/verification_real_world/agilebits_com_valid_4.crt b/rustls-platform-verifier/src/tests/verification_real_world/agilebits_com_valid_4.crt
similarity index 100%
rename from src/tests/verification_real_world/agilebits_com_valid_4.crt
rename to rustls-platform-verifier/src/tests/verification_real_world/agilebits_com_valid_4.crt
diff --git a/src/tests/verification_real_world/letsencrypt_org_valid_1.crt b/rustls-platform-verifier/src/tests/verification_real_world/letsencrypt_org_valid_1.crt
similarity index 100%
rename from src/tests/verification_real_world/letsencrypt_org_valid_1.crt
rename to rustls-platform-verifier/src/tests/verification_real_world/letsencrypt_org_valid_1.crt
diff --git a/src/tests/verification_real_world/letsencrypt_org_valid_2.crt b/rustls-platform-verifier/src/tests/verification_real_world/letsencrypt_org_valid_2.crt
similarity index 100%
rename from src/tests/verification_real_world/letsencrypt_org_valid_2.crt
rename to rustls-platform-verifier/src/tests/verification_real_world/letsencrypt_org_valid_2.crt
diff --git a/src/tests/verification_real_world/letsencrypt_org_valid_3.crt b/rustls-platform-verifier/src/tests/verification_real_world/letsencrypt_org_valid_3.crt
similarity index 100%
rename from src/tests/verification_real_world/letsencrypt_org_valid_3.crt
rename to rustls-platform-verifier/src/tests/verification_real_world/letsencrypt_org_valid_3.crt
diff --git a/src/tests/verification_real_world/mod.rs b/rustls-platform-verifier/src/tests/verification_real_world/mod.rs
similarity index 100%
rename from src/tests/verification_real_world/mod.rs
rename to rustls-platform-verifier/src/tests/verification_real_world/mod.rs
diff --git a/src/tests/verification_real_world/revoked_badssl_com_1.crt b/rustls-platform-verifier/src/tests/verification_real_world/revoked_badssl_com_1.crt
similarity index 100%
rename from src/tests/verification_real_world/revoked_badssl_com_1.crt
rename to rustls-platform-verifier/src/tests/verification_real_world/revoked_badssl_com_1.crt
diff --git a/src/tests/verification_real_world/revoked_badssl_com_1.ocsp b/rustls-platform-verifier/src/tests/verification_real_world/revoked_badssl_com_1.ocsp
similarity index 100%
rename from src/tests/verification_real_world/revoked_badssl_com_1.ocsp
rename to rustls-platform-verifier/src/tests/verification_real_world/revoked_badssl_com_1.ocsp
diff --git a/src/tests/verification_real_world/revoked_badssl_com_2.crt b/rustls-platform-verifier/src/tests/verification_real_world/revoked_badssl_com_2.crt
similarity index 100%
rename from src/tests/verification_real_world/revoked_badssl_com_2.crt
rename to rustls-platform-verifier/src/tests/verification_real_world/revoked_badssl_com_2.crt
diff --git a/src/tests/verification_real_world/update_valid_ee_certs.rs b/rustls-platform-verifier/src/tests/verification_real_world/update_valid_ee_certs.rs
similarity index 100%
rename from src/tests/verification_real_world/update_valid_ee_certs.rs
rename to rustls-platform-verifier/src/tests/verification_real_world/update_valid_ee_certs.rs
diff --git a/src/verification/android.rs b/rustls-platform-verifier/src/verification/android.rs
similarity index 100%
rename from src/verification/android.rs
rename to rustls-platform-verifier/src/verification/android.rs
diff --git a/src/verification/apple.rs b/rustls-platform-verifier/src/verification/apple.rs
similarity index 100%
rename from src/verification/apple.rs
rename to rustls-platform-verifier/src/verification/apple.rs
diff --git a/src/verification/mod.rs b/rustls-platform-verifier/src/verification/mod.rs
similarity index 100%
rename from src/verification/mod.rs
rename to rustls-platform-verifier/src/verification/mod.rs
diff --git a/src/verification/others.rs b/rustls-platform-verifier/src/verification/others.rs
similarity index 100%
rename from src/verification/others.rs
rename to rustls-platform-verifier/src/verification/others.rs
diff --git a/src/verification/windows.rs b/rustls-platform-verifier/src/verification/windows.rs
similarity index 100%
rename from src/verification/windows.rs
rename to rustls-platform-verifier/src/verification/windows.rs
diff --git a/src/windows.rs b/rustls-platform-verifier/src/windows.rs
similarity index 100%
rename from src/windows.rs
rename to rustls-platform-verifier/src/windows.rs