diff --git a/.gitmodules b/.gitmodules
index eed27e0f71..5e65dc7b8f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "lib/wast/spec_testsuite"]
+[submodule "spec_testsuite"]
 	path = spec_testsuite
 	url = https://github.com/WebAssembly/testsuite
diff --git a/Cargo.toml b/Cargo.toml
index 12ea660bfb..f05aed71bd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,12 +25,12 @@ path = "src/wasm2obj.rs"
 [dependencies]
 cranelift-codegen = "0.29.0"
 cranelift-native = "0.29.0"
-wasmtime-debug = { path = "lib/debug" }
-wasmtime-environ = { path = "lib/environ" }
-wasmtime-runtime = { path = "lib/runtime" }
-wasmtime-jit = { path = "lib/jit" }
-wasmtime-obj = { path = "lib/obj" }
-wasmtime-wast = { path = "lib/wast" }
+wasmtime-debug = { path = "wasmtime-debug" }
+wasmtime-environ = { path = "wasmtime-environ" }
+wasmtime-runtime = { path = "wasmtime-runtime" }
+wasmtime-jit = { path = "wasmtime-jit" }
+wasmtime-obj = { path = "wasmtime-obj" }
+wasmtime-wast = { path = "wasmtime-wast" }
 docopt = "1.0.1"
 serde = "1.0.75"
 serde_derive = "1.0.75"
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 647e1a47d2..6b9f73a792 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -9,8 +9,8 @@ publish = false
 cargo-fuzz = true
 
 [dependencies]
-wasmtime-environ = { path = "../lib/environ" }
-wasmtime-jit = { path = "../lib/jit" }
+wasmtime-environ = { path = "../wasmtime-environ" }
+wasmtime-jit = { path = "../wasmtime-jit" }
 cranelift-codegen = "0.29.0"
 cranelift-wasm = "0.29.0"
 cranelift-native = "0.29.0"
diff --git a/publish-all.sh b/publish-all.sh
index d1d936fc2e..471f92ea96 100755
--- a/publish-all.sh
+++ b/publish-all.sh
@@ -15,7 +15,7 @@ version="0.1.0"
 #
 # The main Cargo.toml in the top-level directory is the wasmtime-tools crate which we don't publish.
 echo "Updating crate versions to $version"
-for crate in . lib/*; do
+for crate in . wasmtime-*; do
     # Update the version number of this crate to $version.
     sed -i.bk -e "s/^version = .*/version = \"$version\"/" \
         "$crate/Cargo.toml"
@@ -36,7 +36,7 @@ cargo update
 echo git commit -a -m "\"Bump version to $version"\"
 echo git push
 for crate in \
-    environ
+    wasmtime-environ
 do
-    echo cargo publish --manifest-path "lib/$crate/Cargo.toml"
+    echo cargo publish --manifest-path "$crate/Cargo.toml"
 done
diff --git a/lib/debug/.gitignore b/wasmtime-debug/.gitignore
similarity index 100%
rename from lib/debug/.gitignore
rename to wasmtime-debug/.gitignore
diff --git a/lib/debug/Cargo.toml b/wasmtime-debug/Cargo.toml
similarity index 92%
rename from lib/debug/Cargo.toml
rename to wasmtime-debug/Cargo.toml
index 1d0913cc8c..7239918c0b 100644
--- a/lib/debug/Cargo.toml
+++ b/wasmtime-debug/Cargo.toml
@@ -18,7 +18,7 @@ cranelift-codegen = "0.29.0"
 cranelift-entity = "0.29.0"
 cranelift-wasm = "0.29.0"
 faerie = "0.7.0"
-wasmtime-environ = { path = "../environ", default-features = false }
+wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
 target-lexicon = { version = "0.2.0", default-features = false }
 failure = { version = "0.1.3", default-features = false }
 failure_derive = { version = "0.1.3", default-features = false }
