Merge pull request bytecodealliance#512 from sunfishcode/reorg

Reorganize the codebase
sdeleuze · Nov 8, 2019 · 85cfdd0 · 85cfdd0
2 parents 025867e + e017062
commit 85cfdd0
Show file tree

Hide file tree

Showing 377 changed files with 150 additions and 210 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → crates/api/Cargo.toml b/wasmtime-api/Cargo.toml → 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 → crates/api/LICENSE b/lightbeam/LICENSE → crates/api/LICENSE
diff --git a/wasmtime-api/README.md → crates/api/README.md b/wasmtime-api/README.md → crates/api/README.md
diff --git a/wasmtime-api/c-examples/Makefile → crates/api/c-examples/Makefile b/wasmtime-api/c-examples/Makefile → crates/api/c-examples/Makefile
diff --git a/crates/api/c-examples/wasm-c-api b/crates/api/c-examples/wasm-c-api
diff --git a/wasmtime-api/examples/gcd.rs → crates/api/examples/gcd.rs b/wasmtime-api/examples/gcd.rs → crates/api/examples/gcd.rs
diff --git a/wasmtime-api/examples/gcd.wasm → crates/api/examples/gcd.wasm b/wasmtime-api/examples/gcd.wasm → crates/api/examples/gcd.wasm
diff --git a/wasmtime-api/examples/hello.rs → crates/api/examples/hello.rs b/wasmtime-api/examples/hello.rs → crates/api/examples/hello.rs
diff --git a/wasmtime-api/examples/hello.wasm → crates/api/examples/hello.wasm b/wasmtime-api/examples/hello.wasm → crates/api/examples/hello.wasm
diff --git a/wasmtime-api/examples/hello.wat → crates/api/examples/hello.wat b/wasmtime-api/examples/hello.wat → crates/api/examples/hello.wat
diff --git a/wasmtime-api/examples/memory.rs → crates/api/examples/memory.rs b/wasmtime-api/examples/memory.rs → crates/api/examples/memory.rs
diff --git a/wasmtime-api/examples/memory.wasm → crates/api/examples/memory.wasm b/wasmtime-api/examples/memory.wasm → crates/api/examples/memory.wasm
diff --git a/wasmtime-api/examples/memory.wat → crates/api/examples/memory.wat b/wasmtime-api/examples/memory.wat → crates/api/examples/memory.wat
diff --git a/wasmtime-api/examples/multi.rs → crates/api/examples/multi.rs b/wasmtime-api/examples/multi.rs → crates/api/examples/multi.rs
diff --git a/wasmtime-api/examples/multi.wasm → crates/api/examples/multi.wasm b/wasmtime-api/examples/multi.wasm → crates/api/examples/multi.wasm
diff --git a/wasmtime-api/examples/multi.wat → crates/api/examples/multi.wat b/wasmtime-api/examples/multi.wat → crates/api/examples/multi.wat
diff --git a/wasmtime-api/src/callable.rs → crates/api/src/callable.rs b/wasmtime-api/src/callable.rs → crates/api/src/callable.rs
diff --git a/wasmtime-api/src/context.rs → crates/api/src/context.rs b/wasmtime-api/src/context.rs → crates/api/src/context.rs
diff --git a/wasmtime-api/src/externals.rs → crates/api/src/externals.rs b/wasmtime-api/src/externals.rs → crates/api/src/externals.rs
diff --git a/wasmtime-api/src/instance.rs → crates/api/src/instance.rs b/wasmtime-api/src/instance.rs → crates/api/src/instance.rs
diff --git a/wasmtime-api/src/lib.rs → crates/api/src/lib.rs b/wasmtime-api/src/lib.rs → crates/api/src/lib.rs
diff --git a/wasmtime-api/src/module.rs → crates/api/src/module.rs b/wasmtime-api/src/module.rs → crates/api/src/module.rs
diff --git a/wasmtime-api/src/ref.rs → crates/api/src/ref.rs b/wasmtime-api/src/ref.rs → crates/api/src/ref.rs
diff --git a/wasmtime-api/src/runtime.rs → crates/api/src/runtime.rs b/wasmtime-api/src/runtime.rs → crates/api/src/runtime.rs
diff --git a/wasmtime-api/src/trampoline/create_handle.rs → crates/api/src/trampoline/create_handle.rs b/wasmtime-api/src/trampoline/create_handle.rs → crates/api/src/trampoline/create_handle.rs
diff --git a/wasmtime-api/src/trampoline/func.rs → crates/api/src/trampoline/func.rs b/wasmtime-api/src/trampoline/func.rs → crates/api/src/trampoline/func.rs
diff --git a/wasmtime-api/src/trampoline/global.rs → crates/api/src/trampoline/global.rs b/wasmtime-api/src/trampoline/global.rs → crates/api/src/trampoline/global.rs
diff --git a/wasmtime-api/src/trampoline/memory.rs → crates/api/src/trampoline/memory.rs b/wasmtime-api/src/trampoline/memory.rs → crates/api/src/trampoline/memory.rs
diff --git a/wasmtime-api/src/trampoline/mod.rs → crates/api/src/trampoline/mod.rs b/wasmtime-api/src/trampoline/mod.rs → crates/api/src/trampoline/mod.rs
diff --git a/wasmtime-api/src/trampoline/table.rs → crates/api/src/trampoline/table.rs b/wasmtime-api/src/trampoline/table.rs → crates/api/src/trampoline/table.rs
diff --git a/wasmtime-api/src/trap.rs → crates/api/src/trap.rs b/wasmtime-api/src/trap.rs → crates/api/src/trap.rs
diff --git a/wasmtime-api/src/types.rs → crates/api/src/types.rs b/wasmtime-api/src/types.rs → crates/api/src/types.rs
diff --git a/wasmtime-api/src/values.rs → crates/api/src/values.rs b/wasmtime-api/src/values.rs → crates/api/src/values.rs
diff --git a/wasmtime-api/src/wasm.rs → crates/api/src/wasm.rs b/wasmtime-api/src/wasm.rs → crates/api/src/wasm.rs
diff --git a/wasmtime-api/tests/examples.rs → crates/api/tests/examples.rs b/wasmtime-api/tests/examples.rs → crates/api/tests/examples.rs
diff --git a/wasmtime-api/tests/import_calling_export.rs → crates/api/tests/import_calling_export.rs b/wasmtime-api/tests/import_calling_export.rs → crates/api/tests/import_calling_export.rs
diff --git a/...time-api/tests/import_calling_export.wasm → crates/api/tests/import_calling_export.wasm b/...time-api/tests/import_calling_export.wasm → crates/api/tests/import_calling_export.wasm
diff --git a/wasmtime-api/tests/import_calling_export.wat → crates/api/tests/import_calling_export.wat b/wasmtime-api/tests/import_calling_export.wat → crates/api/tests/import_calling_export.wat
diff --git a/wasmtime-debug/.gitignore → crates/debug/.gitignore b/wasmtime-debug/.gitignore → crates/debug/.gitignore
diff --git a/wasmtime-debug/Cargo.toml → crates/debug/Cargo.toml b/wasmtime-debug/Cargo.toml → 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 → crates/debug/LICENSE b/misc/wasmtime-py/LICENSE → crates/debug/LICENSE
diff --git a/wasmtime-debug/README.md → crates/debug/README.md b/wasmtime-debug/README.md → crates/debug/README.md
diff --git a/wasmtime-debug/src/gc.rs → crates/debug/src/gc.rs b/wasmtime-debug/src/gc.rs → crates/debug/src/gc.rs
diff --git a/wasmtime-debug/src/lib.rs → crates/debug/src/lib.rs b/wasmtime-debug/src/lib.rs → crates/debug/src/lib.rs
diff --git a/wasmtime-debug/src/read_debuginfo.rs → crates/debug/src/read_debuginfo.rs b/wasmtime-debug/src/read_debuginfo.rs → crates/debug/src/read_debuginfo.rs
diff --git a/...-debug/src/transform/address_transform.rs → .../debug/src/transform/address_transform.rs b/...-debug/src/transform/address_transform.rs → .../debug/src/transform/address_transform.rs
diff --git a/wasmtime-debug/src/transform/attr.rs → crates/debug/src/transform/attr.rs b/wasmtime-debug/src/transform/attr.rs → crates/debug/src/transform/attr.rs
diff --git a/wasmtime-debug/src/transform/expression.rs → crates/debug/src/transform/expression.rs b/wasmtime-debug/src/transform/expression.rs → crates/debug/src/transform/expression.rs
diff --git a/wasmtime-debug/src/transform/line_program.rs → crates/debug/src/transform/line_program.rs b/wasmtime-debug/src/transform/line_program.rs → crates/debug/src/transform/line_program.rs
diff --git a/wasmtime-debug/src/transform/mod.rs → crates/debug/src/transform/mod.rs b/wasmtime-debug/src/transform/mod.rs → crates/debug/src/transform/mod.rs
diff --git a/...debug/src/transform/range_info_builder.rs → ...debug/src/transform/range_info_builder.rs b/...debug/src/transform/range_info_builder.rs → ...debug/src/transform/range_info_builder.rs
diff --git a/wasmtime-debug/src/transform/simulate.rs → crates/debug/src/transform/simulate.rs b/wasmtime-debug/src/transform/simulate.rs → crates/debug/src/transform/simulate.rs
diff --git a/wasmtime-debug/src/transform/unit.rs → crates/debug/src/transform/unit.rs b/wasmtime-debug/src/transform/unit.rs → crates/debug/src/transform/unit.rs
diff --git a/wasmtime-debug/src/transform/utils.rs → crates/debug/src/transform/utils.rs b/wasmtime-debug/src/transform/utils.rs → crates/debug/src/transform/utils.rs
diff --git a/wasmtime-debug/src/write_debuginfo.rs → crates/debug/src/write_debuginfo.rs b/wasmtime-debug/src/write_debuginfo.rs → crates/debug/src/write_debuginfo.rs
diff --git a/wasmtime-environ/.gitignore → crates/environ/.gitignore b/wasmtime-environ/.gitignore → crates/environ/.gitignore
diff --git a/wasmtime-environ/Cargo.toml → crates/environ/Cargo.toml b/wasmtime-environ/Cargo.toml → 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 → crates/environ/LICENSE b/wasi-common/LICENSE → crates/environ/LICENSE
diff --git a/wasmtime-environ/README.md → crates/environ/README.md b/wasmtime-environ/README.md → crates/environ/README.md
diff --git a/wasmtime-environ/build.rs → crates/environ/build.rs b/wasmtime-environ/build.rs → crates/environ/build.rs
diff --git a/wasmtime-environ/src/address_map.rs → crates/environ/src/address_map.rs b/wasmtime-environ/src/address_map.rs → crates/environ/src/address_map.rs
diff --git a/wasmtime-environ/src/cache.rs → crates/environ/src/cache.rs b/wasmtime-environ/src/cache.rs → crates/environ/src/cache.rs
diff --git a/wasmtime-environ/src/cache/config.rs → crates/environ/src/cache/config.rs b/wasmtime-environ/src/cache/config.rs → 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 → crates/environ/src/cache/config/tests.rs b/wasmtime-environ/src/cache/config/tests.rs → crates/environ/src/cache/config/tests.rs
diff --git a/wasmtime-environ/src/cache/tests.rs → crates/environ/src/cache/tests.rs b/wasmtime-environ/src/cache/tests.rs → crates/environ/src/cache/tests.rs
diff --git a/wasmtime-environ/src/cache/worker.rs → crates/environ/src/cache/worker.rs b/wasmtime-environ/src/cache/worker.rs → crates/environ/src/cache/worker.rs
diff --git a/wasmtime-environ/src/cache/worker/tests.rs → crates/environ/src/cache/worker/tests.rs b/wasmtime-environ/src/cache/worker/tests.rs → crates/environ/src/cache/worker/tests.rs
diff --git a/...rc/cache/worker/tests/system_time_stub.rs → ...rc/cache/worker/tests/system_time_stub.rs b/...rc/cache/worker/tests/system_time_stub.rs → ...rc/cache/worker/tests/system_time_stub.rs
diff --git a/wasmtime-environ/src/compilation.rs → crates/environ/src/compilation.rs b/wasmtime-environ/src/compilation.rs → crates/environ/src/compilation.rs
diff --git a/wasmtime-environ/src/cranelift.rs → crates/environ/src/cranelift.rs b/wasmtime-environ/src/cranelift.rs → crates/environ/src/cranelift.rs
diff --git a/wasmtime-environ/src/func_environ.rs → crates/environ/src/func_environ.rs b/wasmtime-environ/src/func_environ.rs → crates/environ/src/func_environ.rs
diff --git a/wasmtime-environ/src/lib.rs → crates/environ/src/lib.rs b/wasmtime-environ/src/lib.rs → crates/environ/src/lib.rs
diff --git a/wasmtime-environ/src/lightbeam.rs → crates/environ/src/lightbeam.rs b/wasmtime-environ/src/lightbeam.rs → crates/environ/src/lightbeam.rs
diff --git a/wasmtime-environ/src/module.rs → crates/environ/src/module.rs b/wasmtime-environ/src/module.rs → crates/environ/src/module.rs
diff --git a/wasmtime-environ/src/module_environ.rs → crates/environ/src/module_environ.rs b/wasmtime-environ/src/module_environ.rs → crates/environ/src/module_environ.rs
diff --git a/wasmtime-environ/src/tunables.rs → crates/environ/src/tunables.rs b/wasmtime-environ/src/tunables.rs → crates/environ/src/tunables.rs
diff --git a/wasmtime-environ/src/vmoffsets.rs → crates/environ/src/vmoffsets.rs b/wasmtime-environ/src/vmoffsets.rs → crates/environ/src/vmoffsets.rs
diff --git a/...n/tests/cache_default_config_in_memory.rs → ...n/tests/cache_default_config_in_memory.rs b/...n/tests/cache_default_config_in_memory.rs → ...n/tests/cache_default_config_in_memory.rs
diff --git a/wasmtime-environ/tests/cache_disabled.rs → crates/environ/tests/cache_disabled.rs b/wasmtime-environ/tests/cache_disabled.rs → crates/environ/tests/cache_disabled.rs
diff --git a/...on/tests/cache_fail_calling_init_twice.rs → ...on/tests/cache_fail_calling_init_twice.rs b/...on/tests/cache_fail_calling_init_twice.rs → ...on/tests/cache_fail_calling_init_twice.rs
diff --git a/...nviron/tests/cache_fail_invalid_config.rs → ...nviron/tests/cache_fail_invalid_config.rs b/...nviron/tests/cache_fail_invalid_config.rs → ...nviron/tests/cache_fail_invalid_config.rs
diff --git a/...ests/cache_fail_invalid_path_to_config.rs → ...ests/cache_fail_invalid_path_to_config.rs b/...ests/cache_fail_invalid_path_to_config.rs → ...ests/cache_fail_invalid_path_to_config.rs
diff --git a/...viron/tests/cache_write_default_config.rs → ...viron/tests/cache_write_default_config.rs b/...viron/tests/cache_write_default_config.rs → ...viron/tests/cache_write_default_config.rs
diff --git a/wasmtime-interface-types/Cargo.toml → crates/interface-types/Cargo.toml b/wasmtime-interface-types/Cargo.toml → 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 → crates/interface-types/src/lib.rs b/wasmtime-interface-types/src/lib.rs → crates/interface-types/src/lib.rs
diff --git a/wasmtime-interface-types/src/value.rs → crates/interface-types/src/value.rs b/wasmtime-interface-types/src/value.rs → crates/interface-types/src/value.rs
diff --git a/wasmtime-jit/Cargo.toml → crates/jit/Cargo.toml b/wasmtime-jit/Cargo.toml → 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 → crates/jit/LICENSE b/wasi-common/wasi-common-cbindgen/LICENSE → crates/jit/LICENSE
diff --git a/wasmtime-jit/README.md → crates/jit/README.md b/wasmtime-jit/README.md → crates/jit/README.md
diff --git a/wasmtime-jit/src/action.rs → crates/jit/src/action.rs b/wasmtime-jit/src/action.rs → crates/jit/src/action.rs
diff --git a/wasmtime-jit/src/code_memory.rs → crates/jit/src/code_memory.rs b/wasmtime-jit/src/code_memory.rs → crates/jit/src/code_memory.rs
diff --git a/wasmtime-jit/src/compiler.rs → crates/jit/src/compiler.rs b/wasmtime-jit/src/compiler.rs → crates/jit/src/compiler.rs
diff --git a/wasmtime-jit/src/context.rs → crates/jit/src/context.rs b/wasmtime-jit/src/context.rs → crates/jit/src/context.rs
diff --git a/wasmtime-jit/src/function_table.rs → crates/jit/src/function_table.rs b/wasmtime-jit/src/function_table.rs → crates/jit/src/function_table.rs
diff --git a/wasmtime-jit/src/instantiate.rs → crates/jit/src/instantiate.rs b/wasmtime-jit/src/instantiate.rs → crates/jit/src/instantiate.rs
diff --git a/wasmtime-jit/src/lib.rs → crates/jit/src/lib.rs b/wasmtime-jit/src/lib.rs → crates/jit/src/lib.rs
diff --git a/wasmtime-jit/src/link.rs → crates/jit/src/link.rs b/wasmtime-jit/src/link.rs → crates/jit/src/link.rs
diff --git a/wasmtime-jit/src/namespace.rs → crates/jit/src/namespace.rs b/wasmtime-jit/src/namespace.rs → crates/jit/src/namespace.rs
diff --git a/wasmtime-jit/src/resolver.rs → crates/jit/src/resolver.rs b/wasmtime-jit/src/resolver.rs → crates/jit/src/resolver.rs
diff --git a/wasmtime-jit/src/target_tunables.rs → crates/jit/src/target_tunables.rs b/wasmtime-jit/src/target_tunables.rs → crates/jit/src/target_tunables.rs
diff --git a/lightbeam/Cargo.toml → crates/lightbeam/Cargo.toml b/lightbeam/Cargo.toml → 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 → crates/lightbeam/LICENSE b/wasi-common/wig/LICENSE → crates/lightbeam/LICENSE
diff --git a/lightbeam/README.md → crates/lightbeam/README.md b/lightbeam/README.md → crates/lightbeam/README.md
diff --git a/lightbeam/examples/test.rs → crates/lightbeam/examples/test.rs b/lightbeam/examples/test.rs → crates/lightbeam/examples/test.rs
diff --git a/lightbeam/src/backend.rs → crates/lightbeam/src/backend.rs b/lightbeam/src/backend.rs → crates/lightbeam/src/backend.rs
diff --git a/lightbeam/src/disassemble.rs → crates/lightbeam/src/disassemble.rs b/lightbeam/src/disassemble.rs → crates/lightbeam/src/disassemble.rs
diff --git a/lightbeam/src/error.rs → crates/lightbeam/src/error.rs b/lightbeam/src/error.rs → crates/lightbeam/src/error.rs
diff --git a/lightbeam/src/function_body.rs → crates/lightbeam/src/function_body.rs b/lightbeam/src/function_body.rs → crates/lightbeam/src/function_body.rs
diff --git a/lightbeam/src/lib.rs → crates/lightbeam/src/lib.rs b/lightbeam/src/lib.rs → crates/lightbeam/src/lib.rs
diff --git a/lightbeam/src/microwasm.rs → crates/lightbeam/src/microwasm.rs b/lightbeam/src/microwasm.rs → crates/lightbeam/src/microwasm.rs
diff --git a/lightbeam/src/module.rs → crates/lightbeam/src/module.rs b/lightbeam/src/module.rs → crates/lightbeam/src/module.rs
diff --git a/lightbeam/src/tests.rs → crates/lightbeam/src/tests.rs b/lightbeam/src/tests.rs → crates/lightbeam/src/tests.rs
diff --git a/lightbeam/src/translate_sections.rs → crates/lightbeam/src/translate_sections.rs b/lightbeam/src/translate_sections.rs → crates/lightbeam/src/translate_sections.rs
diff --git a/lightbeam/test.wasm → crates/lightbeam/test.wasm b/lightbeam/test.wasm → crates/lightbeam/test.wasm
diff --git a/lightbeam/test.wat → crates/lightbeam/test.wat b/lightbeam/test.wat → crates/lightbeam/test.wat
diff --git a/misc/wasmtime-py/.gitignore → crates/misc/py/.gitignore b/misc/wasmtime-py/.gitignore → crates/misc/py/.gitignore
diff --git a/misc/wasmtime-py/Cargo.toml → crates/misc/py/Cargo.toml b/misc/wasmtime-py/Cargo.toml → 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 → crates/misc/py/LICENSE b/wasi-common/winx/LICENSE → crates/misc/py/LICENSE
diff --git a/misc/wasmtime-py/README.md → crates/misc/py/README.md b/misc/wasmtime-py/README.md → crates/misc/py/README.md
diff --git a/misc/wasmtime-py/examples/gcd/.gitignore → crates/misc/py/examples/gcd/.gitignore b/misc/wasmtime-py/examples/gcd/.gitignore → crates/misc/py/examples/gcd/.gitignore
diff --git a/misc/wasmtime-py/examples/gcd/README.md → crates/misc/py/examples/gcd/README.md b/misc/wasmtime-py/examples/gcd/README.md → crates/misc/py/examples/gcd/README.md
diff --git a/misc/wasmtime-py/examples/gcd/gcd.rs → crates/misc/py/examples/gcd/gcd.rs b/misc/wasmtime-py/examples/gcd/gcd.rs → crates/misc/py/examples/gcd/gcd.rs
diff --git a/misc/wasmtime-py/examples/gcd/run.py → crates/misc/py/examples/gcd/run.py b/misc/wasmtime-py/examples/gcd/run.py → crates/misc/py/examples/gcd/run.py
diff --git a/misc/wasmtime-py/examples/import/.gitignore → crates/misc/py/examples/import/.gitignore b/misc/wasmtime-py/examples/import/.gitignore → crates/misc/py/examples/import/.gitignore
diff --git a/misc/wasmtime-py/examples/import/README.md → crates/misc/py/examples/import/README.md b/misc/wasmtime-py/examples/import/README.md → crates/misc/py/examples/import/README.md
diff --git a/misc/wasmtime-py/examples/import/demo.rs → crates/misc/py/examples/import/demo.rs b/misc/wasmtime-py/examples/import/demo.rs → crates/misc/py/examples/import/demo.rs
diff --git a/misc/wasmtime-py/examples/import/env.py → crates/misc/py/examples/import/env.py b/misc/wasmtime-py/examples/import/env.py → crates/misc/py/examples/import/env.py
diff --git a/misc/wasmtime-py/examples/import/run.py → crates/misc/py/examples/import/run.py b/misc/wasmtime-py/examples/import/run.py → crates/misc/py/examples/import/run.py
diff --git a/...smtime-py/examples/two_modules/.gitignore → ...s/misc/py/examples/two_modules/.gitignore b/...smtime-py/examples/two_modules/.gitignore → ...s/misc/py/examples/two_modules/.gitignore
diff --git a/...asmtime-py/examples/two_modules/README.md → ...es/misc/py/examples/two_modules/README.md b/...asmtime-py/examples/two_modules/README.md → ...es/misc/py/examples/two_modules/README.md
diff --git a/misc/wasmtime-py/examples/two_modules/env.py → crates/misc/py/examples/two_modules/env.py b/misc/wasmtime-py/examples/two_modules/env.py → crates/misc/py/examples/two_modules/env.py
diff --git a/misc/wasmtime-py/examples/two_modules/one.rs → crates/misc/py/examples/two_modules/one.rs b/misc/wasmtime-py/examples/two_modules/one.rs → crates/misc/py/examples/two_modules/one.rs
diff --git a/misc/wasmtime-py/examples/two_modules/run.py → crates/misc/py/examples/two_modules/run.py b/misc/wasmtime-py/examples/two_modules/run.py → crates/misc/py/examples/two_modules/run.py
diff --git a/.../wasmtime-py/examples/two_modules/two.wat → crates/misc/py/examples/two_modules/two.wat b/.../wasmtime-py/examples/two_modules/two.wat → crates/misc/py/examples/two_modules/two.wat
diff --git a/misc/wasmtime-py/python/wasmtime/__init__.py → crates/misc/py/python/wasmtime/__init__.py b/misc/wasmtime-py/python/wasmtime/__init__.py → crates/misc/py/python/wasmtime/__init__.py
diff --git a/misc/wasmtime-py/setup.py → crates/misc/py/setup.py b/misc/wasmtime-py/setup.py → crates/misc/py/setup.py
diff --git a/misc/wasmtime-py/src/function.rs → crates/misc/py/src/function.rs b/misc/wasmtime-py/src/function.rs → crates/misc/py/src/function.rs
diff --git a/misc/wasmtime-py/src/import.rs → crates/misc/py/src/import.rs b/misc/wasmtime-py/src/import.rs → crates/misc/py/src/import.rs
diff --git a/misc/wasmtime-py/src/instance.rs → crates/misc/py/src/instance.rs b/misc/wasmtime-py/src/instance.rs → crates/misc/py/src/instance.rs
diff --git a/misc/wasmtime-py/src/lib.rs → crates/misc/py/src/lib.rs b/misc/wasmtime-py/src/lib.rs → crates/misc/py/src/lib.rs
diff --git a/misc/wasmtime-py/src/memory.rs → crates/misc/py/src/memory.rs b/misc/wasmtime-py/src/memory.rs → crates/misc/py/src/memory.rs
diff --git a/misc/wasmtime-py/src/module.rs → crates/misc/py/src/module.rs b/misc/wasmtime-py/src/module.rs → crates/misc/py/src/module.rs
diff --git a/misc/wasmtime-py/src/value.rs → crates/misc/py/src/value.rs b/misc/wasmtime-py/src/value.rs → crates/misc/py/src/value.rs
diff --git a/misc/wasmtime-rust/Cargo.toml → crates/misc/rust/Cargo.toml b/misc/wasmtime-rust/Cargo.toml → 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 → crates/misc/rust/README.md b/misc/wasmtime-rust/README.md → crates/misc/rust/README.md
diff --git a/misc/wasmtime-rust/examples/markdown.rs → crates/misc/rust/examples/markdown.rs b/misc/wasmtime-rust/examples/markdown.rs → crates/misc/rust/examples/markdown.rs
diff --git a/misc/wasmtime-rust/macro/Cargo.toml → crates/misc/rust/macro/Cargo.toml b/misc/wasmtime-rust/macro/Cargo.toml → crates/misc/rust/macro/Cargo.toml
diff --git a/misc/wasmtime-rust/macro/README.md → crates/misc/rust/macro/README.md b/misc/wasmtime-rust/macro/README.md → crates/misc/rust/macro/README.md
diff --git a/misc/wasmtime-rust/macro/src/lib.rs → crates/misc/rust/macro/src/lib.rs b/misc/wasmtime-rust/macro/src/lib.rs → crates/misc/rust/macro/src/lib.rs
diff --git a/misc/wasmtime-rust/src/lib.rs → crates/misc/rust/src/lib.rs b/misc/wasmtime-rust/src/lib.rs → crates/misc/rust/src/lib.rs
diff --git a/wasmtime-obj/.gitignore → crates/obj/.gitignore b/wasmtime-obj/.gitignore → crates/obj/.gitignore
diff --git a/wasmtime-obj/Cargo.toml → crates/obj/Cargo.toml b/wasmtime-obj/Cargo.toml → 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 → crates/obj/LICENSE b/wasmtime-api/LICENSE → crates/obj/LICENSE
diff --git a/wasmtime-obj/README.md → crates/obj/README.md b/wasmtime-obj/README.md → crates/obj/README.md
diff --git a/wasmtime-obj/src/context.rs → crates/obj/src/context.rs b/wasmtime-obj/src/context.rs → crates/obj/src/context.rs
diff --git a/wasmtime-obj/src/data_segment.rs → crates/obj/src/data_segment.rs b/wasmtime-obj/src/data_segment.rs → crates/obj/src/data_segment.rs
diff --git a/wasmtime-obj/src/function.rs → crates/obj/src/function.rs b/wasmtime-obj/src/function.rs → crates/obj/src/function.rs
diff --git a/wasmtime-obj/src/lib.rs → crates/obj/src/lib.rs b/wasmtime-obj/src/lib.rs → crates/obj/src/lib.rs
diff --git a/wasmtime-obj/src/module.rs → crates/obj/src/module.rs b/wasmtime-obj/src/module.rs → crates/obj/src/module.rs
diff --git a/wasmtime-obj/src/table.rs → crates/obj/src/table.rs b/wasmtime-obj/src/table.rs → crates/obj/src/table.rs
diff --git a/wasmtime-runtime/Cargo.toml → crates/runtime/Cargo.toml b/wasmtime-runtime/Cargo.toml → 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 → crates/runtime/LICENSE b/wasmtime-debug/LICENSE → crates/runtime/LICENSE
diff --git a/wasmtime-runtime/README.md → crates/runtime/README.md b/wasmtime-runtime/README.md → crates/runtime/README.md
diff --git a/wasmtime-runtime/build.rs → crates/runtime/build.rs b/wasmtime-runtime/build.rs → crates/runtime/build.rs
diff --git a/...runtime/signalhandlers/SignalHandlers.cpp → ...runtime/signalhandlers/SignalHandlers.cpp b/...runtime/signalhandlers/SignalHandlers.cpp → ...runtime/signalhandlers/SignalHandlers.cpp
diff --git a/...runtime/signalhandlers/SignalHandlers.hpp → ...runtime/signalhandlers/SignalHandlers.hpp b/...runtime/signalhandlers/SignalHandlers.hpp → ...runtime/signalhandlers/SignalHandlers.hpp
diff --git a/...me-runtime/signalhandlers/Trampolines.cpp → ...es/runtime/signalhandlers/Trampolines.cpp b/...me-runtime/signalhandlers/Trampolines.cpp → ...es/runtime/signalhandlers/Trampolines.cpp
diff --git a/wasmtime-runtime/src/export.rs → crates/runtime/src/export.rs b/wasmtime-runtime/src/export.rs → crates/runtime/src/export.rs
diff --git a/wasmtime-runtime/src/imports.rs → crates/runtime/src/imports.rs b/wasmtime-runtime/src/imports.rs → crates/runtime/src/imports.rs
diff --git a/wasmtime-runtime/src/instance.rs → crates/runtime/src/instance.rs b/wasmtime-runtime/src/instance.rs → crates/runtime/src/instance.rs
diff --git a/wasmtime-runtime/src/jit_int.rs → crates/runtime/src/jit_int.rs b/wasmtime-runtime/src/jit_int.rs → crates/runtime/src/jit_int.rs
diff --git a/wasmtime-runtime/src/lib.rs → crates/runtime/src/lib.rs b/wasmtime-runtime/src/lib.rs → crates/runtime/src/lib.rs
diff --git a/wasmtime-runtime/src/libcalls.rs → crates/runtime/src/libcalls.rs b/wasmtime-runtime/src/libcalls.rs → crates/runtime/src/libcalls.rs
diff --git a/wasmtime-runtime/src/memory.rs → crates/runtime/src/memory.rs b/wasmtime-runtime/src/memory.rs → crates/runtime/src/memory.rs
diff --git a/wasmtime-runtime/src/mmap.rs → crates/runtime/src/mmap.rs b/wasmtime-runtime/src/mmap.rs → crates/runtime/src/mmap.rs
diff --git a/wasmtime-runtime/src/sig_registry.rs → crates/runtime/src/sig_registry.rs b/wasmtime-runtime/src/sig_registry.rs → crates/runtime/src/sig_registry.rs
diff --git a/wasmtime-runtime/src/signalhandlers.rs → crates/runtime/src/signalhandlers.rs b/wasmtime-runtime/src/signalhandlers.rs → crates/runtime/src/signalhandlers.rs
diff --git a/wasmtime-runtime/src/table.rs → crates/runtime/src/table.rs b/wasmtime-runtime/src/table.rs → crates/runtime/src/table.rs
diff --git a/wasmtime-runtime/src/trap_registry.rs → crates/runtime/src/trap_registry.rs b/wasmtime-runtime/src/trap_registry.rs → crates/runtime/src/trap_registry.rs
diff --git a/wasmtime-runtime/src/traphandlers.rs → crates/runtime/src/traphandlers.rs b/wasmtime-runtime/src/traphandlers.rs → crates/runtime/src/traphandlers.rs
diff --git a/wasmtime-runtime/src/vmcontext.rs → crates/runtime/src/vmcontext.rs b/wasmtime-runtime/src/vmcontext.rs → crates/runtime/src/vmcontext.rs
diff --git a/wasmtime-wasi-c/Cargo.toml → crates/wasi-c/Cargo.toml b/wasmtime-wasi-c/Cargo.toml → 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 → crates/wasi-c/LICENSE b/wasmtime-environ/LICENSE → crates/wasi-c/LICENSE
diff --git a/wasmtime-wasi-c/README.md → crates/wasi-c/README.md b/wasmtime-wasi-c/README.md → crates/wasi-c/README.md
diff --git a/wasmtime-wasi-c/build.rs → crates/wasi-c/build.rs b/wasmtime-wasi-c/build.rs → crates/wasi-c/build.rs
diff --git a/wasmtime-wasi-c/js-polyfill/WASI-small.png → crates/wasi-c/js-polyfill/WASI-small.png b/wasmtime-wasi-c/js-polyfill/WASI-small.png → crates/wasi-c/js-polyfill/WASI-small.png
diff --git a/wasmtime-wasi-c/js-polyfill/build.sh → crates/wasi-c/js-polyfill/build.sh b/wasmtime-wasi-c/js-polyfill/build.sh → crates/wasi-c/js-polyfill/build.sh
diff --git a/...time-wasi-c/js-polyfill/clang/stdatomic.h → crates/wasi-c/js-polyfill/clang/stdatomic.h b/...time-wasi-c/js-polyfill/clang/stdatomic.h → crates/wasi-c/js-polyfill/clang/stdatomic.h
diff --git a/wasmtime-wasi-c/js-polyfill/polyfill.c → crates/wasi-c/js-polyfill/polyfill.c b/wasmtime-wasi-c/js-polyfill/polyfill.c → crates/wasi-c/js-polyfill/polyfill.c
diff --git a/wasmtime-wasi-c/js-polyfill/shell.html → crates/wasi-c/js-polyfill/shell.html b/wasmtime-wasi-c/js-polyfill/shell.html → crates/wasi-c/js-polyfill/shell.html
diff --git a/wasmtime-wasi-c/js-polyfill/wasi.js → crates/wasi-c/js-polyfill/wasi.js b/wasmtime-wasi-c/js-polyfill/wasi.js → crates/wasi-c/js-polyfill/wasi.js
diff --git a/...andboxed-system-primitives/CMakeLists.txt → ...andboxed-system-primitives/CMakeLists.txt b/...andboxed-system-primitives/CMakeLists.txt → ...andboxed-system-primitives/CMakeLists.txt
diff --git a/...asi-c/sandboxed-system-primitives/LICENSE → ...asi-c/sandboxed-system-primitives/LICENSE b/...asi-c/sandboxed-system-primitives/LICENSE → ...asi-c/sandboxed-system-primitives/LICENSE
diff --git a/...i-c/sandboxed-system-primitives/README.md → ...i-c/sandboxed-system-primitives/README.md b/...i-c/sandboxed-system-primitives/README.md → ...i-c/sandboxed-system-primitives/README.md
diff --git a/...ndboxed-system-primitives/include/LICENSE → ...ndboxed-system-primitives/include/LICENSE b/...ndboxed-system-primitives/include/LICENSE → ...ndboxed-system-primitives/include/LICENSE
diff --git a/...-system-primitives/include/wasmtime_ssp.h → ...-system-primitives/include/wasmtime_ssp.h b/...-system-primitives/include/wasmtime_ssp.h → ...-system-primitives/include/wasmtime_ssp.h
diff --git a/...c/sandboxed-system-primitives/src/LICENSE → ...c/sandboxed-system-primitives/src/LICENSE b/...c/sandboxed-system-primitives/src/LICENSE → ...c/sandboxed-system-primitives/src/LICENSE
diff --git a/...sandboxed-system-primitives/src/README.md → ...sandboxed-system-primitives/src/README.md b/...sandboxed-system-primitives/src/README.md → ...sandboxed-system-primitives/src/README.md
diff --git a/.../sandboxed-system-primitives/src/config.h → .../sandboxed-system-primitives/src/config.h b/.../sandboxed-system-primitives/src/config.h → .../sandboxed-system-primitives/src/config.h
diff --git a/...sandboxed-system-primitives/src/locking.h → ...sandboxed-system-primitives/src/locking.h b/...sandboxed-system-primitives/src/locking.h → ...sandboxed-system-primitives/src/locking.h
diff --git a/...ed-system-primitives/src/numeric_limits.h → ...ed-system-primitives/src/numeric_limits.h b/...ed-system-primitives/src/numeric_limits.h → ...ed-system-primitives/src/numeric_limits.h
diff --git a/...c/sandboxed-system-primitives/src/posix.c → ...c/sandboxed-system-primitives/src/posix.c b/...c/sandboxed-system-primitives/src/posix.c → ...c/sandboxed-system-primitives/src/posix.c
diff --git a/...c/sandboxed-system-primitives/src/posix.h → ...c/sandboxed-system-primitives/src/posix.h b/...c/sandboxed-system-primitives/src/posix.h → ...c/sandboxed-system-primitives/src/posix.h
diff --git a/...c/sandboxed-system-primitives/src/queue.h → ...c/sandboxed-system-primitives/src/queue.h b/...c/sandboxed-system-primitives/src/queue.h → ...c/sandboxed-system-primitives/src/queue.h
diff --git a/.../sandboxed-system-primitives/src/random.c → .../sandboxed-system-primitives/src/random.c b/.../sandboxed-system-primitives/src/random.c → .../sandboxed-system-primitives/src/random.c
diff --git a/.../sandboxed-system-primitives/src/random.h → .../sandboxed-system-primitives/src/random.h b/.../sandboxed-system-primitives/src/random.h → .../sandboxed-system-primitives/src/random.h
diff --git a/...andboxed-system-primitives/src/refcount.h → ...andboxed-system-primitives/src/refcount.h b/...andboxed-system-primitives/src/refcount.h → ...andboxed-system-primitives/src/refcount.h
diff --git a/.../sandboxed-system-primitives/src/rights.h → .../sandboxed-system-primitives/src/rights.h b/.../sandboxed-system-primitives/src/rights.h → .../sandboxed-system-primitives/src/rights.h
diff --git a/...sandboxed-system-primitives/src/signals.h → ...sandboxed-system-primitives/src/signals.h b/...sandboxed-system-primitives/src/signals.h → ...sandboxed-system-primitives/src/signals.h
diff --git a/...i-c/sandboxed-system-primitives/src/str.c → ...i-c/sandboxed-system-primitives/src/str.c b/...i-c/sandboxed-system-primitives/src/str.c → ...i-c/sandboxed-system-primitives/src/str.c
diff --git a/...i-c/sandboxed-system-primitives/src/str.h → ...i-c/sandboxed-system-primitives/src/str.h b/...i-c/sandboxed-system-primitives/src/str.h → ...i-c/sandboxed-system-primitives/src/str.h
diff --git a/wasmtime-wasi-c/src/host.rs → crates/wasi-c/src/host.rs b/wasmtime-wasi-c/src/host.rs → crates/wasi-c/src/host.rs
diff --git a/wasmtime-wasi-c/src/instantiate.rs → crates/wasi-c/src/instantiate.rs b/wasmtime-wasi-c/src/instantiate.rs → crates/wasi-c/src/instantiate.rs
diff --git a/wasmtime-wasi-c/src/lib.rs → crates/wasi-c/src/lib.rs b/wasmtime-wasi-c/src/lib.rs → crates/wasi-c/src/lib.rs
diff --git a/wasmtime-wasi-c/src/syscalls.rs → crates/wasi-c/src/syscalls.rs b/wasmtime-wasi-c/src/syscalls.rs → crates/wasi-c/src/syscalls.rs
diff --git a/wasmtime-wasi-c/src/translate.rs → crates/wasi-c/src/translate.rs b/wasmtime-wasi-c/src/translate.rs → crates/wasi-c/src/translate.rs
diff --git a/wasmtime-wasi-c/src/wasm32.rs → crates/wasi-c/src/wasm32.rs b/wasmtime-wasi-c/src/wasm32.rs → crates/wasi-c/src/wasm32.rs