diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fa7f30ccc4..699f4bc8ff 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -46,8 +46,8 @@ jobs:
       with:
         submodules: true
     - uses: ./.github/actions/install-rust
+    - run: cargo doc --no-deps -p wasmtime-cli
     - run: cargo doc --no-deps -p wasmtime
-    - run: cargo doc --no-deps -p wasmtime-api
     - run: cargo doc --no-deps -p wasmtime-debug
     - run: cargo doc --no-deps -p wasmtime-environ
     - run: cargo doc --no-deps -p wasmtime-interface-types
@@ -134,7 +134,7 @@ jobs:
       with:
         toolchain: nightly-2019-08-15
     - uses: ./.github/actions/binary-compatible-builds
-    - run: mkdir misc/wasmtime-py/wheelhouse
+    - run: mkdir crates/misc/py/wheelhouse
       shell: bash
 
     # Install Python & dependencies needed for our `setup.py` scripts
@@ -145,13 +145,13 @@ jobs:
         architecture: x64
     - run: $CENTOS pip3 install setuptools wheel==0.31.1 setuptools-rust
       shell: bash
-    - run: (cd misc/wasmtime-py && $CENTOS $python setup.py bdist_wheel)
+    - run: (cd crates/misc/py && $CENTOS $python setup.py bdist_wheel)
       shell: bash
 
     # Clear the build directory between building different wheels for different
     # Python versions to ensure that we don't package dynamic libraries twice by
     # accident.
-    - run: $CENTOS rm -rf misc/wasmtime-py/build
+    - run: $CENTOS rm -rf crates/misc/py/build
       shell: bash
 
     # Set up Python 3.7 (and build it on Linux), reinstall dependencies, then
@@ -167,18 +167,18 @@ jobs:
       if: matrix.os == 'ubuntu-latest'
     - run: $CENTOS pip3 install setuptools wheel==0.31.1 setuptools-rust auditwheel
       shell: bash
-    - run: (cd misc/wasmtime-py && $CENTOS $python setup.py bdist_wheel)
+    - run: (cd crates/misc/py && $CENTOS $python setup.py bdist_wheel)
       shell: bash
 
     # Move `dist/*.whl` into `wheelhouse/` so we can deploy them, but on Linux we
     # need to run an `auditwheel` command as well to turn these into "manylinux"
     # wheels to run across a number of distributions.