diff --git a/lib/debug/LICENSE b/wasmtime-debug/LICENSE
similarity index 100%
rename from lib/debug/LICENSE
rename to wasmtime-debug/LICENSE
diff --git a/lib/debug/README.md b/wasmtime-debug/README.md
similarity index 100%
rename from lib/debug/README.md
rename to wasmtime-debug/README.md
diff --git a/lib/debug/src/address_transform.rs b/wasmtime-debug/src/address_transform.rs
similarity index 100%
rename from lib/debug/src/address_transform.rs
rename to wasmtime-debug/src/address_transform.rs
diff --git a/lib/debug/src/lib.rs b/wasmtime-debug/src/lib.rs
similarity index 100%
rename from lib/debug/src/lib.rs
rename to wasmtime-debug/src/lib.rs
diff --git a/lib/debug/src/read_debuginfo.rs b/wasmtime-debug/src/read_debuginfo.rs
similarity index 100%
rename from lib/debug/src/read_debuginfo.rs
rename to wasmtime-debug/src/read_debuginfo.rs
diff --git a/lib/debug/src/transform.rs b/wasmtime-debug/src/transform.rs
similarity index 100%
rename from lib/debug/src/transform.rs
rename to wasmtime-debug/src/transform.rs
diff --git a/lib/debug/src/write_debuginfo.rs b/wasmtime-debug/src/write_debuginfo.rs
similarity index 100%
rename from lib/debug/src/write_debuginfo.rs
rename to wasmtime-debug/src/write_debuginfo.rs
diff --git a/lib/environ/.gitignore b/wasmtime-environ/.gitignore
similarity index 100%
rename from lib/environ/.gitignore
rename to wasmtime-environ/.gitignore
diff --git a/lib/environ/Cargo.toml b/wasmtime-environ/Cargo.toml
similarity index 100%
rename from lib/environ/Cargo.toml
rename to wasmtime-environ/Cargo.toml
diff --git a/lib/environ/LICENSE b/wasmtime-environ/LICENSE
similarity index 100%
rename from lib/environ/LICENSE
rename to wasmtime-environ/LICENSE
diff --git a/lib/environ/README.md b/wasmtime-environ/README.md
similarity index 100%
rename from lib/environ/README.md
rename to wasmtime-environ/README.md
diff --git a/lib/environ/src/compilation.rs b/wasmtime-environ/src/compilation.rs
similarity index 100%
rename from lib/environ/src/compilation.rs
rename to wasmtime-environ/src/compilation.rs
diff --git a/lib/environ/src/cranelift.rs b/wasmtime-environ/src/cranelift.rs
similarity index 100%
rename from lib/environ/src/cranelift.rs
rename to wasmtime-environ/src/cranelift.rs
diff --git a/lib/environ/src/func_environ.rs b/wasmtime-environ/src/func_environ.rs
similarity index 100%
rename from lib/environ/src/func_environ.rs
rename to wasmtime-environ/src/func_environ.rs
diff --git a/lib/environ/src/lib.rs b/wasmtime-environ/src/lib.rs
similarity index 100%
rename from lib/environ/src/lib.rs
rename to wasmtime-environ/src/lib.rs
diff --git a/lib/environ/src/module.rs b/wasmtime-environ/src/module.rs
similarity index 100%
rename from lib/environ/src/module.rs
rename to wasmtime-environ/src/module.rs
diff --git a/lib/environ/src/module_environ.rs b/wasmtime-environ/src/module_environ.rs
similarity index 100%
rename from lib/environ/src/module_environ.rs
rename to wasmtime-environ/src/module_environ.rs
diff --git a/lib/environ/src/tunables.rs b/wasmtime-environ/src/tunables.rs
similarity index 100%
rename from lib/environ/src/tunables.rs
rename to wasmtime-environ/src/tunables.rs
diff --git a/lib/environ/src/vmoffsets.rs b/wasmtime-environ/src/vmoffsets.rs
similarity index 100%
rename from lib/environ/src/vmoffsets.rs
rename to wasmtime-environ/src/vmoffsets.rs
diff --git a/lib/jit/Cargo.toml b/wasmtime-jit/Cargo.toml
similarity index 82%
rename from lib/jit/Cargo.toml
rename to wasmtime-jit/Cargo.toml
index 15b568a78c..0e88b561a4 100644
--- a/lib/jit/Cargo.toml
+++ b/wasmtime-jit/Cargo.toml
@@ -16,9 +16,9 @@ cranelift-codegen = "0.29.0"
 cranelift-entity = "0.29.0"
 cranelift-wasm = "0.29.0"
 cranelift-frontend = "0.29.0"
