diff --git a/network-hypervisor/Cargo.lock b/network-hypervisor/Cargo.lock
deleted file mode 100644
index ad4e1c4cf..000000000
--- a/network-hypervisor/Cargo.lock
+++ /dev/null
@@ -1,643 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aes-gmac-siv"
-version = "0.1.0"
-dependencies = [
- "gcrypt",
- "openssl",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "cc"
-version = "1.0.70"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "concat-arrays"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df715824eb382e34b7afb7463b0247bf41538aeba731fba05241ecdb5dc3747"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "cstr-argument"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20bd4e8067c20c7c3a4dea759ef91d4b18418ddb5bd8837ef6e2f2f93ca7ccbb"
-dependencies = [
- "cfg-if 0.1.10",
- "memchr",
-]
-
-[[package]]
-name = "curve25519-dalek"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
-dependencies = [
- "byteorder",
- "digest",
- "rand_core 0.5.1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "dashmap"
-version = "4.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
-dependencies = [
- "cfg-if 1.0.0",
- "num_cpus",
-]
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "ed25519"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc"
-dependencies = [
- "signature",
-]
-
-[[package]]
-name = "ed25519-dalek"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
-dependencies = [
- "curve25519-dalek",
- "ed25519",
- "rand",
- "serde",
- "sha2",
- "zeroize",
-]
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "gcrypt"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c2ee79dcb8915fc0e9d8364e87d2215555076aa159d0a5d84ba9dba109b0d59"
-dependencies = [
- "bitflags",
- "cstr-argument",
- "gpg-error",
- "libc",
- "libgcrypt-sys",
- "once_cell",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "gpg-error"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7073b9ac823434ae73608715086e944d694a7ce2677371b8c5253300d1f767f1"
-dependencies = [
- "libgpg-error-sys",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.103"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6"
-
-[[package]]
-name = "libgcrypt-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62eb5d6d9cd6d8c8adf9641c95b223eb14f07a7a81c082e2d08f0bf3880214e4"
-dependencies = [
- "cc",
- "cfg-if 0.1.10",
- "libc",
- "libgpg-error-sys",
-]
-
-[[package]]
-name = "libgpg-error-sys"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb1aedf0efc5d25fdd08eb52b0759c71d02ac77fd1879b96e95211239528897"
-dependencies = [
- "libc",
- "winreg",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
-dependencies = [
- "scopeguard",
-]
-
-[[package]]
-name = "lz4_flex"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827b976d911b5d2e42b2ccfc7c0d2461a1414e8280436885218762fc529b3f8"
-dependencies = [
- "twox-hash",
-]
-
-[[package]]
-name = "memchr"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
-
-[[package]]
-name = "num_cpus"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "openssl"
-version = "0.10.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a"
-dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.67"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058"
-dependencies = [
- "autocfg",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
-dependencies = [
- "cfg-if 1.0.0",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom",
- "libc",
- "rand_chacha",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "serde"
-version = "1.0.130"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
-
-[[package]]
-name = "sha2"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
-dependencies = [
- "block-buffer",
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest",
- "opaque-debug",
-]
-
-[[package]]
-name = "signature"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19772be3c4dd2ceaacf03cb41d5885f2a02c4d8804884918e3a258480803335"
-
-[[package]]
-name = "smallvec"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "syn"
-version = "1.0.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.12.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "unicode-xid",
-]
-
-[[package]]
-name = "twox-hash"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59"
-dependencies = [
- "cfg-if 0.1.10",
- "static_assertions",
-]
-
-[[package]]
-name = "typenum"
-version = "1.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
-
-[[package]]
-name = "urlencoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b90931029ab9b034b300b797048cf23723400aa757e8a2bfb9d748102f9821"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version_check"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "winreg"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "x25519-dalek"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077"
-dependencies = [
- "curve25519-dalek",
- "rand_core 0.5.1",
- "zeroize",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"
-dependencies = [
- "zeroize_derive",
-]
-
-[[package]]
-name = "zeroize_derive"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "zerotier-network-hypervisor"
-version = "2.0.0"
-dependencies = [
- "base64",
- "concat-arrays",
- "dashmap",
- "libc",
- "lz4_flex",
- "parking_lot",
- "urlencoding",
- "winapi",
- "ztcrypto",
-]
-
-[[package]]
-name = "ztcrypto"
-version = "0.1.0"
-dependencies = [
- "aes-gmac-siv",
- "ed25519-dalek",
- "gcrypt",
- "rand_core 0.6.3",
- "x25519-dalek",
-]
diff --git a/ztcrypto/Cargo.toml b/zerotier-core-crypto/Cargo.toml
similarity index 85%
rename from ztcrypto/Cargo.toml
rename to zerotier-core-crypto/Cargo.toml
index 0e5600708..5f75944b6 100644
--- a/ztcrypto/Cargo.toml
+++ b/zerotier-core-crypto/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ztcrypto"
+name = "zerotier-core-crypto"
 version = "0.1.0"
 edition = "2018"
 
diff --git a/ztcrypto/src/balloon.rs b/zerotier-core-crypto/src/balloon.rs
similarity index 100%
rename from ztcrypto/src/balloon.rs
rename to zerotier-core-crypto/src/balloon.rs
diff --git a/ztcrypto/src/c25519.rs b/zerotier-core-crypto/src/c25519.rs
similarity index 100%
rename from ztcrypto/src/c25519.rs
rename to zerotier-core-crypto/src/c25519.rs
diff --git a/ztcrypto/src/hash.rs b/zerotier-core-crypto/src/hash.rs
similarity index 100%
rename from ztcrypto/src/hash.rs
rename to zerotier-core-crypto/src/hash.rs
diff --git a/ztcrypto/src/kbkdf.rs b/zerotier-core-crypto/src/kbkdf.rs
similarity index 100%
rename from ztcrypto/src/kbkdf.rs
rename to zerotier-core-crypto/src/kbkdf.rs
diff --git a/ztcrypto/src/lib.rs b/zerotier-core-crypto/src/lib.rs
similarity index 100%
rename from ztcrypto/src/lib.rs
rename to zerotier-core-crypto/src/lib.rs
diff --git a/ztcrypto/src/p521.rs b/zerotier-core-crypto/src/p521.rs
similarity index 100%
rename from ztcrypto/src/p521.rs
rename to zerotier-core-crypto/src/p521.rs
diff --git a/ztcrypto/src/poly1305.rs b/zerotier-core-crypto/src/poly1305.rs
similarity index 100%
rename from ztcrypto/src/poly1305.rs
rename to zerotier-core-crypto/src/poly1305.rs
diff --git a/ztcrypto/src/random.rs b/zerotier-core-crypto/src/random.rs
similarity index 100%
rename from ztcrypto/src/random.rs
rename to zerotier-core-crypto/src/random.rs
diff --git a/ztcrypto/src/salsa.rs b/zerotier-core-crypto/src/salsa.rs
similarity index 100%
rename from ztcrypto/src/salsa.rs
rename to zerotier-core-crypto/src/salsa.rs
diff --git a/ztcrypto/src/secret.rs b/zerotier-core-crypto/src/secret.rs
similarity index 100%
rename from ztcrypto/src/secret.rs
rename to zerotier-core-crypto/src/secret.rs
diff --git a/network-hypervisor/Cargo.toml b/zerotier-network-hypervisor/Cargo.toml
similarity index 89%
rename from network-hypervisor/Cargo.toml
rename to zerotier-network-hypervisor/Cargo.toml
index 225938abc..587b0c8e3 100644
--- a/network-hypervisor/Cargo.toml
+++ b/zerotier-network-hypervisor/Cargo.toml
@@ -10,7 +10,7 @@ codegen-units = 1
 panic = 'abort'
 
 [dependencies]
-ztcrypto = { path = "../ztcrypto" }
+zerotier-core-crypto = { path = "../zerotier-core-crypto" }
 base64 = "^0"
 urlencoding = "^2"
 lz4_flex = { version = "^0", features = ["safe-encode", "safe-decode", "checked-decode"] }
diff --git a/network-hypervisor/src/defaults.rs b/zerotier-network-hypervisor/src/defaults.rs
similarity index 100%
rename from network-hypervisor/src/defaults.rs
rename to zerotier-network-hypervisor/src/defaults.rs
diff --git a/network-hypervisor/src/error.rs b/zerotier-network-hypervisor/src/error.rs
similarity index 100%
rename from network-hypervisor/src/error.rs
rename to zerotier-network-hypervisor/src/error.rs
diff --git a/network-hypervisor/src/lib.rs b/zerotier-network-hypervisor/src/lib.rs
similarity index 100%
rename from network-hypervisor/src/lib.rs
rename to zerotier-network-hypervisor/src/lib.rs
diff --git a/network-hypervisor/src/util/gate.rs b/zerotier-network-hypervisor/src/util/gate.rs
similarity index 100%
rename from network-hypervisor/src/util/gate.rs
rename to zerotier-network-hypervisor/src/util/gate.rs
diff --git a/network-hypervisor/src/util/hex.rs b/zerotier-network-hypervisor/src/util/hex.rs
similarity index 100%
rename from network-hypervisor/src/util/hex.rs
rename to zerotier-network-hypervisor/src/util/hex.rs
diff --git a/network-hypervisor/src/util/mod.rs b/zerotier-network-hypervisor/src/util/mod.rs
similarity index 100%
rename from network-hypervisor/src/util/mod.rs
rename to zerotier-network-hypervisor/src/util/mod.rs
diff --git a/network-hypervisor/src/util/pool.rs b/zerotier-network-hypervisor/src/util/pool.rs
similarity index 100%
rename from network-hypervisor/src/util/pool.rs
rename to zerotier-network-hypervisor/src/util/pool.rs
diff --git a/network-hypervisor/src/util/varint.rs b/zerotier-network-hypervisor/src/util/varint.rs
similarity index 100%
rename from network-hypervisor/src/util/varint.rs
rename to zerotier-network-hypervisor/src/util/varint.rs
diff --git a/network-hypervisor/src/vl1/address.rs b/zerotier-network-hypervisor/src/vl1/address.rs
similarity index 100%
rename from network-hypervisor/src/vl1/address.rs
rename to zerotier-network-hypervisor/src/vl1/address.rs
diff --git a/network-hypervisor/src/vl1/buffer.rs b/zerotier-network-hypervisor/src/vl1/buffer.rs
similarity index 100%
rename from network-hypervisor/src/vl1/buffer.rs
rename to zerotier-network-hypervisor/src/vl1/buffer.rs
diff --git a/network-hypervisor/src/vl1/dictionary.rs b/zerotier-network-hypervisor/src/vl1/dictionary.rs
similarity index 100%
rename from network-hypervisor/src/vl1/dictionary.rs
rename to zerotier-network-hypervisor/src/vl1/dictionary.rs
diff --git a/network-hypervisor/src/vl1/endpoint.rs b/zerotier-network-hypervisor/src/vl1/endpoint.rs
similarity index 100%
rename from network-hypervisor/src/vl1/endpoint.rs
rename to zerotier-network-hypervisor/src/vl1/endpoint.rs
diff --git a/network-hypervisor/src/vl1/fragmentedpacket.rs b/zerotier-network-hypervisor/src/vl1/fragmentedpacket.rs
similarity index 100%
rename from network-hypervisor/src/vl1/fragmentedpacket.rs
rename to zerotier-network-hypervisor/src/vl1/fragmentedpacket.rs
diff --git a/network-hypervisor/src/vl1/identity.rs b/zerotier-network-hypervisor/src/vl1/identity.rs
similarity index 99%
rename from network-hypervisor/src/vl1/identity.rs
rename to zerotier-network-hypervisor/src/vl1/identity.rs
index 487b35bcd..b072d40e6 100644
--- a/network-hypervisor/src/vl1/identity.rs
+++ b/zerotier-network-hypervisor/src/vl1/identity.rs
@@ -8,12 +8,12 @@ use std::str::FromStr;
 
 use concat_arrays::concat_arrays;
 
-use ztcrypto::balloon;
-use ztcrypto::c25519::*;
-use ztcrypto::hash::*;
-use ztcrypto::p521::*;
-use ztcrypto::salsa::Salsa;
-use ztcrypto::secret::Secret;
+use zerotier_core_crypto::balloon;
+use zerotier_core_crypto::c25519::*;
+use zerotier_core_crypto::hash::*;
+use zerotier_core_crypto::p521::*;
+use zerotier_core_crypto::salsa::Salsa;
+use zerotier_core_crypto::secret::Secret;
 use crate::error::InvalidFormatError;
 use crate::vl1::Address;
 use crate::vl1::buffer::Buffer;
diff --git a/network-hypervisor/src/vl1/inetaddress.rs b/zerotier-network-hypervisor/src/vl1/inetaddress.rs
similarity index 100%
rename from network-hypervisor/src/vl1/inetaddress.rs
rename to zerotier-network-hypervisor/src/vl1/inetaddress.rs
diff --git a/network-hypervisor/src/vl1/locator.rs b/zerotier-network-hypervisor/src/vl1/locator.rs
similarity index 100%
rename from network-hypervisor/src/vl1/locator.rs
rename to zerotier-network-hypervisor/src/vl1/locator.rs
diff --git a/network-hypervisor/src/vl1/mac.rs b/zerotier-network-hypervisor/src/vl1/mac.rs
similarity index 100%
rename from network-hypervisor/src/vl1/mac.rs
rename to zerotier-network-hypervisor/src/vl1/mac.rs
diff --git a/network-hypervisor/src/vl1/mod.rs b/zerotier-network-hypervisor/src/vl1/mod.rs
similarity index 100%
rename from network-hypervisor/src/vl1/mod.rs
rename to zerotier-network-hypervisor/src/vl1/mod.rs
diff --git a/network-hypervisor/src/vl1/node.rs b/zerotier-network-hypervisor/src/vl1/node.rs
similarity index 99%
rename from network-hypervisor/src/vl1/node.rs
rename to zerotier-network-hypervisor/src/vl1/node.rs
index 1db06cf76..9db08f746 100644
--- a/network-hypervisor/src/vl1/node.rs
+++ b/zerotier-network-hypervisor/src/vl1/node.rs
@@ -5,7 +5,7 @@ use std::time::Duration;
 use dashmap::DashMap;
 use parking_lot::Mutex;
 
-use ztcrypto::random::{SecureRandom, next_u64_secure};
+use zerotier_core_crypto::random::{SecureRandom, next_u64_secure};
 use crate::error::InvalidParameterError;
 use crate::util::gate::IntervalGate;
 use crate::util::pool::{Pool, Pooled};
diff --git a/network-hypervisor/src/vl1/path.rs b/zerotier-network-hypervisor/src/vl1/path.rs
similarity index 100%
rename from network-hypervisor/src/vl1/path.rs
rename to zerotier-network-hypervisor/src/vl1/path.rs
diff --git a/network-hypervisor/src/vl1/peer.rs b/zerotier-network-hypervisor/src/vl1/peer.rs
similarity index 98%
rename from network-hypervisor/src/vl1/peer.rs
rename to zerotier-network-hypervisor/src/vl1/peer.rs
index 81070c37a..0bee61f9c 100644
--- a/network-hypervisor/src/vl1/peer.rs
+++ b/zerotier-network-hypervisor/src/vl1/peer.rs
@@ -6,15 +6,15 @@ use std::sync::atomic::{AtomicI64, AtomicU64, AtomicU8, Ordering};
 
 use parking_lot::Mutex;
 
-use ztcrypto::aes_gmac_siv::{AesCtr, AesGmacSiv};
-use ztcrypto::c25519::C25519KeyPair;
-use ztcrypto::hash::{SHA384, SHA384_HASH_SIZE};
-use ztcrypto::kbkdf::zt_kbkdf_hmac_sha384;
-use ztcrypto::p521::P521KeyPair;
-use ztcrypto::poly1305::Poly1305;
-use ztcrypto::random::next_u64_secure;
-use ztcrypto::salsa::Salsa;
-use ztcrypto::secret::Secret;
+use zerotier_core_crypto::aes_gmac_siv::{AesCtr, AesGmacSiv};
+use zerotier_core_crypto::c25519::C25519KeyPair;
+use zerotier_core_crypto::hash::{SHA384, SHA384_HASH_SIZE};
+use zerotier_core_crypto::kbkdf::zt_kbkdf_hmac_sha384;
+use zerotier_core_crypto::p521::P521KeyPair;
+use zerotier_core_crypto::poly1305::Poly1305;
+use zerotier_core_crypto::random::next_u64_secure;
+use zerotier_core_crypto::salsa::Salsa;
+use zerotier_core_crypto::secret::Secret;
 
 use crate::{VERSION_MAJOR, VERSION_MINOR, VERSION_PROTO, VERSION_REVISION};
 use crate::defaults::UDP_DEFAULT_MTU;
diff --git a/network-hypervisor/src/vl1/protocol.rs b/zerotier-network-hypervisor/src/vl1/protocol.rs
similarity index 100%
rename from network-hypervisor/src/vl1/protocol.rs
rename to zerotier-network-hypervisor/src/vl1/protocol.rs
diff --git a/network-hypervisor/src/vl1/rootset.rs b/zerotier-network-hypervisor/src/vl1/rootset.rs
similarity index 98%
rename from network-hypervisor/src/vl1/rootset.rs
rename to zerotier-network-hypervisor/src/vl1/rootset.rs
index b6a5a24f0..815df35a6 100644
--- a/network-hypervisor/src/vl1/rootset.rs
+++ b/zerotier-network-hypervisor/src/vl1/rootset.rs
@@ -3,10 +3,10 @@ use std::io::Write;
 
 use concat_arrays::concat_arrays;
 
-use ztcrypto::c25519::*;
-use ztcrypto::hash::SHA384;
-use ztcrypto::p521::*;
-use ztcrypto::secret::Secret;
+use zerotier_core_crypto::c25519::*;
+use zerotier_core_crypto::hash::SHA384;
+use zerotier_core_crypto::p521::*;
+use zerotier_core_crypto::secret::Secret;
 
 use crate::error::InvalidFormatError;
 use crate::vl1::{Endpoint, Identity};
diff --git a/network-hypervisor/src/vl1/whoisqueue.rs b/zerotier-network-hypervisor/src/vl1/whoisqueue.rs
similarity index 100%
rename from network-hypervisor/src/vl1/whoisqueue.rs
rename to zerotier-network-hypervisor/src/vl1/whoisqueue.rs
diff --git a/network-hypervisor/src/vl2/mod.rs b/zerotier-network-hypervisor/src/vl2/mod.rs
similarity index 100%
rename from network-hypervisor/src/vl2/mod.rs
rename to zerotier-network-hypervisor/src/vl2/mod.rs