-    - run: cp misc/wasmtime-py/dist/*.whl misc/wasmtime-py/wheelhouse/
+    - run: cp crates/misc/py/dist/*.whl crates/misc/py/wheelhouse/
       shell: bash
       if: matrix.os != 'ubuntu-latest'
     - run: |
         set -e
-        cd misc/wasmtime-py
+        cd crates/misc/py
         for whl in dist/*.whl; do
             $CENTOS auditwheel repair "$whl" -w wheelhouse/
         done
@@ -189,7 +189,7 @@ jobs:
     - uses: actions/upload-artifact@v1
       with:
         name: wheels-${{ matrix.os }}
-        path: misc/wasmtime-py/wheelhouse
+        path: crates/misc/py/wheelhouse
 
   # Perform release builds of `wasmtime` and `libwasmtime_api.so`. Builds on
   # Windows/Mac/Linux, and artifacts are uploaded after the build is finished.
@@ -216,10 +216,10 @@ jobs:
     - run: $CENTOS cargo build --release --bin wasmtime --bin wasm2obj
       shell: bash
     # Build `libwasmtime_api.so`
-    - run: $CENTOS cargo build --release --manifest-path wasmtime-api/Cargo.toml
+    - run: $CENTOS cargo build --release --manifest-path crates/api/Cargo.toml
       shell: bash
     # Test what we just built
-    - run: $CENTOS cargo test --features wasi-common/wasm_tests --release --all --exclude lightbeam --exclude wasmtime-wasi-c --exclude wasmtime-py --exclude wasmtime-api
+    - run: $CENTOS cargo test --features wasi-common/wasm_tests --release --all --exclude lightbeam --exclude wasmtime-wasi-c --exclude wasmtime-py --exclude wasmtime
       shell: bash
       env:
         RUST_BACKTRACE: 1
diff --git a/.gitmodules b/.gitmodules
index e64d540ed0..6447c5a6c9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "spec_testsuite"]
-	path = spec_testsuite
+	path = tests/spec_testsuite
 	url = https://github.com/WebAssembly/testsuite
-[submodule "wasmtime-api/c-examples/wasm-c-api"]
-	path = wasmtime-api/c-examples/wasm-c-api
+[submodule "crates/api/c-examples/wasm-c-api"]
+	path = crates/api/c-examples/wasm-c-api
 	url = https://github.com/WebAssembly/wasm-c-api
-[submodule "wasi-common/WASI"]
-	path = wasi-common/WASI
+[submodule "crates/wasi-common/WASI"]
+	path = crates/wasi-common/WASI
 	url = https://github.com/WebAssembly/WASI
diff --git a/Cargo.toml b/Cargo.toml
index 3c47549512..4fc28b47b2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "wasmtime"
+name = "wasmtime-cli"
 authors = ["The Wasmtime Project Developers"]
 version = "0.2.0"
 description = "Command-line interface for Wasmtime"
@@ -15,17 +15,17 @@ cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
 cranelift-native = { version = "0.49" }
-wasmtime-api = { path = "wasmtime-api" }
-wasmtime-debug = { path = "wasmtime-debug" }
-wasmtime-environ = { path = "wasmtime-environ" }
-wasmtime-interface-types = { path = "wasmtime-interface-types" }
-wasmtime-runtime = { path = "wasmtime-runtime" }
-wasmtime-jit = { path = "wasmtime-jit" }
-wasmtime-obj = { path = "wasmtime-obj" }
-wasmtime-wast = { path = "wasmtime-wast" }
-wasmtime-wasi = { path = "wasmtime-wasi" }
-wasmtime-wasi-c = { path = "wasmtime-wasi-c", optional = true }
-wasi-common = { path = "wasi-common" }
+wasmtime = { path = "crates/api" }
+wasmtime-debug = { path = "crates/debug" }
+wasmtime-environ = { path = "crates/environ" }
+wasmtime-interface-types = { path = "crates/interface-types" }
+wasmtime-runtime = { path = "crates/runtime" }
+wasmtime-jit = { path = "crates/jit" }
+wasmtime-obj = { path = "crates/obj" }
+wasmtime-wast = { path = "crates/wast" }
+wasmtime-wasi = { path = "crates/wasi" }
+wasmtime-wasi-c = { path = "crates/wasi-c", optional = true }
+wasi-common = { path = "crates/wasi-common" }
 docopt = "1.0.1"
 serde = { "version" = "1.0.94", features = ["derive"] }
 faerie = "0.12.0"
@@ -43,11 +43,11 @@ anyhow = "1.0.19"
 
 [workspace]
 members = [
-  "misc/wasmtime-rust",
-  "misc/wasmtime-py",
+  "crates/misc/rust",
+  "crates/misc/py",
 ]
 
-exclude = ["wasi-common/wasi-misc-tests"]
+exclude = ["crates/wasi-common/wasi-misc-tests"]
 
 [features]
 # Enable all supported architectures by default.
diff --git a/README.md b/README.md
index e2fb72de08..3c9813b635 100644
--- a/README.md
+++ b/README.md
@@ -25,8 +25,8 @@ for a tutorial on compiling and running programs using WASI and wasmtime, as
 well as an overview of the filesystem sandboxing system.
 
 Wasmtime passes the [WebAssembly spec testsuite]. To run it, update the
-`spec_testsuite` submodule with `git submodule update --remote`, and it will
-be run as part of `cargo test`.
+`tests/spec_testsuite` submodule with `git submodule update --remote`, and it
+will be run as part of `cargo test`.
 
 Wasmtime does not yet implement Spectre mitigations, however this is a subject
 of ongoing research.
@@ -50,13 +50,13 @@ Additional goals for Wasmtime include:
 
 #### Including Wasmtime in your project
 
-Wasmtime exposes an API for embedding as a library through the `wasmtime-api` subcrate,
+Wasmtime exposes an API for embedding as a library through the `wasmtime` subcrate,
 which contains both a [high-level and safe Rust API], as well as a C-compatible API
 compatible with the [proposed WebAssembly C API].
 
 For more information, see the [Rust API embedding chapter] of the Wasmtime documentation.
 
-[high-level and safe Rust API]: https://docs.rs/wasmtime-api/
+[high-level and safe Rust API]: https://docs.rs/wasmtime/
 [proposed WebAssembly C API]: https://github.com/WebAssembly/wasm-c-api
 [Rust API embedding chapter]: https://cranestation.github.io/wasmtime/embed-rust.html
 
diff --git a/build.rs b/build.rs
index 0c3bf69053..440ad8b3d2 100644
--- a/build.rs
+++ b/build.rs
@@ -25,34 +25,38 @@ fn main() -> anyhow::Result<()> {
         writeln!(out, "#[allow(non_snake_case)]")?;
         writeln!(out, "mod {} {{", strategy)?;
 
-        test_directory(&mut out, "misc_testsuite", strategy)?;
-        let spec_tests = test_directory(&mut out, "spec_testsuite", strategy)?;
+        test_directory(&mut out, "tests/misc_testsuite", strategy)?;
+        let spec_tests = test_directory(&mut out, "tests/spec_testsuite", strategy)?;
         // Skip running spec_testsuite tests if the submodule isn't checked
         // out.
         if spec_tests > 0 {
             start_test_module(&mut out, "simd")?;
             write_testsuite_tests(
                 &mut out,
-                "spec_testsuite/proposals/simd/simd_address.wast",
+                "tests/spec_testsuite/proposals/simd/simd_address.wast",
                 "simd",
                 strategy,
             )?;
             write_testsuite_tests(
                 &mut out,
-                "spec_testsuite/proposals/simd/simd_align.wast",
+                "tests/spec_testsuite/proposals/simd/simd_align.wast",
                 "simd",
                 strategy,
             )?;
             write_testsuite_tests(
                 &mut out,
-                "spec_testsuite/proposals/simd/simd_const.wast",
+                "tests/spec_testsuite/proposals/simd/simd_const.wast",
                 "simd",
                 strategy,
             )?;
             finish_test_module(&mut out)?;
 
-            test_directory(&mut out, "spec_testsuite/proposals/multi-value", strategy)
-                .expect("generating tests");
+            test_directory(
+                &mut out,
+                "tests/spec_testsuite/proposals/multi-value",
+                strategy,
+            )
+            .expect("generating tests");
         } else {
             println!("cargo:warning=The spec testsuite is disabled. To enable, run `git submodule update --remote`.");
         }
diff --git a/ci/build-tarballs.sh b/ci/build-tarballs.sh
index 0c84db2743..2188c2cf4d 100755
--- a/ci/build-tarballs.sh
+++ b/ci/build-tarballs.sh
@@ -32,7 +32,7 @@ mktarball() {
 # Create the main tarball of binaries
 bin_pkgname=wasmtime-$TAG-$platform
 mkdir tmp/$bin_pkgname
-cp LICENSE README.md CACHE_CONFIGURATION.md tmp/$bin_pkgname
+cp LICENSE README.md docs/CACHE_CONFIGURATION.md tmp/$bin_pkgname
 mv bins-$src/{wasmtime,wasm2obj}$exe tmp/$bin_pkgname
 chmod +x tmp/$bin_pkgname/{wasmtime,wasm2obj}$exe
 mktarball $bin_pkgname
@@ -48,7 +48,7 @@ mkdir tmp/$api_pkgname/lib
 mkdir tmp/$api_pkgname/include
 cp LICENSE README.md tmp/$api_pkgname
 mv bins-$src/* tmp/$api_pkgname/lib
-cp wasmtime-api/c-examples/wasm-c-api/include/wasm.h tmp/$api_pkgname/include
+cp crates/api/c-examples/wasm-c-api/include/wasm.h tmp/$api_pkgname/include
 mktarball $api_pkgname
 
 # Move wheels to dist folder
diff --git a/wasmtime-api/Cargo.toml b/crates/api/Cargo.toml
similarity index 84%
rename from wasmtime-api/Cargo.toml
rename to crates/api/Cargo.toml
index 0a89fd71e5..3b2d787d82 100644
--- a/wasmtime-api/Cargo.toml
+++ b/crates/api/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "wasmtime-api"
+name = "wasmtime"
 authors = ["The Wasmtime Project Developers"]
 version = "0.1.0"
 description = "High-level API to expose the Wasmtime runtime"
@@ -17,9 +17,9 @@ cranelift-native = { version = "0.49" }
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
 cranelift-frontend = { version = "0.49" }
-wasmtime-runtime = { path="../wasmtime-runtime" }
-wasmtime-environ = { path="../wasmtime-environ" }
-wasmtime-jit = { path="../wasmtime-jit" }
+wasmtime-runtime = { path="../runtime" }
+wasmtime-environ = { path="../environ" }
+wasmtime-jit = { path="../jit" }
 wasmparser = { version = "0.39.2", default-features = false }
 target-lexicon = { version = "0.9.0", default-features = false }
 anyhow = "1.0.19"
@@ -38,7 +38,7 @@ wasi-common = { path = "../wasi-common" }
 docopt = "1.0.1"
 serde = { "version" = "1.0.94", features = ["derive"] }
 pretty_env_logger = "0.3.0"
-wasmtime-wast = { path="../wasmtime-wast" }
-wasmtime-wasi = { path="../wasmtime-wasi" }
+wasmtime-wast = { path="../wast" }
+wasmtime-wasi = { path="../wasi" }
 rayon = "1.1"
 file-per-thread-logger = "0.1.1"
diff --git a/lightbeam/LICENSE b/crates/api/LICENSE
similarity index 100%
rename from lightbeam/LICENSE
rename to crates/api/LICENSE
diff --git a/wasmtime-api/README.md b/crates/api/README.md
similarity index 100%
rename from wasmtime-api/README.md
rename to crates/api/README.md
diff --git a/wasmtime-api/c-examples/Makefile b/crates/api/c-examples/Makefile
similarity index 100%
rename from wasmtime-api/c-examples/Makefile
rename to crates/api/c-examples/Makefile
diff --git a/crates/api/c-examples/wasm-c-api b/crates/api/c-examples/wasm-c-api
new file mode 160000
index 0000000000..8782d5b456
--- /dev/null
+++ b/crates/api/c-examples/wasm-c-api
@@ -0,0 +1 @@
+Subproject commit 8782d5b456f39e5ebf86bbbfa88d0ac13743edfa
diff --git a/wasmtime-api/examples/gcd.rs b/crates/api/examples/gcd.rs
similarity index 100%
rename from wasmtime-api/examples/gcd.rs
rename to crates/api/examples/gcd.rs
diff --git a/wasmtime-api/examples/gcd.wasm b/crates/api/examples/gcd.wasm
similarity index 100%
rename from wasmtime-api/examples/gcd.wasm
rename to crates/api/examples/gcd.wasm
diff --git a/wasmtime-api/examples/hello.rs b/crates/api/examples/hello.rs
similarity index 100%
rename from wasmtime-api/examples/hello.rs
rename to crates/api/examples/hello.rs
diff --git a/wasmtime-api/examples/hello.wasm b/crates/api/examples/hello.wasm
similarity index 100%
rename from wasmtime-api/examples/hello.wasm
rename to crates/api/examples/hello.wasm
diff --git a/wasmtime-api/examples/hello.wat b/crates/api/examples/hello.wat
similarity index 100%
rename from wasmtime-api/examples/hello.wat
rename to crates/api/examples/hello.wat
diff --git a/wasmtime-api/examples/memory.rs b/crates/api/examples/memory.rs
similarity index 100%
rename from wasmtime-api/examples/memory.rs
rename to crates/api/examples/memory.rs
diff --git a/wasmtime-api/examples/memory.wasm b/crates/api/examples/memory.wasm
similarity index 100%
rename from wasmtime-api/examples/memory.wasm
rename to crates/api/examples/memory.wasm
diff --git a/wasmtime-api/examples/memory.wat b/crates/api/examples/memory.wat
similarity index 100%
rename from wasmtime-api/examples/memory.wat
rename to crates/api/examples/memory.wat
diff --git a/wasmtime-api/examples/multi.rs b/crates/api/examples/multi.rs
similarity index 100%
rename from wasmtime-api/examples/multi.rs
rename to crates/api/examples/multi.rs
diff --git a/wasmtime-api/examples/multi.wasm b/crates/api/examples/multi.wasm
similarity index 100%
rename from wasmtime-api/examples/multi.wasm
rename to crates/api/examples/multi.wasm
diff --git a/wasmtime-api/examples/multi.wat b/crates/api/examples/multi.wat
similarity index 100%
rename from wasmtime-api/examples/multi.wat
rename to crates/api/examples/multi.wat
diff --git a/wasmtime-api/src/callable.rs b/crates/api/src/callable.rs
similarity index 100%
rename from wasmtime-api/src/callable.rs
rename to crates/api/src/callable.rs
diff --git a/wasmtime-api/src/context.rs b/crates/api/src/context.rs
similarity index 100%
rename from wasmtime-api/src/context.rs
rename to crates/api/src/context.rs
diff --git a/wasmtime-api/src/externals.rs b/crates/api/src/externals.rs
similarity index 100%
rename from wasmtime-api/src/externals.rs
rename to crates/api/src/externals.rs
diff --git a/wasmtime-api/src/instance.rs b/crates/api/src/instance.rs
similarity index 100%
rename from wasmtime-api/src/instance.rs
rename to crates/api/src/instance.rs
diff --git a/wasmtime-api/src/lib.rs b/crates/api/src/lib.rs
similarity index 100%
rename from wasmtime-api/src/lib.rs
rename to crates/api/src/lib.rs
diff --git a/wasmtime-api/src/module.rs b/crates/api/src/module.rs
similarity index 100%
rename from wasmtime-api/src/module.rs
rename to crates/api/src/module.rs
diff --git a/wasmtime-api/src/ref.rs b/crates/api/src/ref.rs
similarity index 100%
rename from wasmtime-api/src/ref.rs
rename to crates/api/src/ref.rs
diff --git a/wasmtime-api/src/runtime.rs b/crates/api/src/runtime.rs
similarity index 100%
rename from wasmtime-api/src/runtime.rs
rename to crates/api/src/runtime.rs
diff --git a/wasmtime-api/src/trampoline/create_handle.rs b/crates/api/src/trampoline/create_handle.rs
similarity index 100%
rename from wasmtime-api/src/trampoline/create_handle.rs
rename to crates/api/src/trampoline/create_handle.rs
diff --git a/wasmtime-api/src/trampoline/func.rs b/crates/api/src/trampoline/func.rs
similarity index 100%
rename from wasmtime-api/src/trampoline/func.rs
rename to crates/api/src/trampoline/func.rs
diff --git a/wasmtime-api/src/trampoline/global.rs b/crates/api/src/trampoline/global.rs
similarity index 100%
rename from wasmtime-api/src/trampoline/global.rs
rename to crates/api/src/trampoline/global.rs
diff --git a/wasmtime-api/src/trampoline/memory.rs b/crates/api/src/trampoline/memory.rs
similarity index 100%
rename from wasmtime-api/src/trampoline/memory.rs
rename to crates/api/src/trampoline/memory.rs
diff --git a/wasmtime-api/src/trampoline/mod.rs b/crates/api/src/trampoline/mod.rs
similarity index 100%
rename from wasmtime-api/src/trampoline/mod.rs
rename to crates/api/src/trampoline/mod.rs
diff --git a/wasmtime-api/src/trampoline/table.rs b/crates/api/src/trampoline/table.rs
similarity index 100%
rename from wasmtime-api/src/trampoline/table.rs
rename to crates/api/src/trampoline/table.rs
diff --git a/wasmtime-api/src/trap.rs b/crates/api/src/trap.rs
similarity index 100%
rename from wasmtime-api/src/trap.rs
rename to crates/api/src/trap.rs
diff --git a/wasmtime-api/src/types.rs b/crates/api/src/types.rs
similarity index 100%
rename from wasmtime-api/src/types.rs
rename to crates/api/src/types.rs
diff --git a/wasmtime-api/src/values.rs b/crates/api/src/values.rs
similarity index 100%
rename from wasmtime-api/src/values.rs
rename to crates/api/src/values.rs
diff --git a/wasmtime-api/src/wasm.rs b/crates/api/src/wasm.rs
similarity index 100%
rename from wasmtime-api/src/wasm.rs
rename to crates/api/src/wasm.rs
diff --git a/wasmtime-api/tests/examples.rs b/crates/api/tests/examples.rs
similarity index 100%
rename from wasmtime-api/tests/examples.rs
rename to crates/api/tests/examples.rs
diff --git a/wasmtime-api/tests/import_calling_export.rs b/crates/api/tests/import_calling_export.rs
similarity index 100%
rename from wasmtime-api/tests/import_calling_export.rs
rename to crates/api/tests/import_calling_export.rs
diff --git a/wasmtime-api/tests/import_calling_export.wasm b/crates/api/tests/import_calling_export.wasm
similarity index 100%
rename from wasmtime-api/tests/import_calling_export.wasm
rename to crates/api/tests/import_calling_export.wasm
diff --git a/wasmtime-api/tests/import_calling_export.wat b/crates/api/tests/import_calling_export.wat
similarity index 100%
rename from wasmtime-api/tests/import_calling_export.wat
rename to crates/api/tests/import_calling_export.wat
diff --git a/wasmtime-debug/.gitignore b/crates/debug/.gitignore
similarity index 100%
rename from wasmtime-debug/.gitignore
rename to crates/debug/.gitignore
diff --git a/wasmtime-debug/Cargo.toml b/crates/debug/Cargo.toml
similarity index 93%
rename from wasmtime-debug/Cargo.toml
rename to crates/debug/Cargo.toml
index ec49169c35..f3f6258f83 100644
--- a/wasmtime-debug/Cargo.toml
+++ b/crates/debug/Cargo.toml
@@ -18,7 +18,7 @@ cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
 faerie = "0.12.0"
-wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
+wasmtime-environ = { path = "../environ", default-features = false }
 target-lexicon = { version = "0.9.0", default-features = false }
 failure = { version = "0.1.3", default-features = false }
 hashbrown = { version = "0.6.0", optional = true }
diff --git a/misc/wasmtime-py/LICENSE b/crates/debug/LICENSE
similarity index 100%
rename from misc/wasmtime-py/LICENSE
rename to crates/debug/LICENSE
diff --git a/wasmtime-debug/README.md b/crates/debug/README.md
similarity index 100%
rename from wasmtime-debug/README.md
rename to crates/debug/README.md
diff --git a/wasmtime-debug/src/gc.rs b/crates/debug/src/gc.rs
similarity index 100%
rename from wasmtime-debug/src/gc.rs
rename to crates/debug/src/gc.rs
diff --git a/wasmtime-debug/src/lib.rs b/crates/debug/src/lib.rs
similarity index 100%
rename from wasmtime-debug/src/lib.rs
rename to crates/debug/src/lib.rs
diff --git a/wasmtime-debug/src/read_debuginfo.rs b/crates/debug/src/read_debuginfo.rs
similarity index 100%
rename from wasmtime-debug/src/read_debuginfo.rs
rename to crates/debug/src/read_debuginfo.rs
diff --git a/wasmtime-debug/src/transform/address_transform.rs b/crates/debug/src/transform/address_transform.rs
similarity index 100%
rename from wasmtime-debug/src/transform/address_transform.rs
rename to crates/debug/src/transform/address_transform.rs
diff --git a/wasmtime-debug/src/transform/attr.rs b/crates/debug/src/transform/attr.rs
similarity index 100%
rename from wasmtime-debug/src/transform/attr.rs
rename to crates/debug/src/transform/attr.rs
diff --git a/wasmtime-debug/src/transform/expression.rs b/crates/debug/src/transform/expression.rs
similarity index 100%
rename from wasmtime-debug/src/transform/expression.rs
rename to crates/debug/src/transform/expression.rs
diff --git a/wasmtime-debug/src/transform/line_program.rs b/crates/debug/src/transform/line_program.rs
similarity index 100%
rename from wasmtime-debug/src/transform/line_program.rs
rename to crates/debug/src/transform/line_program.rs
diff --git a/wasmtime-debug/src/transform/mod.rs b/crates/debug/src/transform/mod.rs
similarity index 100%
rename from wasmtime-debug/src/transform/mod.rs
rename to crates/debug/src/transform/mod.rs
diff --git a/wasmtime-debug/src/transform/range_info_builder.rs b/crates/debug/src/transform/range_info_builder.rs
similarity index 100%
rename from wasmtime-debug/src/transform/range_info_builder.rs
rename to crates/debug/src/transform/range_info_builder.rs
diff --git a/wasmtime-debug/src/transform/simulate.rs b/crates/debug/src/transform/simulate.rs
similarity index 100%
rename from wasmtime-debug/src/transform/simulate.rs
rename to crates/debug/src/transform/simulate.rs
diff --git a/wasmtime-debug/src/transform/unit.rs b/crates/debug/src/transform/unit.rs
similarity index 100%
rename from wasmtime-debug/src/transform/unit.rs
rename to crates/debug/src/transform/unit.rs
diff --git a/wasmtime-debug/src/transform/utils.rs b/crates/debug/src/transform/utils.rs
similarity index 100%
rename from wasmtime-debug/src/transform/utils.rs
rename to crates/debug/src/transform/utils.rs
diff --git a/wasmtime-debug/src/write_debuginfo.rs b/crates/debug/src/write_debuginfo.rs
similarity index 100%
rename from wasmtime-debug/src/write_debuginfo.rs
rename to crates/debug/src/write_debuginfo.rs
diff --git a/wasmtime-environ/.gitignore b/crates/environ/.gitignore
similarity index 100%
rename from wasmtime-environ/.gitignore
rename to crates/environ/.gitignore
diff --git a/wasmtime-environ/Cargo.toml b/crates/environ/Cargo.toml
similarity index 96%
rename from wasmtime-environ/Cargo.toml
rename to crates/environ/Cargo.toml
index 97de49c140..00da03f4a7 100644
--- a/wasmtime-environ/Cargo.toml
+++ b/crates/environ/Cargo.toml
@@ -17,18 +17,18 @@ cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
 lightbeam = { path = "../lightbeam", optional = true }
 indexmap = "1.0.2"
-rayon = "1.1"
+rayon = "1.2"
 thiserror = "1.0.4"
 directories = "2.0.1"
 sha2 = "0.8.0"
-base64 = "0.10.1"
+base64 = "0.11.0"
 serde = { version = "1.0.94", features = ["derive"] }
 bincode = "1.1.4"
 lazy_static = "1.3.0"
 spin = "0.5.0"
 log = { version = "0.4.8", default-features = false }
-zstd = "0.4"
-toml = "0.5"
+zstd = "0.5"
+toml = "0.5.5"
 file-per-thread-logger = "0.1.1"
 
 [target.'cfg(target_os = "windows")'.dependencies]
diff --git a/wasi-common/LICENSE b/crates/environ/LICENSE
similarity index 100%
rename from wasi-common/LICENSE
rename to crates/environ/LICENSE
diff --git a/wasmtime-environ/README.md b/crates/environ/README.md
similarity index 100%
rename from wasmtime-environ/README.md
rename to crates/environ/README.md
diff --git a/wasmtime-environ/build.rs b/crates/environ/build.rs
similarity index 100%
rename from wasmtime-environ/build.rs
rename to crates/environ/build.rs
diff --git a/wasmtime-environ/src/address_map.rs b/crates/environ/src/address_map.rs
similarity index 100%
rename from wasmtime-environ/src/address_map.rs
rename to crates/environ/src/address_map.rs
diff --git a/wasmtime-environ/src/cache.rs b/crates/environ/src/cache.rs
similarity index 100%
rename from wasmtime-environ/src/cache.rs
rename to crates/environ/src/cache.rs
diff --git a/wasmtime-environ/src/cache/config.rs b/crates/environ/src/cache/config.rs
similarity index 99%
rename from wasmtime-environ/src/cache/config.rs
rename to crates/environ/src/cache/config.rs
index f993bf6586..605f8a3409 100644
--- a/wasmtime-environ/src/cache/config.rs
+++ b/crates/environ/src/cache/config.rs
@@ -171,7 +171,7 @@ pub fn create_new_config<P: AsRef<Path> + Debug>(
     let content = "\
 # Comment out certain settings to use default values.
 # For more settings, please refer to the documentation:
-# https://github.com/CraneStation/wasmtime/blob/master/CACHE_CONFIGURATION.md
+# https://github.com/CraneStation/wasmtime/blob/master/docs/CACHE_CONFIGURATION.md
 
 [cache]
 enabled = true
diff --git a/wasmtime-environ/src/cache/config/tests.rs b/crates/environ/src/cache/config/tests.rs
similarity index 100%
rename from wasmtime-environ/src/cache/config/tests.rs
rename to crates/environ/src/cache/config/tests.rs
diff --git a/wasmtime-environ/src/cache/tests.rs b/crates/environ/src/cache/tests.rs
similarity index 100%
rename from wasmtime-environ/src/cache/tests.rs
rename to crates/environ/src/cache/tests.rs
diff --git a/wasmtime-environ/src/cache/worker.rs b/crates/environ/src/cache/worker.rs
similarity index 100%
rename from wasmtime-environ/src/cache/worker.rs
rename to crates/environ/src/cache/worker.rs
diff --git a/wasmtime-environ/src/cache/worker/tests.rs b/crates/environ/src/cache/worker/tests.rs
similarity index 100%
rename from wasmtime-environ/src/cache/worker/tests.rs
rename to crates/environ/src/cache/worker/tests.rs
diff --git a/wasmtime-environ/src/cache/worker/tests/system_time_stub.rs b/crates/environ/src/cache/worker/tests/system_time_stub.rs
similarity index 100%
rename from wasmtime-environ/src/cache/worker/tests/system_time_stub.rs
rename to crates/environ/src/cache/worker/tests/system_time_stub.rs
diff --git a/wasmtime-environ/src/compilation.rs b/crates/environ/src/compilation.rs
similarity index 100%
rename from wasmtime-environ/src/compilation.rs
rename to crates/environ/src/compilation.rs
diff --git a/wasmtime-environ/src/cranelift.rs b/crates/environ/src/cranelift.rs
similarity index 100%
rename from wasmtime-environ/src/cranelift.rs
rename to crates/environ/src/cranelift.rs
diff --git a/wasmtime-environ/src/func_environ.rs b/crates/environ/src/func_environ.rs
similarity index 100%
rename from wasmtime-environ/src/func_environ.rs
rename to crates/environ/src/func_environ.rs
diff --git a/wasmtime-environ/src/lib.rs b/crates/environ/src/lib.rs
similarity index 100%
rename from wasmtime-environ/src/lib.rs
rename to crates/environ/src/lib.rs
diff --git a/wasmtime-environ/src/lightbeam.rs b/crates/environ/src/lightbeam.rs
similarity index 100%
rename from wasmtime-environ/src/lightbeam.rs
rename to crates/environ/src/lightbeam.rs
diff --git a/wasmtime-environ/src/module.rs b/crates/environ/src/module.rs
similarity index 100%
rename from wasmtime-environ/src/module.rs
rename to crates/environ/src/module.rs
diff --git a/wasmtime-environ/src/module_environ.rs b/crates/environ/src/module_environ.rs
similarity index 100%
rename from wasmtime-environ/src/module_environ.rs
rename to crates/environ/src/module_environ.rs
diff --git a/wasmtime-environ/src/tunables.rs b/crates/environ/src/tunables.rs
similarity index 100%
rename from wasmtime-environ/src/tunables.rs
rename to crates/environ/src/tunables.rs
diff --git a/wasmtime-environ/src/vmoffsets.rs b/crates/environ/src/vmoffsets.rs
similarity index 100%
rename from wasmtime-environ/src/vmoffsets.rs
rename to crates/environ/src/vmoffsets.rs
diff --git a/wasmtime-environ/tests/cache_default_config_in_memory.rs b/crates/environ/tests/cache_default_config_in_memory.rs
similarity index 100%
rename from wasmtime-environ/tests/cache_default_config_in_memory.rs
rename to crates/environ/tests/cache_default_config_in_memory.rs
diff --git a/wasmtime-environ/tests/cache_disabled.rs b/crates/environ/tests/cache_disabled.rs
similarity index 100%
rename from wasmtime-environ/tests/cache_disabled.rs
rename to crates/environ/tests/cache_disabled.rs
diff --git a/wasmtime-environ/tests/cache_fail_calling_init_twice.rs b/crates/environ/tests/cache_fail_calling_init_twice.rs
similarity index 100%
rename from wasmtime-environ/tests/cache_fail_calling_init_twice.rs
rename to crates/environ/tests/cache_fail_calling_init_twice.rs
diff --git a/wasmtime-environ/tests/cache_fail_invalid_config.rs b/crates/environ/tests/cache_fail_invalid_config.rs
similarity index 100%
rename from wasmtime-environ/tests/cache_fail_invalid_config.rs
rename to crates/environ/tests/cache_fail_invalid_config.rs
diff --git a/wasmtime-environ/tests/cache_fail_invalid_path_to_config.rs b/crates/environ/tests/cache_fail_invalid_path_to_config.rs
similarity index 100%
rename from wasmtime-environ/tests/cache_fail_invalid_path_to_config.rs
rename to crates/environ/tests/cache_fail_invalid_path_to_config.rs
diff --git a/wasmtime-environ/tests/cache_write_default_config.rs b/crates/environ/tests/cache_write_default_config.rs
similarity index 100%
rename from wasmtime-environ/tests/cache_write_default_config.rs
rename to crates/environ/tests/cache_write_default_config.rs
diff --git a/wasmtime-interface-types/Cargo.toml b/crates/interface-types/Cargo.toml
similarity index 79%
rename from wasmtime-interface-types/Cargo.toml
rename to crates/interface-types/Cargo.toml
index 348f116924..62a7ea7f3d 100644
--- a/wasmtime-interface-types/Cargo.toml
+++ b/crates/interface-types/Cargo.toml
@@ -16,5 +16,5 @@ cranelift-codegen = { version = "0.49", default-features = false }
 walrus = "0.13"
 wasmparser = { version = "0.39.2", default-features = false }
 wasm-webidl-bindings = "0.6"
-wasmtime-jit = { path = '../wasmtime-jit', default-features = false }
-wasmtime-runtime = { path = '../wasmtime-runtime', default-features = false }
+wasmtime-jit = { path = '../jit', default-features = false }
+wasmtime-runtime = { path = '../runtime', default-features = false }
diff --git a/wasmtime-interface-types/src/lib.rs b/crates/interface-types/src/lib.rs
similarity index 100%
rename from wasmtime-interface-types/src/lib.rs
rename to crates/interface-types/src/lib.rs
diff --git a/wasmtime-interface-types/src/value.rs b/crates/interface-types/src/value.rs
similarity index 100%
rename from wasmtime-interface-types/src/value.rs
rename to crates/interface-types/src/value.rs
diff --git a/wasmtime-jit/Cargo.toml b/crates/jit/Cargo.toml
similarity index 86%
rename from wasmtime-jit/Cargo.toml
rename to crates/jit/Cargo.toml
index 96d2e3c4ed..fef86eb26b 100644
--- a/wasmtime-jit/Cargo.toml
+++ b/crates/jit/Cargo.toml
@@ -15,9 +15,9 @@ cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
 cranelift-frontend = { version = "0.49" }
-wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
-wasmtime-runtime = { path = "../wasmtime-runtime", default-features = false }
-wasmtime-debug = { path = "../wasmtime-debug", default-features = false }
+wasmtime-environ = { path = "../environ", default-features = false }
+wasmtime-runtime = { path = "../runtime", default-features = false }
+wasmtime-debug = { path = "../debug", default-features = false }
 region = "2.0.0"
 failure = { version = "0.1.3", default-features = false }
 thiserror = "1.0.4"
diff --git a/wasi-common/wasi-common-cbindgen/LICENSE b/crates/jit/LICENSE
similarity index 100%
rename from wasi-common/wasi-common-cbindgen/LICENSE
rename to crates/jit/LICENSE
diff --git a/wasmtime-jit/README.md b/crates/jit/README.md
similarity index 100%
rename from wasmtime-jit/README.md
rename to crates/jit/README.md
diff --git a/wasmtime-jit/src/action.rs b/crates/jit/src/action.rs
similarity index 100%
rename from wasmtime-jit/src/action.rs
rename to crates/jit/src/action.rs
diff --git a/wasmtime-jit/src/code_memory.rs b/crates/jit/src/code_memory.rs
similarity index 100%
rename from wasmtime-jit/src/code_memory.rs
rename to crates/jit/src/code_memory.rs
diff --git a/wasmtime-jit/src/compiler.rs b/crates/jit/src/compiler.rs
similarity index 100%
rename from wasmtime-jit/src/compiler.rs
rename to crates/jit/src/compiler.rs
diff --git a/wasmtime-jit/src/context.rs b/crates/jit/src/context.rs
similarity index 100%
rename from wasmtime-jit/src/context.rs
rename to crates/jit/src/context.rs
diff --git a/wasmtime-jit/src/function_table.rs b/crates/jit/src/function_table.rs
similarity index 100%
rename from wasmtime-jit/src/function_table.rs
rename to crates/jit/src/function_table.rs
diff --git a/wasmtime-jit/src/instantiate.rs b/crates/jit/src/instantiate.rs
similarity index 100%
rename from wasmtime-jit/src/instantiate.rs
rename to crates/jit/src/instantiate.rs
diff --git a/wasmtime-jit/src/lib.rs b/crates/jit/src/lib.rs
similarity index 100%
rename from wasmtime-jit/src/lib.rs
rename to crates/jit/src/lib.rs
diff --git a/wasmtime-jit/src/link.rs b/crates/jit/src/link.rs
similarity index 100%
rename from wasmtime-jit/src/link.rs
rename to crates/jit/src/link.rs
diff --git a/wasmtime-jit/src/namespace.rs b/crates/jit/src/namespace.rs
similarity index 100%
rename from wasmtime-jit/src/namespace.rs
rename to crates/jit/src/namespace.rs
diff --git a/wasmtime-jit/src/resolver.rs b/crates/jit/src/resolver.rs
similarity index 100%
rename from wasmtime-jit/src/resolver.rs
rename to crates/jit/src/resolver.rs
diff --git a/wasmtime-jit/src/target_tunables.rs b/crates/jit/src/target_tunables.rs
similarity index 100%
rename from wasmtime-jit/src/target_tunables.rs
rename to crates/jit/src/target_tunables.rs
diff --git a/lightbeam/Cargo.toml b/crates/lightbeam/Cargo.toml
similarity index 97%
rename from lightbeam/Cargo.toml
rename to crates/lightbeam/Cargo.toml
index b09f4dbd2d..c3572b1c0e 100644
--- a/lightbeam/Cargo.toml
+++ b/crates/lightbeam/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 edition = "2018"
 
 [dependencies]
-smallvec = "0.6"
+smallvec = "1.0.0"
 dynasm = "0.5.1"
 dynasmrt = "0.5.1"
 wasmparser = "0.39.1"
diff --git a/wasi-common/wig/LICENSE b/crates/lightbeam/LICENSE
similarity index 100%
rename from wasi-common/wig/LICENSE
rename to crates/lightbeam/LICENSE
diff --git a/lightbeam/README.md b/crates/lightbeam/README.md
similarity index 100%
rename from lightbeam/README.md
rename to crates/lightbeam/README.md
diff --git a/lightbeam/examples/test.rs b/crates/lightbeam/examples/test.rs
similarity index 100%
rename from lightbeam/examples/test.rs
rename to crates/lightbeam/examples/test.rs
diff --git a/lightbeam/src/backend.rs b/crates/lightbeam/src/backend.rs
similarity index 100%
rename from lightbeam/src/backend.rs
rename to crates/lightbeam/src/backend.rs
diff --git a/lightbeam/src/disassemble.rs b/crates/lightbeam/src/disassemble.rs
similarity index 100%
rename from lightbeam/src/disassemble.rs
rename to crates/lightbeam/src/disassemble.rs
diff --git a/lightbeam/src/error.rs b/crates/lightbeam/src/error.rs
similarity index 100%
rename from lightbeam/src/error.rs
rename to crates/lightbeam/src/error.rs
diff --git a/lightbeam/src/function_body.rs b/crates/lightbeam/src/function_body.rs
similarity index 100%
rename from lightbeam/src/function_body.rs
rename to crates/lightbeam/src/function_body.rs
diff --git a/lightbeam/src/lib.rs b/crates/lightbeam/src/lib.rs
similarity index 100%
rename from lightbeam/src/lib.rs
rename to crates/lightbeam/src/lib.rs
diff --git a/lightbeam/src/microwasm.rs b/crates/lightbeam/src/microwasm.rs
similarity index 100%
rename from lightbeam/src/microwasm.rs
rename to crates/lightbeam/src/microwasm.rs
diff --git a/lightbeam/src/module.rs b/crates/lightbeam/src/module.rs
similarity index 100%
rename from lightbeam/src/module.rs
rename to crates/lightbeam/src/module.rs
diff --git a/lightbeam/src/tests.rs b/crates/lightbeam/src/tests.rs
similarity index 100%
rename from lightbeam/src/tests.rs
rename to crates/lightbeam/src/tests.rs
diff --git a/lightbeam/src/translate_sections.rs b/crates/lightbeam/src/translate_sections.rs
similarity index 100%
rename from lightbeam/src/translate_sections.rs
rename to crates/lightbeam/src/translate_sections.rs
diff --git a/lightbeam/test.wasm b/crates/lightbeam/test.wasm
similarity index 100%
rename from lightbeam/test.wasm
rename to crates/lightbeam/test.wasm
diff --git a/lightbeam/test.wat b/crates/lightbeam/test.wat
similarity index 100%
rename from lightbeam/test.wat
rename to crates/lightbeam/test.wat
diff --git a/misc/wasmtime-py/.gitignore b/crates/misc/py/.gitignore
similarity index 100%
rename from misc/wasmtime-py/.gitignore
rename to crates/misc/py/.gitignore
diff --git a/misc/wasmtime-py/Cargo.toml b/crates/misc/py/Cargo.toml
similarity index 75%
rename from misc/wasmtime-py/Cargo.toml
rename to crates/misc/py/Cargo.toml
index 8180685a6f..23b353f6b9 100644
--- a/misc/wasmtime-py/Cargo.toml
+++ b/crates/misc/py/Cargo.toml
@@ -17,10 +17,10 @@ cranelift-native = { version = "0.49" }
 cranelift-entity = { version = "0.49" }
 cranelift-wasm = { version = "0.49" }
 cranelift-frontend = { version = "0.49" }
-wasmtime-environ = { path = "../../wasmtime-environ" }
-wasmtime-interface-types = { path = "../../wasmtime-interface-types" }
-wasmtime-jit = { path = "../../wasmtime-jit" }
-wasmtime-runtime = { path = "../../wasmtime-runtime" }
+wasmtime-environ = { path = "../../environ" }
+wasmtime-interface-types = { path = "../../interface-types" }
+wasmtime-jit = { path = "../../jit" }
+wasmtime-runtime = { path = "../../runtime" }
 target-lexicon = { version = "0.9.0", default-features = false }
 anyhow = "1.0.19"
 region = "2.0.0"
diff --git a/wasi-common/winx/LICENSE b/crates/misc/py/LICENSE
similarity index 100%
rename from wasi-common/winx/LICENSE
rename to crates/misc/py/LICENSE
diff --git a/misc/wasmtime-py/README.md b/crates/misc/py/README.md
similarity index 100%
rename from misc/wasmtime-py/README.md
rename to crates/misc/py/README.md
diff --git a/misc/wasmtime-py/examples/gcd/.gitignore b/crates/misc/py/examples/gcd/.gitignore
similarity index 100%
rename from misc/wasmtime-py/examples/gcd/.gitignore
rename to crates/misc/py/examples/gcd/.gitignore
diff --git a/misc/wasmtime-py/examples/gcd/README.md b/crates/misc/py/examples/gcd/README.md
similarity index 100%
rename from misc/wasmtime-py/examples/gcd/README.md
rename to crates/misc/py/examples/gcd/README.md
diff --git a/misc/wasmtime-py/examples/gcd/gcd.rs b/crates/misc/py/examples/gcd/gcd.rs
similarity index 100%
rename from misc/wasmtime-py/examples/gcd/gcd.rs
rename to crates/misc/py/examples/gcd/gcd.rs
diff --git a/misc/wasmtime-py/examples/gcd/run.py b/crates/misc/py/examples/gcd/run.py
similarity index 100%
rename from misc/wasmtime-py/examples/gcd/run.py
rename to crates/misc/py/examples/gcd/run.py
diff --git a/misc/wasmtime-py/examples/import/.gitignore b/crates/misc/py/examples/import/.gitignore
similarity index 100%
rename from misc/wasmtime-py/examples/import/.gitignore
rename to crates/misc/py/examples/import/.gitignore
diff --git a/misc/wasmtime-py/examples/import/README.md b/crates/misc/py/examples/import/README.md
similarity index 100%
rename from misc/wasmtime-py/examples/import/README.md
rename to crates/misc/py/examples/import/README.md
diff --git a/misc/wasmtime-py/examples/import/demo.rs b/crates/misc/py/examples/import/demo.rs
similarity index 100%
rename from misc/wasmtime-py/examples/import/demo.rs
rename to crates/misc/py/examples/import/demo.rs
diff --git a/misc/wasmtime-py/examples/import/env.py b/crates/misc/py/examples/import/env.py
similarity index 100%
rename from misc/wasmtime-py/examples/import/env.py
rename to crates/misc/py/examples/import/env.py
diff --git a/misc/wasmtime-py/examples/import/run.py b/crates/misc/py/examples/import/run.py
similarity index 100%
rename from misc/wasmtime-py/examples/import/run.py
rename to crates/misc/py/examples/import/run.py
diff --git a/misc/wasmtime-py/examples/two_modules/.gitignore b/crates/misc/py/examples/two_modules/.gitignore
similarity index 100%
rename from misc/wasmtime-py/examples/two_modules/.gitignore
rename to crates/misc/py/examples/two_modules/.gitignore
diff --git a/misc/wasmtime-py/examples/two_modules/README.md b/crates/misc/py/examples/two_modules/README.md
similarity index 100%
rename from misc/wasmtime-py/examples/two_modules/README.md
rename to crates/misc/py/examples/two_modules/README.md
diff --git a/misc/wasmtime-py/examples/two_modules/env.py b/crates/misc/py/examples/two_modules/env.py
similarity index 100%
rename from misc/wasmtime-py/examples/two_modules/env.py
rename to crates/misc/py/examples/two_modules/env.py
diff --git a/misc/wasmtime-py/examples/two_modules/one.rs b/crates/misc/py/examples/two_modules/one.rs
similarity index 100%
rename from misc/wasmtime-py/examples/two_modules/one.rs
rename to crates/misc/py/examples/two_modules/one.rs
diff --git a/misc/wasmtime-py/examples/two_modules/run.py b/crates/misc/py/examples/two_modules/run.py
similarity index 100%
rename from misc/wasmtime-py/examples/two_modules/run.py
rename to crates/misc/py/examples/two_modules/run.py
diff --git a/misc/wasmtime-py/examples/two_modules/two.wat b/crates/misc/py/examples/two_modules/two.wat
similarity index 100%
rename from misc/wasmtime-py/examples/two_modules/two.wat
rename to crates/misc/py/examples/two_modules/two.wat
diff --git a/misc/wasmtime-py/python/wasmtime/__init__.py b/crates/misc/py/python/wasmtime/__init__.py
similarity index 100%
rename from misc/wasmtime-py/python/wasmtime/__init__.py
rename to crates/misc/py/python/wasmtime/__init__.py
diff --git a/misc/wasmtime-py/setup.py b/crates/misc/py/setup.py
similarity index 100%
rename from misc/wasmtime-py/setup.py
rename to crates/misc/py/setup.py
diff --git a/misc/wasmtime-py/src/function.rs b/crates/misc/py/src/function.rs
similarity index 100%
rename from misc/wasmtime-py/src/function.rs
rename to crates/misc/py/src/function.rs
diff --git a/misc/wasmtime-py/src/import.rs b/crates/misc/py/src/import.rs
similarity index 100%
rename from misc/wasmtime-py/src/import.rs
rename to crates/misc/py/src/import.rs
diff --git a/misc/wasmtime-py/src/instance.rs b/crates/misc/py/src/instance.rs
similarity index 100%
rename from misc/wasmtime-py/src/instance.rs
rename to crates/misc/py/src/instance.rs
diff --git a/misc/wasmtime-py/src/lib.rs b/crates/misc/py/src/lib.rs
similarity index 100%
rename from misc/wasmtime-py/src/lib.rs
rename to crates/misc/py/src/lib.rs
diff --git a/misc/wasmtime-py/src/memory.rs b/crates/misc/py/src/memory.rs
similarity index 100%
rename from misc/wasmtime-py/src/memory.rs
rename to crates/misc/py/src/memory.rs
diff --git a/misc/wasmtime-py/src/module.rs b/crates/misc/py/src/module.rs
similarity index 100%
rename from misc/wasmtime-py/src/module.rs
rename to crates/misc/py/src/module.rs
diff --git a/misc/wasmtime-py/src/value.rs b/crates/misc/py/src/value.rs
similarity index 100%
rename from misc/wasmtime-py/src/value.rs
rename to crates/misc/py/src/value.rs
diff --git a/misc/wasmtime-rust/Cargo.toml b/crates/misc/rust/Cargo.toml
similarity index 72%
rename from misc/wasmtime-rust/Cargo.toml
rename to crates/misc/rust/Cargo.toml
index cf3ad45c2c..a8fe3a0bd5 100644
--- a/misc/wasmtime-rust/Cargo.toml
+++ b/crates/misc/rust/Cargo.toml
@@ -14,8 +14,8 @@ doctest = false
 [dependencies]
 cranelift-codegen = { version = "0.49" }
 cranelift-native = { version = "0.49" }
-wasmtime-interface-types = { path = "../../wasmtime-interface-types" }
-wasmtime-jit = { path = "../../wasmtime-jit" }
+wasmtime-interface-types = { path = "../../interface-types" }
+wasmtime-jit = { path = "../../jit" }
 wasmtime-rust-macro = { path = "./macro" }
-wasmtime-wasi = { path = "../../wasmtime-wasi" }
+wasmtime-wasi = { path = "../../wasi" }
 anyhow = "1.0.19"
diff --git a/misc/wasmtime-rust/README.md b/crates/misc/rust/README.md
similarity index 100%
rename from misc/wasmtime-rust/README.md
rename to crates/misc/rust/README.md
diff --git a/misc/wasmtime-rust/examples/markdown.rs b/crates/misc/rust/examples/markdown.rs
similarity index 100%
rename from misc/wasmtime-rust/examples/markdown.rs
rename to crates/misc/rust/examples/markdown.rs
diff --git a/misc/wasmtime-rust/macro/Cargo.toml b/crates/misc/rust/macro/Cargo.toml
similarity index 100%
rename from misc/wasmtime-rust/macro/Cargo.toml
rename to crates/misc/rust/macro/Cargo.toml
diff --git a/misc/wasmtime-rust/macro/README.md b/crates/misc/rust/macro/README.md
similarity index 100%
rename from misc/wasmtime-rust/macro/README.md
rename to crates/misc/rust/macro/README.md
diff --git a/misc/wasmtime-rust/macro/src/lib.rs b/crates/misc/rust/macro/src/lib.rs
similarity index 100%
rename from misc/wasmtime-rust/macro/src/lib.rs
rename to crates/misc/rust/macro/src/lib.rs
diff --git a/misc/wasmtime-rust/src/lib.rs b/crates/misc/rust/src/lib.rs
similarity index 100%
rename from misc/wasmtime-rust/src/lib.rs
rename to crates/misc/rust/src/lib.rs
diff --git a/wasmtime-obj/.gitignore b/crates/obj/.gitignore
similarity index 100%
rename from wasmtime-obj/.gitignore
rename to crates/obj/.gitignore
diff --git a/wasmtime-obj/Cargo.toml b/crates/obj/Cargo.toml
similarity index 92%
rename from wasmtime-obj/Cargo.toml
rename to crates/obj/Cargo.toml
index 92570e4fc8..7d498a74de 100644
--- a/wasmtime-obj/Cargo.toml
+++ b/crates/obj/Cargo.toml
@@ -14,5 +14,5 @@ edition = "2018"
 cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
-wasmtime-environ = { path = "../wasmtime-environ" }
+wasmtime-environ = { path = "../environ" }
 faerie = "0.12.0"
diff --git a/wasmtime-api/LICENSE b/crates/obj/LICENSE
similarity index 100%
rename from wasmtime-api/LICENSE
rename to crates/obj/LICENSE
diff --git a/wasmtime-obj/README.md b/crates/obj/README.md
similarity index 100%
rename from wasmtime-obj/README.md
rename to crates/obj/README.md
diff --git a/wasmtime-obj/src/context.rs b/crates/obj/src/context.rs
similarity index 100%
rename from wasmtime-obj/src/context.rs
rename to crates/obj/src/context.rs
diff --git a/wasmtime-obj/src/data_segment.rs b/crates/obj/src/data_segment.rs
similarity index 100%
rename from wasmtime-obj/src/data_segment.rs
rename to crates/obj/src/data_segment.rs
diff --git a/wasmtime-obj/src/function.rs b/crates/obj/src/function.rs
similarity index 100%
rename from wasmtime-obj/src/function.rs
rename to crates/obj/src/function.rs
diff --git a/wasmtime-obj/src/lib.rs b/crates/obj/src/lib.rs
similarity index 100%
rename from wasmtime-obj/src/lib.rs
rename to crates/obj/src/lib.rs
diff --git a/wasmtime-obj/src/module.rs b/crates/obj/src/module.rs
similarity index 100%
rename from wasmtime-obj/src/module.rs
rename to crates/obj/src/module.rs
diff --git a/wasmtime-obj/src/table.rs b/crates/obj/src/table.rs
similarity index 100%
rename from wasmtime-obj/src/table.rs
rename to crates/obj/src/table.rs
diff --git a/wasmtime-runtime/Cargo.toml b/crates/runtime/Cargo.toml
similarity index 94%
rename from wasmtime-runtime/Cargo.toml
rename to crates/runtime/Cargo.toml
index 2ced9e2de2..869ced4c62 100644
--- a/wasmtime-runtime/Cargo.toml
+++ b/crates/runtime/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2018"
 cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
-wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
+wasmtime-environ = { path = "../environ", default-features = false }
 region = "2.0.0"
 lazy_static = "1.2.0"
 libc = { version = "0.2.60", default-features = false }
diff --git a/wasmtime-debug/LICENSE b/crates/runtime/LICENSE
similarity index 100%
rename from wasmtime-debug/LICENSE
rename to crates/runtime/LICENSE
diff --git a/wasmtime-runtime/README.md b/crates/runtime/README.md
similarity index 100%
rename from wasmtime-runtime/README.md
rename to crates/runtime/README.md
diff --git a/wasmtime-runtime/build.rs b/crates/runtime/build.rs
similarity index 100%
rename from wasmtime-runtime/build.rs
rename to crates/runtime/build.rs
diff --git a/wasmtime-runtime/signalhandlers/SignalHandlers.cpp b/crates/runtime/signalhandlers/SignalHandlers.cpp
similarity index 100%
rename from wasmtime-runtime/signalhandlers/SignalHandlers.cpp
rename to crates/runtime/signalhandlers/SignalHandlers.cpp
diff --git a/wasmtime-runtime/signalhandlers/SignalHandlers.hpp b/crates/runtime/signalhandlers/SignalHandlers.hpp
similarity index 100%
rename from wasmtime-runtime/signalhandlers/SignalHandlers.hpp
rename to crates/runtime/signalhandlers/SignalHandlers.hpp
diff --git a/wasmtime-runtime/signalhandlers/Trampolines.cpp b/crates/runtime/signalhandlers/Trampolines.cpp
similarity index 100%
rename from wasmtime-runtime/signalhandlers/Trampolines.cpp
rename to crates/runtime/signalhandlers/Trampolines.cpp
diff --git a/wasmtime-runtime/src/export.rs b/crates/runtime/src/export.rs
similarity index 100%
rename from wasmtime-runtime/src/export.rs
rename to crates/runtime/src/export.rs
diff --git a/wasmtime-runtime/src/imports.rs b/crates/runtime/src/imports.rs
similarity index 100%
rename from wasmtime-runtime/src/imports.rs
rename to crates/runtime/src/imports.rs
diff --git a/wasmtime-runtime/src/instance.rs b/crates/runtime/src/instance.rs
similarity index 100%
rename from wasmtime-runtime/src/instance.rs
rename to crates/runtime/src/instance.rs
diff --git a/wasmtime-runtime/src/jit_int.rs b/crates/runtime/src/jit_int.rs
similarity index 100%
rename from wasmtime-runtime/src/jit_int.rs
rename to crates/runtime/src/jit_int.rs
diff --git a/wasmtime-runtime/src/lib.rs b/crates/runtime/src/lib.rs
similarity index 100%
rename from wasmtime-runtime/src/lib.rs
rename to crates/runtime/src/lib.rs
diff --git a/wasmtime-runtime/src/libcalls.rs b/crates/runtime/src/libcalls.rs
similarity index 100%
rename from wasmtime-runtime/src/libcalls.rs
rename to crates/runtime/src/libcalls.rs
diff --git a/wasmtime-runtime/src/memory.rs b/crates/runtime/src/memory.rs
similarity index 100%
rename from wasmtime-runtime/src/memory.rs
rename to crates/runtime/src/memory.rs
diff --git a/wasmtime-runtime/src/mmap.rs b/crates/runtime/src/mmap.rs
similarity index 100%
rename from wasmtime-runtime/src/mmap.rs
rename to crates/runtime/src/mmap.rs
diff --git a/wasmtime-runtime/src/sig_registry.rs b/crates/runtime/src/sig_registry.rs
similarity index 100%
rename from wasmtime-runtime/src/sig_registry.rs
rename to crates/runtime/src/sig_registry.rs
diff --git a/wasmtime-runtime/src/signalhandlers.rs b/crates/runtime/src/signalhandlers.rs
similarity index 100%
rename from wasmtime-runtime/src/signalhandlers.rs
rename to crates/runtime/src/signalhandlers.rs
diff --git a/wasmtime-runtime/src/table.rs b/crates/runtime/src/table.rs
similarity index 100%
rename from wasmtime-runtime/src/table.rs
rename to crates/runtime/src/table.rs
diff --git a/wasmtime-runtime/src/trap_registry.rs b/crates/runtime/src/trap_registry.rs
similarity index 100%
rename from wasmtime-runtime/src/trap_registry.rs
rename to crates/runtime/src/trap_registry.rs
diff --git a/wasmtime-runtime/src/traphandlers.rs b/crates/runtime/src/traphandlers.rs
similarity index 100%
rename from wasmtime-runtime/src/traphandlers.rs
rename to crates/runtime/src/traphandlers.rs
diff --git a/wasmtime-runtime/src/vmcontext.rs b/crates/runtime/src/vmcontext.rs
similarity index 100%
rename from wasmtime-runtime/src/vmcontext.rs
rename to crates/runtime/src/vmcontext.rs
diff --git a/wasmtime-wasi-c/Cargo.toml b/crates/wasi-c/Cargo.toml
similarity index 84%
rename from wasmtime-wasi-c/Cargo.toml
rename to crates/wasi-c/Cargo.toml
index 09c134f23c..4a4d9c7889 100644
--- a/wasmtime-wasi-c/Cargo.toml
+++ b/crates/wasi-c/Cargo.toml
@@ -10,9 +10,9 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmtime-runtime = { path = "../wasmtime-runtime" }
-wasmtime-environ = { path = "../wasmtime-environ" }
-wasmtime-jit = { path = "../wasmtime-jit" }
+wasmtime-runtime = { path = "../runtime" }
+wasmtime-environ = { path = "../environ" }
+wasmtime-jit = { path = "../jit" }
 cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
diff --git a/wasmtime-environ/LICENSE b/crates/wasi-c/LICENSE
similarity index 100%
rename from wasmtime-environ/LICENSE
rename to crates/wasi-c/LICENSE
diff --git a/wasmtime-wasi-c/README.md b/crates/wasi-c/README.md
similarity index 100%
rename from wasmtime-wasi-c/README.md
rename to crates/wasi-c/README.md
diff --git a/wasmtime-wasi-c/build.rs b/crates/wasi-c/build.rs
similarity index 100%
rename from wasmtime-wasi-c/build.rs
rename to crates/wasi-c/build.rs
diff --git a/wasmtime-wasi-c/js-polyfill/WASI-small.png b/crates/wasi-c/js-polyfill/WASI-small.png
similarity index 100%
rename from wasmtime-wasi-c/js-polyfill/WASI-small.png
rename to crates/wasi-c/js-polyfill/WASI-small.png
diff --git a/wasmtime-wasi-c/js-polyfill/build.sh b/crates/wasi-c/js-polyfill/build.sh
similarity index 100%
rename from wasmtime-wasi-c/js-polyfill/build.sh
rename to crates/wasi-c/js-polyfill/build.sh
diff --git a/wasmtime-wasi-c/js-polyfill/clang/stdatomic.h b/crates/wasi-c/js-polyfill/clang/stdatomic.h
similarity index 100%
rename from wasmtime-wasi-c/js-polyfill/clang/stdatomic.h
rename to crates/wasi-c/js-polyfill/clang/stdatomic.h
diff --git a/wasmtime-wasi-c/js-polyfill/polyfill.c b/crates/wasi-c/js-polyfill/polyfill.c
similarity index 100%
rename from wasmtime-wasi-c/js-polyfill/polyfill.c
rename to crates/wasi-c/js-polyfill/polyfill.c
diff --git a/wasmtime-wasi-c/js-polyfill/shell.html b/crates/wasi-c/js-polyfill/shell.html
similarity index 100%
rename from wasmtime-wasi-c/js-polyfill/shell.html
rename to crates/wasi-c/js-polyfill/shell.html
diff --git a/wasmtime-wasi-c/js-polyfill/wasi.js b/crates/wasi-c/js-polyfill/wasi.js
similarity index 100%
rename from wasmtime-wasi-c/js-polyfill/wasi.js
rename to crates/wasi-c/js-polyfill/wasi.js
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/CMakeLists.txt b/crates/wasi-c/sandboxed-system-primitives/CMakeLists.txt
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/CMakeLists.txt
rename to crates/wasi-c/sandboxed-system-primitives/CMakeLists.txt
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/LICENSE b/crates/wasi-c/sandboxed-system-primitives/LICENSE
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/LICENSE
rename to crates/wasi-c/sandboxed-system-primitives/LICENSE
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/README.md b/crates/wasi-c/sandboxed-system-primitives/README.md
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/README.md
rename to crates/wasi-c/sandboxed-system-primitives/README.md
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/include/LICENSE b/crates/wasi-c/sandboxed-system-primitives/include/LICENSE
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/include/LICENSE
rename to crates/wasi-c/sandboxed-system-primitives/include/LICENSE
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/include/wasmtime_ssp.h b/crates/wasi-c/sandboxed-system-primitives/include/wasmtime_ssp.h
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/include/wasmtime_ssp.h
rename to crates/wasi-c/sandboxed-system-primitives/include/wasmtime_ssp.h
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/src/LICENSE b/crates/wasi-c/sandboxed-system-primitives/src/LICENSE
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/src/LICENSE
rename to crates/wasi-c/sandboxed-system-primitives/src/LICENSE
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/src/README.md b/crates/wasi-c/sandboxed-system-primitives/src/README.md
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/src/README.md
rename to crates/wasi-c/sandboxed-system-primitives/src/README.md
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/src/config.h b/crates/wasi-c/sandboxed-system-primitives/src/config.h
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/src/config.h
rename to crates/wasi-c/sandboxed-system-primitives/src/config.h
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/src/locking.h b/crates/wasi-c/sandboxed-system-primitives/src/locking.h
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/src/locking.h
rename to crates/wasi-c/sandboxed-system-primitives/src/locking.h
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/src/numeric_limits.h b/crates/wasi-c/sandboxed-system-primitives/src/numeric_limits.h
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/src/numeric_limits.h
rename to crates/wasi-c/sandboxed-system-primitives/src/numeric_limits.h
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/src/posix.c b/crates/wasi-c/sandboxed-system-primitives/src/posix.c
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/src/posix.c
rename to crates/wasi-c/sandboxed-system-primitives/src/posix.c
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/src/posix.h b/crates/wasi-c/sandboxed-system-primitives/src/posix.h
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/src/posix.h
rename to crates/wasi-c/sandboxed-system-primitives/src/posix.h
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/src/queue.h b/crates/wasi-c/sandboxed-system-primitives/src/queue.h
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/src/queue.h
rename to crates/wasi-c/sandboxed-system-primitives/src/queue.h
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/src/random.c b/crates/wasi-c/sandboxed-system-primitives/src/random.c
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/src/random.c
rename to crates/wasi-c/sandboxed-system-primitives/src/random.c
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/src/random.h b/crates/wasi-c/sandboxed-system-primitives/src/random.h
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/src/random.h
rename to crates/wasi-c/sandboxed-system-primitives/src/random.h
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/src/refcount.h b/crates/wasi-c/sandboxed-system-primitives/src/refcount.h
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/src/refcount.h
rename to crates/wasi-c/sandboxed-system-primitives/src/refcount.h
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/src/rights.h b/crates/wasi-c/sandboxed-system-primitives/src/rights.h
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/src/rights.h
rename to crates/wasi-c/sandboxed-system-primitives/src/rights.h
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/src/signals.h b/crates/wasi-c/sandboxed-system-primitives/src/signals.h
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/src/signals.h
rename to crates/wasi-c/sandboxed-system-primitives/src/signals.h
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/src/str.c b/crates/wasi-c/sandboxed-system-primitives/src/str.c
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/src/str.c
rename to crates/wasi-c/sandboxed-system-primitives/src/str.c
diff --git a/wasmtime-wasi-c/sandboxed-system-primitives/src/str.h b/crates/wasi-c/sandboxed-system-primitives/src/str.h
similarity index 100%
rename from wasmtime-wasi-c/sandboxed-system-primitives/src/str.h
rename to crates/wasi-c/sandboxed-system-primitives/src/str.h
diff --git a/wasmtime-wasi-c/src/host.rs b/crates/wasi-c/src/host.rs
similarity index 100%
rename from wasmtime-wasi-c/src/host.rs
rename to crates/wasi-c/src/host.rs
diff --git a/wasmtime-wasi-c/src/instantiate.rs b/crates/wasi-c/src/instantiate.rs
similarity index 100%
rename from wasmtime-wasi-c/src/instantiate.rs
rename to crates/wasi-c/src/instantiate.rs
diff --git a/wasmtime-wasi-c/src/lib.rs b/crates/wasi-c/src/lib.rs
similarity index 100%
rename from wasmtime-wasi-c/src/lib.rs
rename to crates/wasi-c/src/lib.rs
diff --git a/wasmtime-wasi-c/src/syscalls.rs b/crates/wasi-c/src/syscalls.rs
similarity index 100%
rename from wasmtime-wasi-c/src/syscalls.rs
rename to crates/wasi-c/src/syscalls.rs
diff --git a/wasmtime-wasi-c/src/translate.rs b/crates/wasi-c/src/translate.rs
similarity index 100%
rename from wasmtime-wasi-c/src/translate.rs
rename to crates/wasi-c/src/translate.rs
diff --git a/wasmtime-wasi-c/src/wasm32.rs b/crates/wasi-c/src/wasm32.rs
similarity index 100%
rename from wasmtime-wasi-c/src/wasm32.rs
rename to crates/wasi-c/src/wasm32.rs
diff --git a/wasi-common/Cargo.toml b/crates/wasi-common/Cargo.toml
similarity index 82%
rename from wasi-common/Cargo.toml
rename to crates/wasi-common/Cargo.toml
index 0647e641bf..6031aa8eb0 100644
--- a/wasi-common/Cargo.toml
+++ b/crates/wasi-common/Cargo.toml
@@ -37,13 +37,13 @@ winapi = "0.3"
 cpu-time = "1.0"
 
 [dev-dependencies]
-wasmtime-runtime = { path = "../wasmtime-runtime" }
-wasmtime-environ = { path = "../wasmtime-environ" }
-wasmtime-jit = { path = "../wasmtime-jit" }
-wasmtime-wasi = { path = "../wasmtime-wasi" }
-wasmtime-api = { path = "../wasmtime-api" }
+wasmtime-runtime = { path = "../runtime" }
+wasmtime-environ = { path = "../environ" }
+wasmtime-jit = { path = "../jit" }
+wasmtime-wasi = { path = "../wasi" }
+wasmtime = { path = "../api" }
 cranelift-codegen = "0.49"
-target-lexicon = "0.8.1"
+target-lexicon = "0.9.0"
 pretty_env_logger = "0.3.0"
 tempfile = "3.1.0"
 os_pipe = "0.9"
diff --git a/wasmtime-jit/LICENSE b/crates/wasi-common/LICENSE
similarity index 100%
rename from wasmtime-jit/LICENSE
rename to crates/wasi-common/LICENSE
diff --git a/wasi-common/LICENSE.cloudabi-utils b/crates/wasi-common/LICENSE.cloudabi-utils
similarity index 100%
rename from wasi-common/LICENSE.cloudabi-utils
rename to crates/wasi-common/LICENSE.cloudabi-utils
diff --git a/wasi-common/README.md b/crates/wasi-common/README.md
similarity index 100%
rename from wasi-common/README.md
rename to crates/wasi-common/README.md
diff --git a/crates/wasi-common/WASI b/crates/wasi-common/WASI
new file mode 160000
index 0000000000..8651dfa37b
--- /dev/null
+++ b/crates/wasi-common/WASI
@@ -0,0 +1 @@
+Subproject commit 8651dfa37b92d17215d1364f935ffa1ac2b77c60
diff --git a/wasi-common/build.rs b/crates/wasi-common/build.rs
similarity index 100%
rename from wasi-common/build.rs
rename to crates/wasi-common/build.rs
diff --git a/wasi-common/src/ctx.rs b/crates/wasi-common/src/ctx.rs
similarity index 100%
rename from wasi-common/src/ctx.rs
rename to crates/wasi-common/src/ctx.rs
diff --git a/wasi-common/src/error.rs b/crates/wasi-common/src/error.rs
similarity index 100%
rename from wasi-common/src/error.rs
rename to crates/wasi-common/src/error.rs
diff --git a/wasi-common/src/fdentry.rs b/crates/wasi-common/src/fdentry.rs
similarity index 100%
rename from wasi-common/src/fdentry.rs
rename to crates/wasi-common/src/fdentry.rs
diff --git a/wasi-common/src/fs/dir.rs b/crates/wasi-common/src/fs/dir.rs
similarity index 100%
rename from wasi-common/src/fs/dir.rs
rename to crates/wasi-common/src/fs/dir.rs
diff --git a/wasi-common/src/fs/dir_builder.rs b/crates/wasi-common/src/fs/dir_builder.rs
similarity index 100%
rename from wasi-common/src/fs/dir_builder.rs
rename to crates/wasi-common/src/fs/dir_builder.rs
diff --git a/wasi-common/src/fs/dir_entry.rs b/crates/wasi-common/src/fs/dir_entry.rs
similarity index 100%
rename from wasi-common/src/fs/dir_entry.rs
rename to crates/wasi-common/src/fs/dir_entry.rs
diff --git a/wasi-common/src/fs/error.rs b/crates/wasi-common/src/fs/error.rs
similarity index 100%
rename from wasi-common/src/fs/error.rs
rename to crates/wasi-common/src/fs/error.rs
diff --git a/wasi-common/src/fs/file.rs b/crates/wasi-common/src/fs/file.rs
similarity index 100%
rename from wasi-common/src/fs/file.rs
rename to crates/wasi-common/src/fs/file.rs
diff --git a/wasi-common/src/fs/file_type.rs b/crates/wasi-common/src/fs/file_type.rs
similarity index 100%
rename from wasi-common/src/fs/file_type.rs
rename to crates/wasi-common/src/fs/file_type.rs
diff --git a/wasi-common/src/fs/metadata.rs b/crates/wasi-common/src/fs/metadata.rs
similarity index 100%
rename from wasi-common/src/fs/metadata.rs
rename to crates/wasi-common/src/fs/metadata.rs
diff --git a/wasi-common/src/fs/mod.rs b/crates/wasi-common/src/fs/mod.rs
similarity index 100%
rename from wasi-common/src/fs/mod.rs
rename to crates/wasi-common/src/fs/mod.rs
diff --git a/wasi-common/src/fs/open_options.rs b/crates/wasi-common/src/fs/open_options.rs
similarity index 100%
rename from wasi-common/src/fs/open_options.rs
rename to crates/wasi-common/src/fs/open_options.rs
diff --git a/wasi-common/src/fs/permissions.rs b/crates/wasi-common/src/fs/permissions.rs
similarity index 100%
rename from wasi-common/src/fs/permissions.rs
rename to crates/wasi-common/src/fs/permissions.rs
diff --git a/wasi-common/src/fs/readdir.rs b/crates/wasi-common/src/fs/readdir.rs
similarity index 100%
rename from wasi-common/src/fs/readdir.rs
rename to crates/wasi-common/src/fs/readdir.rs
diff --git a/wasi-common/src/helpers.rs b/crates/wasi-common/src/helpers.rs
similarity index 100%
rename from wasi-common/src/helpers.rs
rename to crates/wasi-common/src/helpers.rs
diff --git a/wasi-common/src/host.rs b/crates/wasi-common/src/host.rs
similarity index 100%
rename from wasi-common/src/host.rs
rename to crates/wasi-common/src/host.rs
diff --git a/wasi-common/src/hostcalls/fs.rs b/crates/wasi-common/src/hostcalls/fs.rs
similarity index 100%
rename from wasi-common/src/hostcalls/fs.rs
rename to crates/wasi-common/src/hostcalls/fs.rs
diff --git a/wasi-common/src/hostcalls/misc.rs b/crates/wasi-common/src/hostcalls/misc.rs
similarity index 100%
rename from wasi-common/src/hostcalls/misc.rs
rename to crates/wasi-common/src/hostcalls/misc.rs
diff --git a/wasi-common/src/hostcalls/mod.rs b/crates/wasi-common/src/hostcalls/mod.rs
similarity index 100%
rename from wasi-common/src/hostcalls/mod.rs
rename to crates/wasi-common/src/hostcalls/mod.rs
diff --git a/wasi-common/src/hostcalls/sock.rs b/crates/wasi-common/src/hostcalls/sock.rs
similarity index 100%
rename from wasi-common/src/hostcalls/sock.rs
rename to crates/wasi-common/src/hostcalls/sock.rs
diff --git a/wasi-common/src/hostcalls_impl/fs.rs b/crates/wasi-common/src/hostcalls_impl/fs.rs
similarity index 100%
rename from wasi-common/src/hostcalls_impl/fs.rs
rename to crates/wasi-common/src/hostcalls_impl/fs.rs
diff --git a/wasi-common/src/hostcalls_impl/fs_helpers.rs b/crates/wasi-common/src/hostcalls_impl/fs_helpers.rs
similarity index 100%
rename from wasi-common/src/hostcalls_impl/fs_helpers.rs
rename to crates/wasi-common/src/hostcalls_impl/fs_helpers.rs
diff --git a/wasi-common/src/hostcalls_impl/misc.rs b/crates/wasi-common/src/hostcalls_impl/misc.rs
similarity index 100%
rename from wasi-common/src/hostcalls_impl/misc.rs
rename to crates/wasi-common/src/hostcalls_impl/misc.rs
diff --git a/wasi-common/src/hostcalls_impl/mod.rs b/crates/wasi-common/src/hostcalls_impl/mod.rs
similarity index 100%
rename from wasi-common/src/hostcalls_impl/mod.rs
rename to crates/wasi-common/src/hostcalls_impl/mod.rs
diff --git a/wasi-common/src/lib.rs b/crates/wasi-common/src/lib.rs
similarity index 100%
rename from wasi-common/src/lib.rs
rename to crates/wasi-common/src/lib.rs
diff --git a/wasi-common/src/macros.rs b/crates/wasi-common/src/macros.rs
similarity index 100%
rename from wasi-common/src/macros.rs
rename to crates/wasi-common/src/macros.rs
diff --git a/wasi-common/src/memory.rs b/crates/wasi-common/src/memory.rs
similarity index 100%
rename from wasi-common/src/memory.rs
rename to crates/wasi-common/src/memory.rs
diff --git a/wasi-common/src/sys/mod.rs b/crates/wasi-common/src/sys/mod.rs
similarity index 100%
rename from wasi-common/src/sys/mod.rs
rename to crates/wasi-common/src/sys/mod.rs
diff --git a/wasi-common/src/sys/unix/bsd/hostcalls_impl.rs b/crates/wasi-common/src/sys/unix/bsd/hostcalls_impl.rs
similarity index 100%
rename from wasi-common/src/sys/unix/bsd/hostcalls_impl.rs
rename to crates/wasi-common/src/sys/unix/bsd/hostcalls_impl.rs
diff --git a/wasi-common/src/sys/unix/bsd/mod.rs b/crates/wasi-common/src/sys/unix/bsd/mod.rs
similarity index 100%
rename from wasi-common/src/sys/unix/bsd/mod.rs
rename to crates/wasi-common/src/sys/unix/bsd/mod.rs
diff --git a/wasi-common/src/sys/unix/bsd/osfile.rs b/crates/wasi-common/src/sys/unix/bsd/osfile.rs
similarity index 100%
rename from wasi-common/src/sys/unix/bsd/osfile.rs
rename to crates/wasi-common/src/sys/unix/bsd/osfile.rs
diff --git a/wasi-common/src/sys/unix/dir.rs b/crates/wasi-common/src/sys/unix/dir.rs
similarity index 100%
rename from wasi-common/src/sys/unix/dir.rs
rename to crates/wasi-common/src/sys/unix/dir.rs
diff --git a/wasi-common/src/sys/unix/fdentry_impl.rs b/crates/wasi-common/src/sys/unix/fdentry_impl.rs
similarity index 100%
rename from wasi-common/src/sys/unix/fdentry_impl.rs
rename to crates/wasi-common/src/sys/unix/fdentry_impl.rs
diff --git a/wasi-common/src/sys/unix/host_impl.rs b/crates/wasi-common/src/sys/unix/host_impl.rs
similarity index 100%
rename from wasi-common/src/sys/unix/host_impl.rs
rename to crates/wasi-common/src/sys/unix/host_impl.rs
diff --git a/wasi-common/src/sys/unix/hostcalls_impl/fs.rs b/crates/wasi-common/src/sys/unix/hostcalls_impl/fs.rs
similarity index 100%
rename from wasi-common/src/sys/unix/hostcalls_impl/fs.rs
rename to crates/wasi-common/src/sys/unix/hostcalls_impl/fs.rs
diff --git a/wasi-common/src/sys/unix/hostcalls_impl/fs_helpers.rs b/crates/wasi-common/src/sys/unix/hostcalls_impl/fs_helpers.rs
similarity index 100%
rename from wasi-common/src/sys/unix/hostcalls_impl/fs_helpers.rs
rename to crates/wasi-common/src/sys/unix/hostcalls_impl/fs_helpers.rs
diff --git a/wasi-common/src/sys/unix/hostcalls_impl/misc.rs b/crates/wasi-common/src/sys/unix/hostcalls_impl/misc.rs
similarity index 100%
rename from wasi-common/src/sys/unix/hostcalls_impl/misc.rs
rename to crates/wasi-common/src/sys/unix/hostcalls_impl/misc.rs
diff --git a/wasi-common/src/sys/unix/hostcalls_impl/mod.rs b/crates/wasi-common/src/sys/unix/hostcalls_impl/mod.rs
similarity index 100%
rename from wasi-common/src/sys/unix/hostcalls_impl/mod.rs
rename to crates/wasi-common/src/sys/unix/hostcalls_impl/mod.rs
diff --git a/wasi-common/src/sys/unix/linux/hostcalls_impl.rs b/crates/wasi-common/src/sys/unix/linux/hostcalls_impl.rs
similarity index 100%
rename from wasi-common/src/sys/unix/linux/hostcalls_impl.rs
rename to crates/wasi-common/src/sys/unix/linux/hostcalls_impl.rs
diff --git a/wasi-common/src/sys/unix/linux/mod.rs b/crates/wasi-common/src/sys/unix/linux/mod.rs
similarity index 100%
rename from wasi-common/src/sys/unix/linux/mod.rs
rename to crates/wasi-common/src/sys/unix/linux/mod.rs
diff --git a/wasi-common/src/sys/unix/linux/osfile.rs b/crates/wasi-common/src/sys/unix/linux/osfile.rs
similarity index 100%
rename from wasi-common/src/sys/unix/linux/osfile.rs
rename to crates/wasi-common/src/sys/unix/linux/osfile.rs
diff --git a/wasi-common/src/sys/unix/mod.rs b/crates/wasi-common/src/sys/unix/mod.rs
similarity index 100%
rename from wasi-common/src/sys/unix/mod.rs
rename to crates/wasi-common/src/sys/unix/mod.rs
diff --git a/wasi-common/src/sys/windows/fdentry_impl.rs b/crates/wasi-common/src/sys/windows/fdentry_impl.rs
similarity index 100%
rename from wasi-common/src/sys/windows/fdentry_impl.rs
rename to crates/wasi-common/src/sys/windows/fdentry_impl.rs
diff --git a/wasi-common/src/sys/windows/host_impl.rs b/crates/wasi-common/src/sys/windows/host_impl.rs
similarity index 100%
rename from wasi-common/src/sys/windows/host_impl.rs
rename to crates/wasi-common/src/sys/windows/host_impl.rs
diff --git a/wasi-common/src/sys/windows/hostcalls_impl/fs.rs b/crates/wasi-common/src/sys/windows/hostcalls_impl/fs.rs
similarity index 100%
rename from wasi-common/src/sys/windows/hostcalls_impl/fs.rs
rename to crates/wasi-common/src/sys/windows/hostcalls_impl/fs.rs
diff --git a/wasi-common/src/sys/windows/hostcalls_impl/fs_helpers.rs b/crates/wasi-common/src/sys/windows/hostcalls_impl/fs_helpers.rs
similarity index 100%
rename from wasi-common/src/sys/windows/hostcalls_impl/fs_helpers.rs
rename to crates/wasi-common/src/sys/windows/hostcalls_impl/fs_helpers.rs
diff --git a/wasi-common/src/sys/windows/hostcalls_impl/misc.rs b/crates/wasi-common/src/sys/windows/hostcalls_impl/misc.rs
similarity index 100%
rename from wasi-common/src/sys/windows/hostcalls_impl/misc.rs
rename to crates/wasi-common/src/sys/windows/hostcalls_impl/misc.rs
diff --git a/wasi-common/src/sys/windows/hostcalls_impl/mod.rs b/crates/wasi-common/src/sys/windows/hostcalls_impl/mod.rs
similarity index 100%
rename from wasi-common/src/sys/windows/hostcalls_impl/mod.rs
rename to crates/wasi-common/src/sys/windows/hostcalls_impl/mod.rs
diff --git a/wasi-common/src/sys/windows/mod.rs b/crates/wasi-common/src/sys/windows/mod.rs
similarity index 100%
rename from wasi-common/src/sys/windows/mod.rs
rename to crates/wasi-common/src/sys/windows/mod.rs
diff --git a/wasi-common/src/wasi.rs b/crates/wasi-common/src/wasi.rs
similarity index 100%
rename from wasi-common/src/wasi.rs
rename to crates/wasi-common/src/wasi.rs
diff --git a/wasi-common/src/wasi32.rs b/crates/wasi-common/src/wasi32.rs
similarity index 100%
rename from wasi-common/src/wasi32.rs
rename to crates/wasi-common/src/wasi32.rs
diff --git a/wasi-common/tests/wasm_tests/main.rs b/crates/wasi-common/tests/wasm_tests/main.rs
similarity index 100%
rename from wasi-common/tests/wasm_tests/main.rs
rename to crates/wasi-common/tests/wasm_tests/main.rs
diff --git a/wasi-common/tests/wasm_tests/runtime.rs b/crates/wasi-common/tests/wasm_tests/runtime.rs
similarity index 100%
rename from wasi-common/tests/wasm_tests/runtime.rs
rename to crates/wasi-common/tests/wasm_tests/runtime.rs
diff --git a/wasi-common/tests/wasm_tests/utils.rs b/crates/wasi-common/tests/wasm_tests/utils.rs
similarity index 100%
rename from wasi-common/tests/wasm_tests/utils.rs
rename to crates/wasi-common/tests/wasm_tests/utils.rs
diff --git a/wasi-common/wasi-common-cbindgen/Cargo.toml b/crates/wasi-common/wasi-common-cbindgen/Cargo.toml
similarity index 100%
rename from wasi-common/wasi-common-cbindgen/Cargo.toml
rename to crates/wasi-common/wasi-common-cbindgen/Cargo.toml
diff --git a/wasmtime-obj/LICENSE b/crates/wasi-common/wasi-common-cbindgen/LICENSE
similarity index 100%
rename from wasmtime-obj/LICENSE
rename to crates/wasi-common/wasi-common-cbindgen/LICENSE
diff --git a/wasi-common/wasi-common-cbindgen/src/lib.rs b/crates/wasi-common/wasi-common-cbindgen/src/lib.rs
similarity index 100%
rename from wasi-common/wasi-common-cbindgen/src/lib.rs
rename to crates/wasi-common/wasi-common-cbindgen/src/lib.rs
diff --git a/wasi-common/wasi-common-cbindgen/tests/array_args.rs b/crates/wasi-common/wasi-common-cbindgen/tests/array_args.rs
similarity index 100%
rename from wasi-common/wasi-common-cbindgen/tests/array_args.rs
rename to crates/wasi-common/wasi-common-cbindgen/tests/array_args.rs
diff --git a/wasi-common/wasi-common-cbindgen/tests/mut_args.rs b/crates/wasi-common/wasi-common-cbindgen/tests/mut_args.rs
similarity index 100%
rename from wasi-common/wasi-common-cbindgen/tests/mut_args.rs
rename to crates/wasi-common/wasi-common-cbindgen/tests/mut_args.rs
diff --git a/wasi-common/wasi-common-cbindgen/tests/no_args.rs b/crates/wasi-common/wasi-common-cbindgen/tests/no_args.rs
similarity index 100%
rename from wasi-common/wasi-common-cbindgen/tests/no_args.rs
rename to crates/wasi-common/wasi-common-cbindgen/tests/no_args.rs
diff --git a/wasi-common/wasi-common-cbindgen/tests/ref_args.rs b/crates/wasi-common/wasi-common-cbindgen/tests/ref_args.rs
similarity index 100%
rename from wasi-common/wasi-common-cbindgen/tests/ref_args.rs
rename to crates/wasi-common/wasi-common-cbindgen/tests/ref_args.rs
diff --git a/wasi-common/wasi-common-cbindgen/tests/test.rs b/crates/wasi-common/wasi-common-cbindgen/tests/test.rs
similarity index 100%
rename from wasi-common/wasi-common-cbindgen/tests/test.rs
rename to crates/wasi-common/wasi-common-cbindgen/tests/test.rs
diff --git a/wasi-common/wasi-common-cbindgen/tests/val_args.rs b/crates/wasi-common/wasi-common-cbindgen/tests/val_args.rs
similarity index 100%
rename from wasi-common/wasi-common-cbindgen/tests/val_args.rs
rename to crates/wasi-common/wasi-common-cbindgen/tests/val_args.rs
diff --git a/wasi-common/wasi-misc-tests/Cargo.toml b/crates/wasi-common/wasi-misc-tests/Cargo.toml
similarity index 100%
rename from wasi-common/wasi-misc-tests/Cargo.toml
rename to crates/wasi-common/wasi-misc-tests/Cargo.toml
diff --git a/wasi-common/wasi-misc-tests/README.md b/crates/wasi-common/wasi-misc-tests/README.md
similarity index 100%
rename from wasi-common/wasi-misc-tests/README.md
rename to crates/wasi-common/wasi-misc-tests/README.md
diff --git a/wasi-common/wasi-misc-tests/src/bin/big_random_buf.rs b/crates/wasi-common/wasi-misc-tests/src/bin/big_random_buf.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/big_random_buf.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/big_random_buf.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/clock_time_get.rs b/crates/wasi-common/wasi-misc-tests/src/bin/clock_time_get.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/clock_time_get.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/clock_time_get.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/close_preopen.rs b/crates/wasi-common/wasi-misc-tests/src/bin/close_preopen.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/close_preopen.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/close_preopen.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/dangling_symlink.rs b/crates/wasi-common/wasi-misc-tests/src/bin/dangling_symlink.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/dangling_symlink.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/dangling_symlink.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/directory_seek.rs b/crates/wasi-common/wasi-misc-tests/src/bin/directory_seek.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/directory_seek.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/directory_seek.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/fd_advise.rs b/crates/wasi-common/wasi-misc-tests/src/bin/fd_advise.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/fd_advise.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/fd_advise.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/fd_filestat_set.rs b/crates/wasi-common/wasi-misc-tests/src/bin/fd_filestat_set.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/fd_filestat_set.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/fd_filestat_set.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/fd_readdir.rs b/crates/wasi-common/wasi-misc-tests/src/bin/fd_readdir.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/fd_readdir.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/fd_readdir.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/file_allocate.rs b/crates/wasi-common/wasi-misc-tests/src/bin/file_allocate.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/file_allocate.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/file_allocate.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/file_pread_pwrite.rs b/crates/wasi-common/wasi-misc-tests/src/bin/file_pread_pwrite.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/file_pread_pwrite.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/file_pread_pwrite.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/file_seek_tell.rs b/crates/wasi-common/wasi-misc-tests/src/bin/file_seek_tell.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/file_seek_tell.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/file_seek_tell.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/file_unbuffered_write.rs b/crates/wasi-common/wasi-misc-tests/src/bin/file_unbuffered_write.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/file_unbuffered_write.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/file_unbuffered_write.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/interesting_paths.rs b/crates/wasi-common/wasi-misc-tests/src/bin/interesting_paths.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/interesting_paths.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/interesting_paths.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/isatty.rs b/crates/wasi-common/wasi-misc-tests/src/bin/isatty.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/isatty.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/isatty.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/nofollow_errors.rs b/crates/wasi-common/wasi-misc-tests/src/bin/nofollow_errors.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/nofollow_errors.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/nofollow_errors.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/path_filestat.rs b/crates/wasi-common/wasi-misc-tests/src/bin/path_filestat.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/path_filestat.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/path_filestat.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/path_open_dirfd_not_dir.rs b/crates/wasi-common/wasi-misc-tests/src/bin/path_open_dirfd_not_dir.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/path_open_dirfd_not_dir.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/path_open_dirfd_not_dir.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/path_rename.rs b/crates/wasi-common/wasi-misc-tests/src/bin/path_rename.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/path_rename.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/path_rename.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/path_rename_trailing_slashes.rs b/crates/wasi-common/wasi-misc-tests/src/bin/path_rename_trailing_slashes.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/path_rename_trailing_slashes.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/path_rename_trailing_slashes.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/path_symlink_trailing_slashes.rs b/crates/wasi-common/wasi-misc-tests/src/bin/path_symlink_trailing_slashes.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/path_symlink_trailing_slashes.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/path_symlink_trailing_slashes.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/poll_oneoff.rs b/crates/wasi-common/wasi-misc-tests/src/bin/poll_oneoff.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/poll_oneoff.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/poll_oneoff.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/readlink.rs b/crates/wasi-common/wasi-misc-tests/src/bin/readlink.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/readlink.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/readlink.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/readlink_no_buffer.rs b/crates/wasi-common/wasi-misc-tests/src/bin/readlink_no_buffer.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/readlink_no_buffer.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/readlink_no_buffer.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/remove_directory_trailing_slashes.rs b/crates/wasi-common/wasi-misc-tests/src/bin/remove_directory_trailing_slashes.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/remove_directory_trailing_slashes.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/remove_directory_trailing_slashes.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/remove_nonempty_directory.rs b/crates/wasi-common/wasi-misc-tests/src/bin/remove_nonempty_directory.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/remove_nonempty_directory.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/remove_nonempty_directory.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/renumber.rs b/crates/wasi-common/wasi-misc-tests/src/bin/renumber.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/renumber.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/renumber.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/sched_yield.rs b/crates/wasi-common/wasi-misc-tests/src/bin/sched_yield.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/sched_yield.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/sched_yield.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/symlink_loop.rs b/crates/wasi-common/wasi-misc-tests/src/bin/symlink_loop.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/symlink_loop.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/symlink_loop.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/truncation_rights.rs b/crates/wasi-common/wasi-misc-tests/src/bin/truncation_rights.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/truncation_rights.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/truncation_rights.rs
diff --git a/wasi-common/wasi-misc-tests/src/bin/unlink_file_trailing_slashes.rs b/crates/wasi-common/wasi-misc-tests/src/bin/unlink_file_trailing_slashes.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/bin/unlink_file_trailing_slashes.rs
rename to crates/wasi-common/wasi-misc-tests/src/bin/unlink_file_trailing_slashes.rs
diff --git a/wasi-common/wasi-misc-tests/src/lib.rs b/crates/wasi-common/wasi-misc-tests/src/lib.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/lib.rs
rename to crates/wasi-common/wasi-misc-tests/src/lib.rs
diff --git a/wasi-common/wasi-misc-tests/src/utils.rs b/crates/wasi-common/wasi-misc-tests/src/utils.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/utils.rs
rename to crates/wasi-common/wasi-misc-tests/src/utils.rs
diff --git a/wasi-common/wasi-misc-tests/src/wasi_wrappers.rs b/crates/wasi-common/wasi-misc-tests/src/wasi_wrappers.rs
similarity index 100%
rename from wasi-common/wasi-misc-tests/src/wasi_wrappers.rs
rename to crates/wasi-common/wasi-misc-tests/src/wasi_wrappers.rs
diff --git a/wasi-common/wig/Cargo.toml b/crates/wasi-common/wig/Cargo.toml
similarity index 100%
rename from wasi-common/wig/Cargo.toml
rename to crates/wasi-common/wig/Cargo.toml
diff --git a/wasmtime-runtime/LICENSE b/crates/wasi-common/wig/LICENSE
similarity index 100%
rename from wasmtime-runtime/LICENSE
rename to crates/wasi-common/wig/LICENSE
diff --git a/wasi-common/wig/src/lib.rs b/crates/wasi-common/wig/src/lib.rs
similarity index 100%
rename from wasi-common/wig/src/lib.rs
rename to crates/wasi-common/wig/src/lib.rs
diff --git a/wasi-common/wig/src/raw_types.rs b/crates/wasi-common/wig/src/raw_types.rs
similarity index 100%
rename from wasi-common/wig/src/raw_types.rs
rename to crates/wasi-common/wig/src/raw_types.rs
diff --git a/wasi-common/wig/src/utils.rs b/crates/wasi-common/wig/src/utils.rs
similarity index 100%
rename from wasi-common/wig/src/utils.rs
rename to crates/wasi-common/wig/src/utils.rs
diff --git a/wasi-common/winx/Cargo.toml b/crates/wasi-common/winx/Cargo.toml
similarity index 100%
rename from wasi-common/winx/Cargo.toml
rename to crates/wasi-common/winx/Cargo.toml
diff --git a/wasmtime-wasi-c/LICENSE b/crates/wasi-common/winx/LICENSE
similarity index 100%
rename from wasmtime-wasi-c/LICENSE
rename to crates/wasi-common/winx/LICENSE
diff --git a/wasi-common/winx/src/file.rs b/crates/wasi-common/winx/src/file.rs
similarity index 100%
rename from wasi-common/winx/src/file.rs
rename to crates/wasi-common/winx/src/file.rs
diff --git a/wasi-common/winx/src/lib.rs b/crates/wasi-common/winx/src/lib.rs
similarity index 100%
rename from wasi-common/winx/src/lib.rs
rename to crates/wasi-common/winx/src/lib.rs
diff --git a/wasi-common/winx/src/time.rs b/crates/wasi-common/winx/src/time.rs
similarity index 100%
rename from wasi-common/winx/src/time.rs
rename to crates/wasi-common/winx/src/time.rs
diff --git a/wasi-common/winx/src/winerror.rs b/crates/wasi-common/winx/src/winerror.rs
similarity index 100%
rename from wasi-common/winx/src/winerror.rs
rename to crates/wasi-common/winx/src/winerror.rs
diff --git a/wasmtime-wasi/Cargo.toml b/crates/wasi/Cargo.toml
similarity index 83%
rename from wasmtime-wasi/Cargo.toml
rename to crates/wasi/Cargo.toml
index 5e87c26e54..c8f596a9f8 100644
--- a/wasmtime-wasi/Cargo.toml
+++ b/crates/wasi/Cargo.toml
@@ -10,9 +10,9 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmtime-runtime = { path = "../wasmtime-runtime" }
-wasmtime-environ = { path = "../wasmtime-environ" }
-wasmtime-jit = { path = "../wasmtime-jit" }
+wasmtime-runtime = { path = "../runtime" }
+wasmtime-environ = { path = "../environ" }
+wasmtime-jit = { path = "../jit" }
 wasi-common = { path = "../wasi-common" }
 cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
diff --git a/wasmtime-wasi/LICENSE b/crates/wasi/LICENSE
similarity index 100%
rename from wasmtime-wasi/LICENSE
rename to crates/wasi/LICENSE
diff --git a/wasmtime-wasi/README.md b/crates/wasi/README.md
similarity index 100%
rename from wasmtime-wasi/README.md
rename to crates/wasi/README.md
diff --git a/wasmtime-wasi/js-polyfill/README.md b/crates/wasi/js-polyfill/README.md
similarity index 100%
rename from wasmtime-wasi/js-polyfill/README.md
rename to crates/wasi/js-polyfill/README.md
diff --git a/wasmtime-wasi/js-polyfill/WASI-small.png b/crates/wasi/js-polyfill/WASI-small.png
similarity index 100%
rename from wasmtime-wasi/js-polyfill/WASI-small.png
rename to crates/wasi/js-polyfill/WASI-small.png
diff --git a/wasmtime-wasi/src/instantiate.rs b/crates/wasi/src/instantiate.rs
similarity index 100%
rename from wasmtime-wasi/src/instantiate.rs
rename to crates/wasi/src/instantiate.rs
diff --git a/wasmtime-wasi/src/lib.rs b/crates/wasi/src/lib.rs
similarity index 100%
rename from wasmtime-wasi/src/lib.rs
rename to crates/wasi/src/lib.rs
diff --git a/wasmtime-wasi/src/syscalls.rs b/crates/wasi/src/syscalls.rs
similarity index 100%
rename from wasmtime-wasi/src/syscalls.rs
rename to crates/wasi/src/syscalls.rs
diff --git a/wasmtime-wast/Cargo.toml b/crates/wast/Cargo.toml
similarity index 83%
rename from wasmtime-wast/Cargo.toml
rename to crates/wast/Cargo.toml
index 0a45860bbd..ac7fd02ec1 100644
--- a/wasmtime-wast/Cargo.toml
+++ b/crates/wast/Cargo.toml
@@ -14,9 +14,9 @@ edition = "2018"
 cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
-wasmtime-jit = { path = "../wasmtime-jit" }
-wasmtime-runtime = { path = "../wasmtime-runtime" }
-wasmtime-environ = { path = "../wasmtime-environ" }
+wasmtime-jit = { path = "../jit" }
+wasmtime-runtime = { path = "../runtime" }
+wasmtime-environ = { path = "../environ" }
 wast = "3.0.0"
 anyhow = "1.0.19"
 target-lexicon = "0.9.0"
diff --git a/wasmtime-wast/LICENSE b/crates/wast/LICENSE
similarity index 100%
rename from wasmtime-wast/LICENSE
rename to crates/wast/LICENSE
diff --git a/wasmtime-wast/README.md b/crates/wast/README.md
similarity index 100%
rename from wasmtime-wast/README.md
rename to crates/wast/README.md
diff --git a/wasmtime-wast/src/lib.rs b/crates/wast/src/lib.rs
similarity index 100%
rename from wasmtime-wast/src/lib.rs
rename to crates/wast/src/lib.rs
diff --git a/wasmtime-wast/src/spectest.rs b/crates/wast/src/spectest.rs
similarity index 100%
rename from wasmtime-wast/src/spectest.rs
rename to crates/wast/src/spectest.rs
diff --git a/wasmtime-wast/src/wast.rs b/crates/wast/src/wast.rs
similarity index 100%
rename from wasmtime-wast/src/wast.rs
rename to crates/wast/src/wast.rs
diff --git a/CACHE_CONFIGURATION.md b/docs/CACHE_CONFIGURATION.md
similarity index 100%
rename from CACHE_CONFIGURATION.md
rename to docs/CACHE_CONFIGURATION.md
diff --git a/docs/embed-rust.md b/docs/embed-rust.md
index 3701871d0b..a391290b7d 100644
--- a/docs/embed-rust.md
+++ b/docs/embed-rust.md
@@ -28,9 +28,11 @@ We will be using the wasmtime engine/API to run the wasm file, so we will add th
 
 ```
 [dependencies]
-wasmtime-api = { git = "https://github.com/CraneStation/wasmtime" }
+wasmtime = "<current version>"
 ```
 
+where "<current version>" is the current version number of the `wasmtime` crate.
+
 It is time to add code to the `src/main.rs`. First, the engine and storage need to be activated:
 
 ```rust
diff --git a/filetests/trap_bounds.wat b/filetests/trap_bounds.wat
deleted file mode 100644
index efdf7957b3..0000000000
--- a/filetests/trap_bounds.wat
+++ /dev/null
@@ -1,9 +0,0 @@
-(module
-  (memory 1 1)
-  (func $main
-    i32.const 65536
-    i32.const 65536
-    i32.store
-  )
-  (start $main)
-)
diff --git a/filetests/trap_divbyzero.wat b/filetests/trap_divbyzero.wat
deleted file mode 100644
index 34a831ac10..0000000000
--- a/filetests/trap_divbyzero.wat
+++ /dev/null
@@ -1,11 +0,0 @@
-(module
-  (func $foo (result i32)
-    i32.const 1
-    i32.const 0
-    i32.div_s
-  )
-  (func $main
-    (drop (call $foo))
-  )
-  (start $main)
-)
diff --git a/filetests/trap_empty_mem.wat b/filetests/trap_empty_mem.wat
deleted file mode 100644
index e56d563bed..0000000000
--- a/filetests/trap_empty_mem.wat
+++ /dev/null
@@ -1,9 +0,0 @@
-(module
-  (memory 0 0)
-  (func $main
-    i32.const 0
-    i32.const 0
-    i32.store
-  )
-  (start $main)
-)
diff --git a/filetests/trap_stackoverflow.wat b/filetests/trap_stackoverflow.wat
deleted file mode 100644
index 060d680895..0000000000
--- a/filetests/trap_stackoverflow.wat
+++ /dev/null
@@ -1,9 +0,0 @@
-(module
-  (func $foo
-    (call $main)
-  )
-  (func $main
-    (call $foo)
-  )
-  (start $main)
-)
diff --git a/filetests/trap_unreachable.wat b/filetests/trap_unreachable.wat
deleted file mode 100644
index 575fccdfbf..0000000000
--- a/filetests/trap_unreachable.wat
+++ /dev/null
@@ -1,9 +0,0 @@
-(module
-  (func $foo
-    (unreachable)
-  )
-  (func $main
-    (call $foo)
-  )
-  (start $main)
-)
diff --git a/installer/msi/wasmtime.wxs b/installer/msi/wasmtime.wxs
index 32fd74ed96..a9590809c2 100644
--- a/installer/msi/wasmtime.wxs
+++ b/installer/msi/wasmtime.wxs
@@ -59,7 +59,7 @@
                 <File Id="README.md" Source="README.md" KeyPath="yes" Checksum="yes"/>
             </Component>
             <Component Id="CACHE_CONFIGURATION" Guid="*">
-                <File Id="CACHE_CONFIGURATION.md" Source="CACHE_CONFIGURATION.md" KeyPath="yes" Checksum="yes"/>
+                <File Id="CACHE_CONFIGURATION.md" Source="docs\CACHE_CONFIGURATION.md" KeyPath="yes" Checksum="yes"/>
             </Component>
         </DirectoryRef>
 
diff --git a/publish-all.sh b/publish-all.sh
deleted file mode 100755
index e841f596f8..0000000000
--- a/publish-all.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# This is a convenience script for maintainers publishing a new version of
-# Wasmtime to crates.io. To use, bump the version number below, run the
-# script, and then run the commands that the script prints.
-
-topdir=$(dirname "$0")
-cd "$topdir"
-
-# All the wasmtime-* crates have the same version number
-version="0.2.0"
-
-# Update all of the Cargo.toml files.
-#
-# The main Cargo.toml in the top-level directory is the wasmtime crate which we don't publish.
-echo "Updating crate versions to $version"
-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"
-
-    # Update the required version number of any wasmtime* dependencies.
-    sed -i.bk -e "/^wasmtime/s/version = \"[^\"]*\"/version = \"$version\"/" \
-        "$crate/Cargo.toml"
-done
-
-# Update our local Cargo.lock (not checked in).
-cargo update
-./test-all.sh
-
-# Commands needed to publish.
-#
-# Note that libraries need to be published in topological order.
-
-echo git commit -a -m "\"Bump version to $version"\"
-echo git tag v$version
-echo git push
-echo git push origin v$version
-for crate in \
-    wasmtime-environ \
-    wasmtime-debug \
-    wasmtime-runtime \
-    wasmtime-jit \
-    wasmtime-wast \
-    wasmtime-wasi \
-    wasmtime-wasi-c \
-    wasmtime-interface-types \
-    wasmtime-obj \
-    wasmtime-py \
-    wasmtime-rust \
-    wasmtime
-do
-    echo cargo publish --manifest-path "$crate/Cargo.toml"
-
-    # Sleep for a few seconds to allow the server to update the index.
-    # https://internals.rust-lang.org/t/changes-to-how-crates-io-handles-index-updates/9608
-    echo sleep 10
-done
diff --git a/scripts/cargo-chill.sh b/scripts/cargo-chill.sh
new file mode 100755
index 0000000000..5ffa2953e4
--- /dev/null
+++ b/scripts/cargo-chill.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -euo pipefail
+
+# This is a trivial wrapper around cargo which just forwards its arguments
+# to cargo, and then sleeps for a few seconds, to allow for exteral services
+# to update their indices.
+# https://internals.rust-lang.org/t/changes-to-how-crates-io-handles-index-updates/9608
+
+cargo "$@"
+sleep 10
diff --git a/cranelift-version.sh b/scripts/cranelift-version.sh
similarity index 89%
rename from cranelift-version.sh
rename to scripts/cranelift-version.sh
index b24088890a..db34f24b8b 100755
--- a/cranelift-version.sh
+++ b/scripts/cranelift-version.sh
@@ -5,7 +5,7 @@ set -euo pipefail
 # dependencies versions. To use, bump the version number below, run the
 # script.
 
-topdir=$(dirname "$0")
+topdir=$(dirname "$0")/..
 cd "$topdir"
 
 # All the cranelift-* crates have the same version number
@@ -13,7 +13,7 @@ version="0.49"
 
 # Update all of the Cargo.toml files.
 echo "Updating crate versions to $version"
-for crate in . lightbeam wasmtime-* fuzz misc/wasmtime-*; do
+for crate in . crates/* crates/misc/* fuzz; do
     # Update the version number of this crate to $version.
     sed -i.bk -e "/^cranelift-/s/\"[^\"]*\"/\"$version\"/" \
         "$crate/Cargo.toml"
diff --git a/format-all.sh b/scripts/format-all.sh
similarity index 87%
rename from format-all.sh
rename to scripts/format-all.sh
index 64c967ad24..3d2c4ab467 100755
--- a/format-all.sh
+++ b/scripts/format-all.sh
@@ -3,7 +3,7 @@ set -euo pipefail
 
 # Format all sources using rustfmt.
 
-topdir=$(dirname "$0")
+topdir=$(dirname "$0")/..
 cd "$topdir"
 
 # Make sure we can find rustfmt.
diff --git a/scripts/publish-all.sh b/scripts/publish-all.sh
new file mode 100755
index 0000000000..edda971931
--- /dev/null
+++ b/scripts/publish-all.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+set -euo pipefail
+
+# This is a convenience script for maintainers publishing a new version of
+# Wasmtime to crates.io. To use, bump the version number below, run the
+# script, and then run the commands that the script prints.
+
+topdir=$(dirname "$0")/..
+cd "$topdir"
+
+# All the wasmtime-* crates have the same version number
+version="0.2.0"
+
+# Update the version numbers of the crates to $version.
+echo "Updating crate versions to $version"
+find -name Cargo.toml -exec sed -i.bk -e "s/^version = .*/version = \"$version\"/" {} \;
+
+# Update our local Cargo.lock (not checked in).
+cargo update
+scripts/test-all.sh
+
+# Commands needed to publish.
+#
+# Note that libraries need to be published in topological order.
+
+echo git commit -a -m "\"Bump version to $version"\"
+echo git tag v$version
+echo git push
+echo git push origin v$version
+echo "find -name Cargo.toml -exec scripts/cargo-chill.sh publish --manifest-path {} \\;"
diff --git a/test-all.sh b/scripts/test-all.sh
similarity index 94%
rename from test-all.sh
rename to scripts/test-all.sh
index 9767bd731e..12ec730704 100755
--- a/test-all.sh
+++ b/scripts/test-all.sh
@@ -6,14 +6,14 @@ set -euo pipefail
 # - Check code formatting.
 # - Make a debug build.
 # - Make a release build.