-wasmtime-environ = { path = "../environ", default-features = false }
-wasmtime-runtime = { path = "../runtime", default-features = false }
-wasmtime-debug = { path = "../debug", default-features = false }
+wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
+wasmtime-runtime = { path = "../wasmtime-runtime", default-features = false }
+wasmtime-debug = { path = "../wasmtime-debug", default-features = false }
 region = "2.0.0"
 failure = { version = "0.1.3", default-features = false }
 failure_derive = { version = "0.1.3", default-features = false }
diff --git a/lib/jit/LICENSE b/wasmtime-jit/LICENSE
similarity index 100%
rename from lib/jit/LICENSE
rename to wasmtime-jit/LICENSE
diff --git a/lib/jit/README.md b/wasmtime-jit/README.md
similarity index 100%
rename from lib/jit/README.md
rename to wasmtime-jit/README.md
diff --git a/lib/jit/src/action.rs b/wasmtime-jit/src/action.rs
similarity index 100%
rename from lib/jit/src/action.rs
rename to wasmtime-jit/src/action.rs
diff --git a/lib/jit/src/code_memory.rs b/wasmtime-jit/src/code_memory.rs
similarity index 100%
rename from lib/jit/src/code_memory.rs
rename to wasmtime-jit/src/code_memory.rs
diff --git a/lib/jit/src/compiler.rs b/wasmtime-jit/src/compiler.rs
similarity index 100%
rename from lib/jit/src/compiler.rs
rename to wasmtime-jit/src/compiler.rs
diff --git a/lib/jit/src/context.rs b/wasmtime-jit/src/context.rs
similarity index 100%
rename from lib/jit/src/context.rs
rename to wasmtime-jit/src/context.rs
diff --git a/lib/jit/src/instantiate.rs b/wasmtime-jit/src/instantiate.rs
similarity index 100%
rename from lib/jit/src/instantiate.rs
rename to wasmtime-jit/src/instantiate.rs
diff --git a/lib/jit/src/lib.rs b/wasmtime-jit/src/lib.rs
similarity index 100%
rename from lib/jit/src/lib.rs
rename to wasmtime-jit/src/lib.rs
diff --git a/lib/jit/src/link.rs b/wasmtime-jit/src/link.rs
similarity index 100%
rename from lib/jit/src/link.rs
rename to wasmtime-jit/src/link.rs
diff --git a/lib/jit/src/namespace.rs b/wasmtime-jit/src/namespace.rs
similarity index 100%
rename from lib/jit/src/namespace.rs
rename to wasmtime-jit/src/namespace.rs
diff --git a/lib/jit/src/resolver.rs b/wasmtime-jit/src/resolver.rs
similarity index 100%
rename from lib/jit/src/resolver.rs
rename to wasmtime-jit/src/resolver.rs
diff --git a/lib/jit/src/target_tunables.rs b/wasmtime-jit/src/target_tunables.rs
similarity index 100%
rename from lib/jit/src/target_tunables.rs
rename to wasmtime-jit/src/target_tunables.rs
diff --git a/lib/obj/.gitignore b/wasmtime-obj/.gitignore
similarity index 100%
rename from lib/obj/.gitignore
rename to wasmtime-obj/.gitignore
diff --git a/lib/obj/Cargo.toml b/wasmtime-obj/Cargo.toml
similarity index 90%
rename from lib/obj/Cargo.toml
rename to wasmtime-obj/Cargo.toml
index c90c8a0ec7..7fecde0e7e 100644
--- a/lib/obj/Cargo.toml
+++ b/wasmtime-obj/Cargo.toml
@@ -15,5 +15,5 @@ edition = "2018"
 cranelift-codegen = "0.29.0"
 cranelift-entity = "0.29.0"
 cranelift-wasm = "0.29.0"
-wasmtime-environ = { path = "../environ" }
+wasmtime-environ = { path = "../wasmtime-environ" }
 faerie = "0.7.1"
diff --git a/lib/obj/LICENSE b/wasmtime-obj/LICENSE
similarity index 100%
rename from lib/obj/LICENSE
rename to wasmtime-obj/LICENSE
diff --git a/lib/obj/README.md b/wasmtime-obj/README.md
similarity index 100%
rename from lib/obj/README.md
rename to wasmtime-obj/README.md
diff --git a/lib/obj/src/context.rs b/wasmtime-obj/src/context.rs
similarity index 100%
rename from lib/obj/src/context.rs
rename to wasmtime-obj/src/context.rs
diff --git a/lib/obj/src/data_segment.rs b/wasmtime-obj/src/data_segment.rs
similarity index 100%
rename from lib/obj/src/data_segment.rs
rename to wasmtime-obj/src/data_segment.rs
diff --git a/lib/obj/src/function.rs b/wasmtime-obj/src/function.rs
similarity index 100%
rename from lib/obj/src/function.rs
rename to wasmtime-obj/src/function.rs
diff --git a/lib/obj/src/lib.rs b/wasmtime-obj/src/lib.rs
similarity index 100%
rename from lib/obj/src/lib.rs
rename to wasmtime-obj/src/lib.rs
diff --git a/lib/obj/src/module.rs b/wasmtime-obj/src/module.rs
similarity index 100%
rename from lib/obj/src/module.rs
rename to wasmtime-obj/src/module.rs
diff --git a/lib/obj/src/table.rs b/wasmtime-obj/src/table.rs
similarity index 100%
rename from lib/obj/src/table.rs
rename to wasmtime-obj/src/table.rs
diff --git a/lib/runtime/Cargo.toml b/wasmtime-runtime/Cargo.toml
similarity index 93%
rename from lib/runtime/Cargo.toml
rename to wasmtime-runtime/Cargo.toml
index e976c67a19..ff156fe606 100644
--- a/lib/runtime/Cargo.toml
+++ b/wasmtime-runtime/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2018"
 cranelift-codegen = "0.29.0"
 cranelift-entity = "0.29.0"
 cranelift-wasm = "0.29.0"
-wasmtime-environ = { path = "../environ", default-features = false }
+wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
 region = "2.0.0"
 lazy_static = "1.2.0"
 libc = { version = "0.2.44", default-features = false }