-# - Run unit tests for all Rust crates (including the filetests)
+# - Run unit tests for all Rust crates
 # - Build API documentation.
 # - Optionally, run fuzzing.
 #
 # All tests run by this script should be passing at all times.
 
 # Repository top-level directory.
-topdir=$(dirname "$0")
+topdir=$(dirname "$0")/..
 cd "$topdir"
 
 function banner {
@@ -23,7 +23,7 @@ function banner {
 # Run rustfmt if we have it.
 banner "Rust formatting"
 if cargo +stable fmt -- --version > /dev/null ; then
-    if ! "$topdir/format-all.sh" --check ; then
+    if ! "$topdir/scripts/format-all.sh" --check ; then
         echo "Formatting diffs detected! Run \"cargo fmt --all\" to correct."
         exit 1
     fi
@@ -51,8 +51,8 @@ banner "Rust unit tests"
 # run the lightbeam tests below if nightly is available.
 #RUST_BACKTRACE=1 cargo test --all
 RUST_BACKTRACE=1 cargo test \
+  --package wasmtime-cli \
   --package wasmtime \
-  --package wasmtime-api \
   --package wasmtime-wasi \
   --package wasmtime-wast \
   --package wasmtime-debug \
diff --git a/spec_testsuite b/spec_testsuite
deleted file mode 160000
index 78d896f088..0000000000
--- a/spec_testsuite
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 78d896f08895cbc2c8cb9da1fe64df56c5aeb6aa
diff --git a/src/bin/wasm2obj.rs b/src/bin/wasm2obj.rs
index 30747ee9d6..3db711159f 100644
--- a/src/bin/wasm2obj.rs
+++ b/src/bin/wasm2obj.rs
@@ -49,7 +49,7 @@ use std::process;
 use std::str;
 use std::str::FromStr;
 use target_lexicon::Triple;
-use wasmtime::pick_compilation_strategy;
+use wasmtime_cli::pick_compilation_strategy;
 use wasmtime_debug::{emit_debugsections, read_debuginfo};
 #[cfg(feature = "lightbeam")]
 use wasmtime_environ::Lightbeam;
@@ -130,7 +130,7 @@ fn main() {
         None
     } else {
         let prefix = "wasm2obj.dbg.";
-        wasmtime::init_file_per_thread_logger(prefix);
+        wasmtime_cli::init_file_per_thread_logger(prefix);
         Some(prefix)
     };
 
diff --git a/src/bin/wasmtime.rs b/src/bin/wasmtime.rs
index 3bf755a55f..91e6342525 100644
--- a/src/bin/wasmtime.rs
+++ b/src/bin/wasmtime.rs
@@ -43,8 +43,8 @@ use std::path::Component;
 use std::path::Path;
 use std::process::exit;
 use wasi_common::preopen_dir;
-use wasmtime::pick_compilation_strategy;
 use wasmtime_api::{Config, Engine, HostRef, Instance, Module, Store};
+use wasmtime_cli::pick_compilation_strategy;
 use wasmtime_environ::{cache_create_new_config, cache_init};
 use wasmtime_interface_types::ModuleData;
 use wasmtime_jit::Features;
@@ -200,7 +200,7 @@ fn main() -> Result<()> {
         None
     } else {
         let prefix = "wasmtime.dbg.";
-        wasmtime::init_file_per_thread_logger(prefix);
+        wasmtime_cli::init_file_per_thread_logger(prefix);
         Some(prefix)
     };
 
diff --git a/src/bin/wast.rs b/src/bin/wast.rs
index 08191f51ac..c019fe11b8 100644
--- a/src/bin/wast.rs
+++ b/src/bin/wast.rs
@@ -33,7 +33,7 @@ use pretty_env_logger;
 use serde::Deserialize;
 use std::path::Path;
 use std::process;
-use wasmtime::pick_compilation_strategy;
+use wasmtime_cli::pick_compilation_strategy;
 use wasmtime_environ::{cache_create_new_config, cache_init};
 use wasmtime_jit::{Compiler, Features};
 use wasmtime_wast::WastContext;
@@ -93,7 +93,7 @@ fn main() {
         None
     } else {
         let prefix = "cranelift.dbg.";
-        wasmtime::init_file_per_thread_logger(prefix);
+        wasmtime_cli::init_file_per_thread_logger(prefix);
         Some(prefix)
     };
 
diff --git a/tests/instantiate.rs b/tests/instantiate.rs
index fc0d5237eb..5f6fbbd7dd 100644
--- a/tests/instantiate.rs
+++ b/tests/instantiate.rs
@@ -8,7 +8,7 @@ use std::collections::HashMap;
 use std::path::PathBuf;
 use wasmtime_jit::{instantiate, CompilationStrategy, Compiler, NullResolver};
 
-const PATH_MODULE_RS2WASM_ADD_FUNC: &str = r"filetests/rs2wasm-add-func.wat";
+const PATH_MODULE_RS2WASM_ADD_FUNC: &str = r"tests/wat/rs2wasm-add-func.wat";
 
 /// Simple test reading a wasm-file and translating to binary representation.
 #[test]
diff --git a/misc_testsuite/misc_traps.wast b/tests/misc_testsuite/misc_traps.wast
similarity index 100%
rename from misc_testsuite/misc_traps.wast
rename to tests/misc_testsuite/misc_traps.wast
diff --git a/misc_testsuite/stack_overflow.wast b/tests/misc_testsuite/stack_overflow.wast
similarity index 100%
rename from misc_testsuite/stack_overflow.wast
rename to tests/misc_testsuite/stack_overflow.wast
diff --git a/tests/spec_testsuite b/tests/spec_testsuite
new file mode 160000
index 0000000000..ab59e3a7cb
--- /dev/null
+++ b/tests/spec_testsuite
@@ -0,0 +1 @@
+Subproject commit ab59e3a7cb039f9a50d4e24da7634dd4dd472ce3
diff --git a/filetests/rs2wasm-add-func.wat b/tests/wat/rs2wasm-add-func.wat
similarity index 100%
rename from filetests/rs2wasm-add-func.wat
rename to tests/wat/rs2wasm-add-func.wat
diff --git a/wasi-common/WASI b/wasi-common/WASI
deleted file mode 160000
index 7a5f477fe4..0000000000
--- a/wasi-common/WASI
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7a5f477fe411c2887d0689184d4aadbfc4892c0f
diff --git a/wasmtime-api/c-examples/wasm-c-api b/wasmtime-api/c-examples/wasm-c-api
deleted file mode 160000
index 6db391ee71..0000000000
--- a/wasmtime-api/c-examples/wasm-c-api
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6db391ee7121a0695602945d11001ea3e00b0afb