diff --git a/lib/runtime/LICENSE b/wasmtime-runtime/LICENSE
similarity index 100%
rename from lib/runtime/LICENSE
rename to wasmtime-runtime/LICENSE
diff --git a/lib/runtime/README.md b/wasmtime-runtime/README.md
similarity index 100%
rename from lib/runtime/README.md
rename to wasmtime-runtime/README.md
diff --git a/lib/runtime/build.rs b/wasmtime-runtime/build.rs
similarity index 100%
rename from lib/runtime/build.rs
rename to wasmtime-runtime/build.rs
diff --git a/lib/runtime/signalhandlers/CMakeLists.txt b/wasmtime-runtime/signalhandlers/CMakeLists.txt
similarity index 100%
rename from lib/runtime/signalhandlers/CMakeLists.txt
rename to wasmtime-runtime/signalhandlers/CMakeLists.txt
diff --git a/lib/runtime/signalhandlers/SignalHandlers.cpp b/wasmtime-runtime/signalhandlers/SignalHandlers.cpp
similarity index 100%
rename from lib/runtime/signalhandlers/SignalHandlers.cpp
rename to wasmtime-runtime/signalhandlers/SignalHandlers.cpp
diff --git a/lib/runtime/signalhandlers/SignalHandlers.hpp b/wasmtime-runtime/signalhandlers/SignalHandlers.hpp
similarity index 100%
rename from lib/runtime/signalhandlers/SignalHandlers.hpp
rename to wasmtime-runtime/signalhandlers/SignalHandlers.hpp
diff --git a/lib/runtime/src/export.rs b/wasmtime-runtime/src/export.rs
similarity index 100%
rename from lib/runtime/src/export.rs
rename to wasmtime-runtime/src/export.rs
diff --git a/lib/runtime/src/imports.rs b/wasmtime-runtime/src/imports.rs
similarity index 100%
rename from lib/runtime/src/imports.rs
rename to wasmtime-runtime/src/imports.rs
diff --git a/lib/runtime/src/instance.rs b/wasmtime-runtime/src/instance.rs
similarity index 100%
rename from lib/runtime/src/instance.rs
rename to wasmtime-runtime/src/instance.rs
diff --git a/lib/runtime/src/jit_int.rs b/wasmtime-runtime/src/jit_int.rs
similarity index 100%
rename from lib/runtime/src/jit_int.rs
rename to wasmtime-runtime/src/jit_int.rs
diff --git a/lib/runtime/src/lib.rs b/wasmtime-runtime/src/lib.rs
similarity index 100%
rename from lib/runtime/src/lib.rs
rename to wasmtime-runtime/src/lib.rs
diff --git a/lib/runtime/src/libcalls.rs b/wasmtime-runtime/src/libcalls.rs
similarity index 100%
rename from lib/runtime/src/libcalls.rs
rename to wasmtime-runtime/src/libcalls.rs
diff --git a/lib/runtime/src/memory.rs b/wasmtime-runtime/src/memory.rs
similarity index 100%
rename from lib/runtime/src/memory.rs
rename to wasmtime-runtime/src/memory.rs
diff --git a/lib/runtime/src/mmap.rs b/wasmtime-runtime/src/mmap.rs
similarity index 100%
rename from lib/runtime/src/mmap.rs
rename to wasmtime-runtime/src/mmap.rs
diff --git a/lib/runtime/src/sig_registry.rs b/wasmtime-runtime/src/sig_registry.rs
similarity index 100%
rename from lib/runtime/src/sig_registry.rs
rename to wasmtime-runtime/src/sig_registry.rs
diff --git a/lib/runtime/src/signalhandlers.rs b/wasmtime-runtime/src/signalhandlers.rs
similarity index 100%
rename from lib/runtime/src/signalhandlers.rs
rename to wasmtime-runtime/src/signalhandlers.rs
diff --git a/lib/runtime/src/table.rs b/wasmtime-runtime/src/table.rs
similarity index 100%
rename from lib/runtime/src/table.rs
rename to wasmtime-runtime/src/table.rs
diff --git a/lib/runtime/src/traphandlers.rs b/wasmtime-runtime/src/traphandlers.rs
similarity index 100%
rename from lib/runtime/src/traphandlers.rs
rename to wasmtime-runtime/src/traphandlers.rs
diff --git a/lib/runtime/src/vmcontext.rs b/wasmtime-runtime/src/vmcontext.rs
similarity index 100%
rename from lib/runtime/src/vmcontext.rs
rename to wasmtime-runtime/src/vmcontext.rs
diff --git a/lib/wast/Cargo.toml b/wasmtime-wast/Cargo.toml
similarity index 83%
rename from lib/wast/Cargo.toml
rename to wasmtime-wast/Cargo.toml
index c12b02b1d8..a7a450e971 100644
--- a/lib/wast/Cargo.toml
+++ b/wasmtime-wast/Cargo.toml
@@ -16,9 +16,9 @@ cranelift-codegen = "0.29.0"
 cranelift-native = "0.29.0"
 cranelift-wasm = "0.29.0"
 cranelift-entity = "0.29.0"
-wasmtime-jit = { path = "../jit" }
-wasmtime-runtime = { path = "../runtime" }
-wasmtime-environ = { path = "../environ" }
+wasmtime-jit = { path = "../wasmtime-jit" }
+wasmtime-runtime = { path = "../wasmtime-runtime" }
+wasmtime-environ = { path = "../wasmtime-environ" }
 wabt = "0.7"
 target-lexicon = "0.2.0"
 failure = { version = "0.1.3", default-features = false }
diff --git a/lib/wast/LICENSE b/wasmtime-wast/LICENSE
similarity index 100%
rename from lib/wast/LICENSE
rename to wasmtime-wast/LICENSE
diff --git a/lib/wast/README.md b/wasmtime-wast/README.md
similarity index 100%
rename from lib/wast/README.md
rename to wasmtime-wast/README.md
diff --git a/lib/wast/src/lib.rs b/wasmtime-wast/src/lib.rs
similarity index 100%
rename from lib/wast/src/lib.rs
rename to wasmtime-wast/src/lib.rs
diff --git a/lib/wast/src/spectest.rs b/wasmtime-wast/src/spectest.rs
similarity index 100%
rename from lib/wast/src/spectest.rs
rename to wasmtime-wast/src/spectest.rs
diff --git a/lib/wast/src/wast.rs b/wasmtime-wast/src/wast.rs
similarity index 100%
rename from lib/wast/src/wast.rs
rename to wasmtime-wast/src/wast.rs