diff --git a/.gitmodules b/.gitmodules
index 3a079448b18d..4b6ae36299b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,9 +2,9 @@
 	path = spec_testsuite
 	url = https://github.com/WebAssembly/testsuite
 [submodule "lightbeam"]
-	path = lightbeam
+	path = crates/lightbeam
 	url = https://github.com/CraneStation/lightbeam.git
 	branch = master
 [submodule "wasmtime-api/c-examples/wasm-c-api"]
-	path = wasmtime-api/c-examples/wasm-c-api
+	path = crates/api/c-examples/wasm-c-api
 	url = https://github.com/WebAssembly/wasm-c-api
diff --git a/Cargo.toml b/Cargo.toml
index ce1d36219cbe..18b5bfbcef89 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,16 +15,16 @@ cranelift-codegen = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-native = "0.40.0"
 cranelift-entity = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.40.0", features = ["enable-serde"] }
-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 }
+wasmtime-api = { 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 = { git = "https://github.com/CraneStation/wasi-common", rev = "8ea7a983d8b1364e5f62d2adf0e74b3b8db1c9b3"}
 docopt = "1.0.1"
 serde = { "version" = "1.0.94", features = ["derive"] }
@@ -45,8 +45,8 @@ libc = "0.2.60"
 
 [workspace]
 members = [
-  "misc/wasmtime-rust",
-  "misc/wasmtime-py",
+  "misc/rust",
+  "misc/py",
 ]
 
 [features]
diff --git a/ci/azure-build-wheels.yml b/ci/azure-build-wheels.yml
index 8d84a9ac5e36..44e6a65feb88 100644
--- a/ci/azure-build-wheels.yml
+++ b/ci/azure-build-wheels.yml
@@ -4,7 +4,7 @@ steps:
 
 - template: azure-install-rust.yml
 
-- bash: mkdir misc/wasmtime-py/wheelhouse
+- bash: mkdir misc/py/wheelhouse
   displayName: Pre-create wheelhouse directory
 
 # Note that we skip this on Linux because Python 3.6 is pre-installed in the
@@ -24,14 +24,14 @@ steps:
   condition: and(succeeded(), ne(variables['Agent.OS'], 'Linux'))
 
 - bash: python setup.py bdist_wheel
-  workingDirectory: misc/wasmtime-py
+  workingDirectory: misc/py
   displayName: Build wheels py36
 
 # Clear the build directory between building different wheels for different
 # Python versions to ensure that we don't package dynamic libraries twice by
 # accident.
 - bash: rm -rf build
-  workingDirectory: misc/wasmtime-py
+  workingDirectory: misc/py
   displayName: Clear build directory
 
 # Note that 3.7 isn't installed on Linux so we don't do this a second time
@@ -45,7 +45,7 @@ steps:
     set -e
     pip3 install setuptools wheel==0.31.1 setuptools-rust
     python setup.py bdist_wheel
-  workingDirectory: misc/wasmtime-py
+  workingDirectory: misc/py
   displayName: Build wheels py37
   condition: and(succeeded(), ne(variables['Agent.OS'], 'Linux'))
 
@@ -53,7 +53,7 @@ steps:
 # need to run an `auditwheel` command as well to turn these into "manylinux"
 # wheels to run across a number of distributions.
 - bash: mv dist/*.whl wheelhouse/
-  workingDirectory: misc/wasmtime-py
+  workingDirectory: misc/py
   displayName: Move wheels to wheelhouse (not Linux)
   condition: and(succeeded(), ne(variables['Agent.OS'], 'Linux'))
 - bash: |
@@ -61,7 +61,7 @@ steps:
     for whl in dist/*.whl; do
         auditwheel repair "$whl" -w wheelhouse/
     done
-  workingDirectory: misc/wasmtime-py
+  workingDirectory: misc/py
   displayName: Move wheels to wheelhouse (Linux)
   condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
 
@@ -69,5 +69,5 @@ steps:
 # github releases
 - task: PublishPipelineArtifact@1
   inputs:
-    path: misc/wasmtime-py/wheelhouse
+    path: misc/py/wheelhouse
     artifactName: 'wheels-$(Agent.OS)'
diff --git a/wasmtime-api/Cargo.toml b/crates/api/Cargo.toml
similarity index 82%
rename from wasmtime-api/Cargo.toml
rename to crates/api/Cargo.toml
index 48d443e19681..1111855fc424 100644
--- a/wasmtime-api/Cargo.toml
+++ b/crates/api/Cargo.toml
@@ -17,9 +17,9 @@ cranelift-native = "0.40.0"
 cranelift-entity = "0.40.0"
 cranelift-wasm = "0.40.0"
 cranelift-frontend = "0.40.0"
-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 = "0.36"
 failure = { version = "0.1.3", default-features = false }
 failure_derive = { version = "0.1.3", default-features = false }
@@ -37,7 +37,7 @@ docopt = "1.0.1"
 serde = { "version" = "1.0.94", features = ["derive"] }
 pretty_env_logger = "0.3.0"
 wabt = "0.9.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/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/wasmtime-api/c-examples/wasm-c-api b/crates/api/c-examples/wasm-c-api
similarity index 100%
rename from wasmtime-api/c-examples/wasm-c-api
rename to crates/api/c-examples/wasm-c-api
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/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/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/misc/wasmtime-py/src/code_memory.rs b/crates/api/src/trampoline/code_memory.rs
similarity index 100%
rename from misc/wasmtime-py/src/code_memory.rs
rename to crates/api/src/trampoline/code_memory.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/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-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 3db02c0b4ba0..1849f5314c92 100644
--- a/wasmtime-debug/Cargo.toml
+++ b/crates/debug/Cargo.toml
@@ -18,7 +18,7 @@ cranelift-codegen = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-entity = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.40.0", features = ["enable-serde"] }
 faerie = "0.10.1"
-wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
+wasmtime-environ = { path = "../environ", default-features = false }
 target-lexicon = { version = "0.4.0", default-features = false }
 failure = { version = "0.1.3", default-features = false }
 failure_derive = { version = "0.1.3", default-features = false }
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 100%
rename from wasmtime-environ/Cargo.toml
rename to crates/environ/Cargo.toml
diff --git a/wasmtime-debug/LICENSE b/crates/environ/LICENSE
similarity index 100%
rename from wasmtime-debug/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/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/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_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_usage_without_init.rs b/crates/environ/tests/cache_fail_usage_without_init.rs
similarity index 100%
rename from wasmtime-environ/tests/cache_fail_usage_without_init.rs
rename to crates/environ/tests/cache_fail_usage_without_init.rs
diff --git a/wasmtime-interface-types/Cargo.toml b/crates/interface-types/Cargo.toml
similarity index 83%
rename from wasmtime-interface-types/Cargo.toml
rename to crates/interface-types/Cargo.toml
index 42ebd47e3886..fa51a056505f 100644
--- a/wasmtime-interface-types/Cargo.toml
+++ b/crates/interface-types/Cargo.toml
@@ -16,5 +16,5 @@ failure = "0.1"
 walrus = "0.11.0"
 wasmparser = "0.36.0"
 wasm-webidl-bindings = "0.4.0"
-wasmtime-jit = { path = '../wasmtime-jit' }
-wasmtime-runtime = { path = '../wasmtime-runtime' }
+wasmtime-jit = { path = '../jit' }
+wasmtime-runtime = { path = '../runtime' }
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 84%
rename from wasmtime-jit/Cargo.toml
rename to crates/jit/Cargo.toml
index 266c5ed6c219..8ba818ec50d6 100644
--- a/wasmtime-jit/Cargo.toml
+++ b/crates/jit/Cargo.toml
@@ -15,9 +15,9 @@ cranelift-codegen = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-entity = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-frontend = "0.40.0"
-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 }
 failure_derive = { version = "0.1.3", default-features = false }
diff --git a/wasmtime-environ/LICENSE b/crates/jit/LICENSE
similarity index 100%
rename from wasmtime-environ/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/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 b/crates/lightbeam
similarity index 100%
rename from lightbeam
rename to crates/lightbeam
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 969ca5474780..26af6a13d2f6 100644
--- a/wasmtime-obj/Cargo.toml
+++ b/crates/obj/Cargo.toml
@@ -14,5 +14,5 @@ edition = "2018"
 cranelift-codegen = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-entity = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.40.0", features = ["enable-serde"] }
-wasmtime-environ = { path = "../wasmtime-environ" }
+wasmtime-environ = { path = "../environ" }
 faerie = "0.10.1"
diff --git a/wasmtime-jit/LICENSE b/crates/obj/LICENSE
similarity index 100%
rename from wasmtime-jit/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 93%
rename from wasmtime-runtime/Cargo.toml
rename to crates/runtime/Cargo.toml
index baa36adfa79b..729424ce4d1c 100644
--- a/wasmtime-runtime/Cargo.toml
+++ b/crates/runtime/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2018"
 cranelift-codegen = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-entity = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.40.0", 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.48", default-features = false }
diff --git a/wasmtime-obj/LICENSE b/crates/runtime/LICENSE
similarity index 100%
rename from wasmtime-obj/LICENSE
rename to crates/runtime/LICENSE
diff --git a/wasmtime-runtime/README.md b/crates/runtime/README.md
similarity index 61%
rename from wasmtime-runtime/README.md
rename to crates/runtime/README.md
index 3e685ad92e3f..e528eb6087e1 100644
--- a/wasmtime-runtime/README.md
+++ b/crates/runtime/README.md
@@ -5,6 +5,6 @@ support, supporting the wasm ABI used by [`wasmtime-environ`],
 This crate does not make a host vs. target distinction; it is meant to be
 compiled for the target.
 
-[`wasmtime-environ`]: https://crates.io/crates/wasmtime-environ
-[`wasmtime-jit`]: https://crates.io/crates/wasmtime-jit
-[`wasmtime-obj`]: https://crates.io/crates/wasmtime-obj
+[`wasmtime-environ`]: https://crates.io/crates/environ
+[`wasmtime-jit`]: https://crates.io/crates/jit
+[`wasmtime-obj`]: https://crates.io/crates/obj
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/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 83%
rename from wasmtime-wasi-c/Cargo.toml
rename to crates/wasi-c/Cargo.toml
index 3b39e038d191..e69f3754ab6f 100644
--- a/wasmtime-wasi-c/Cargo.toml
+++ b/crates/wasi-c/Cargo.toml
@@ -9,9 +9,9 @@ license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 
 [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.40.0", features = ["enable-serde"] }
 cranelift-entity = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.40.0", features = ["enable-serde"] }
diff --git a/wasmtime-runtime/LICENSE b/crates/wasi-c/LICENSE
similarity index 100%
rename from wasmtime-runtime/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/wasmtime-wasi/Cargo.toml b/crates/wasi/Cargo.toml
similarity index 84%
rename from wasmtime-wasi/Cargo.toml
rename to crates/wasi/Cargo.toml
index 9ff5293efdeb..09b4bcf7ade1 100644
--- a/wasmtime-wasi/Cargo.toml
+++ b/crates/wasi/Cargo.toml
@@ -9,9 +9,9 @@ license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 
 [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 = { git = "https://github.com/CraneStation/wasi-common", rev = "8ea7a983d8b1364e5f62d2adf0e74b3b8db1c9b3"}
 cranelift-codegen = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-entity = { version = "0.40.0", features = ["enable-serde"] }
diff --git a/wasmtime-wasi-c/LICENSE b/crates/wasi/LICENSE
similarity index 100%
rename from wasmtime-wasi-c/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 84%
rename from wasmtime-wast/Cargo.toml
rename to crates/wast/Cargo.toml
index 4bcfd4122c66..2cf7787021ce 100644
--- a/wasmtime-wast/Cargo.toml
+++ b/crates/wast/Cargo.toml
@@ -14,9 +14,9 @@ edition = "2018"
 cranelift-codegen = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-entity = { version = "0.40.0", 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" }
 wabt = "0.9.1"
 target-lexicon = "0.4.0"
 failure = { version = "0.1.3", default-features = false }
diff --git a/wasmtime-wasi/LICENSE b/crates/wast/LICENSE
similarity index 100%
rename from wasmtime-wasi/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/docs/WASI-intro.md b/docs/WASI-intro.md
index 97f1cbad44ac..882a33b45456 100644
--- a/docs/WASI-intro.md
+++ b/docs/WASI-intro.md
@@ -80,7 +80,7 @@ or `cargo run --bin wasmtime foo.wasm`.
 
 The polyfill is online [here](https://wasi.dev/polyfill/).
 
-The source is [here](https://github.com/CraneStation/wasmtime/tree/master/wasmtime-wasi/js-polyfill).
+The source is [here](https://github.com/CraneStation/wasmtime/tree/master/crates/wasi/js-polyfill).
 
 ## Where can I learn more?
 
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index d6b8f5be52dd..855c27dbc4a1 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -9,8 +9,8 @@ publish = false
 cargo-fuzz = true
 
 [dependencies]
-wasmtime-environ = { path = "../wasmtime-environ" }
-wasmtime-jit = { path = "../wasmtime-jit" }
+wasmtime-environ = { path = "../crates/environ" }
+wasmtime-jit = { path = "../crates/jit" }
 cranelift-codegen = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.40.0", features = ["enable-serde"] }
 cranelift-native = "0.40.0"
diff --git a/misc/wasmtime-py/.gitignore b/misc/py/.gitignore
similarity index 100%
rename from misc/wasmtime-py/.gitignore
rename to misc/py/.gitignore
diff --git a/misc/wasmtime-py/Cargo.toml b/misc/py/Cargo.toml
similarity index 73%
rename from misc/wasmtime-py/Cargo.toml
rename to misc/py/Cargo.toml
index 3c2d0e2b76f4..a81c34e07760 100644
--- a/misc/wasmtime-py/Cargo.toml
+++ b/misc/py/Cargo.toml
@@ -17,10 +17,10 @@ cranelift-native = "0.40.0"
 cranelift-entity = "0.40.0"
 cranelift-wasm = "0.40.0"
 cranelift-frontend = "0.40.0"
-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 = "../../crates/environ" }
+wasmtime-interface-types = { path = "../../crates/interface-types" }
+wasmtime-jit = { path = "../../crates/jit" }
+wasmtime-runtime = { path = "../../crates/runtime" }
 target-lexicon = { version = "0.4.0", default-features = false }
 failure = "0.1"
 region = "2.0.0"
diff --git a/wasmtime-wast/LICENSE b/misc/py/LICENSE
similarity index 100%
rename from wasmtime-wast/LICENSE
rename to misc/py/LICENSE
diff --git a/misc/wasmtime-py/README.md b/misc/py/README.md
similarity index 100%
rename from misc/wasmtime-py/README.md
rename to misc/py/README.md
diff --git a/misc/wasmtime-py/examples/gcd/.gitignore b/misc/py/examples/gcd/.gitignore
similarity index 100%
rename from misc/wasmtime-py/examples/gcd/.gitignore
rename to misc/py/examples/gcd/.gitignore
diff --git a/misc/wasmtime-py/examples/gcd/README.md b/misc/py/examples/gcd/README.md
similarity index 100%
rename from misc/wasmtime-py/examples/gcd/README.md
rename to misc/py/examples/gcd/README.md
diff --git a/misc/wasmtime-py/examples/gcd/gcd.rs b/misc/py/examples/gcd/gcd.rs
similarity index 100%
rename from misc/wasmtime-py/examples/gcd/gcd.rs
rename to misc/py/examples/gcd/gcd.rs
diff --git a/misc/wasmtime-py/examples/gcd/run.py b/misc/py/examples/gcd/run.py
similarity index 100%
rename from misc/wasmtime-py/examples/gcd/run.py
rename to misc/py/examples/gcd/run.py
diff --git a/misc/wasmtime-py/examples/import/.gitignore b/misc/py/examples/import/.gitignore
similarity index 100%
rename from misc/wasmtime-py/examples/import/.gitignore
rename to misc/py/examples/import/.gitignore
diff --git a/misc/wasmtime-py/examples/import/README.md b/misc/py/examples/import/README.md
similarity index 100%
rename from misc/wasmtime-py/examples/import/README.md
rename to misc/py/examples/import/README.md
diff --git a/misc/wasmtime-py/examples/import/env.py b/misc/py/examples/import/env.py
similarity index 100%
rename from misc/wasmtime-py/examples/import/env.py
rename to misc/py/examples/import/env.py
diff --git a/misc/wasmtime-py/examples/import/main.rs b/misc/py/examples/import/main.rs
similarity index 100%
rename from misc/wasmtime-py/examples/import/main.rs
rename to misc/py/examples/import/main.rs
diff --git a/misc/wasmtime-py/examples/import/run.py b/misc/py/examples/import/run.py
similarity index 100%
rename from misc/wasmtime-py/examples/import/run.py
rename to misc/py/examples/import/run.py
diff --git a/misc/wasmtime-py/examples/two_modules/.gitignore b/misc/py/examples/two_modules/.gitignore
similarity index 100%
rename from misc/wasmtime-py/examples/two_modules/.gitignore
rename to misc/py/examples/two_modules/.gitignore
diff --git a/misc/wasmtime-py/examples/two_modules/README.md b/misc/py/examples/two_modules/README.md
similarity index 100%
rename from misc/wasmtime-py/examples/two_modules/README.md
rename to misc/py/examples/two_modules/README.md
diff --git a/misc/wasmtime-py/examples/two_modules/env.py b/misc/py/examples/two_modules/env.py
similarity index 100%
rename from misc/wasmtime-py/examples/two_modules/env.py
rename to misc/py/examples/two_modules/env.py
diff --git a/misc/wasmtime-py/examples/two_modules/one.rs b/misc/py/examples/two_modules/one.rs
similarity index 100%
rename from misc/wasmtime-py/examples/two_modules/one.rs
rename to misc/py/examples/two_modules/one.rs
diff --git a/misc/wasmtime-py/examples/two_modules/run.py b/misc/py/examples/two_modules/run.py
similarity index 100%
rename from misc/wasmtime-py/examples/two_modules/run.py
rename to misc/py/examples/two_modules/run.py
diff --git a/misc/wasmtime-py/examples/two_modules/two.wat b/misc/py/examples/two_modules/two.wat
similarity index 100%
rename from misc/wasmtime-py/examples/two_modules/two.wat
rename to misc/py/examples/two_modules/two.wat
diff --git a/misc/wasmtime-py/python/wasmtime/__init__.py b/misc/py/python/wasmtime/__init__.py
similarity index 100%
rename from misc/wasmtime-py/python/wasmtime/__init__.py
rename to misc/py/python/wasmtime/__init__.py
diff --git a/misc/wasmtime-py/setup.py b/misc/py/setup.py
similarity index 100%
rename from misc/wasmtime-py/setup.py
rename to misc/py/setup.py
diff --git a/wasmtime-api/src/trampoline/code_memory.rs b/misc/py/src/code_memory.rs
similarity index 100%
rename from wasmtime-api/src/trampoline/code_memory.rs
rename to misc/py/src/code_memory.rs
diff --git a/misc/wasmtime-py/src/function.rs b/misc/py/src/function.rs
similarity index 100%
rename from misc/wasmtime-py/src/function.rs
rename to misc/py/src/function.rs
diff --git a/misc/wasmtime-py/src/import.rs b/misc/py/src/import.rs
similarity index 100%
rename from misc/wasmtime-py/src/import.rs
rename to misc/py/src/import.rs
diff --git a/misc/wasmtime-py/src/instance.rs b/misc/py/src/instance.rs
similarity index 100%
rename from misc/wasmtime-py/src/instance.rs
rename to misc/py/src/instance.rs
diff --git a/misc/wasmtime-py/src/lib.rs b/misc/py/src/lib.rs
similarity index 100%
rename from misc/wasmtime-py/src/lib.rs
rename to misc/py/src/lib.rs
diff --git a/misc/wasmtime-py/src/memory.rs b/misc/py/src/memory.rs
similarity index 100%
rename from misc/wasmtime-py/src/memory.rs
rename to misc/py/src/memory.rs
diff --git a/misc/wasmtime-py/src/module.rs b/misc/py/src/module.rs
similarity index 100%
rename from misc/wasmtime-py/src/module.rs
rename to misc/py/src/module.rs
diff --git a/misc/wasmtime-py/src/value.rs b/misc/py/src/value.rs
similarity index 100%
rename from misc/wasmtime-py/src/value.rs
rename to misc/py/src/value.rs
diff --git a/misc/wasmtime-rust/Cargo.toml b/misc/rust/Cargo.toml
similarity index 77%
rename from misc/wasmtime-rust/Cargo.toml
rename to misc/rust/Cargo.toml
index 91d1865baf73..9fc6beefacb5 100644
--- a/misc/wasmtime-rust/Cargo.toml
+++ b/misc/rust/Cargo.toml
@@ -15,6 +15,6 @@ doctest = false
 cranelift-codegen = "0.40.0"
 cranelift-native = "0.40.0"
 failure = "0.1.5"
-wasmtime-interface-types = { path = "../../wasmtime-interface-types" }
-wasmtime-jit = { path = "../../wasmtime-jit" }
+wasmtime-interface-types = { path = "../../crates/interface-types" }
+wasmtime-jit = { path = "../../crates/jit" }
 wasmtime-rust-macro = { path = "./macro" }
diff --git a/misc/wasmtime-rust/README.md b/misc/rust/README.md
similarity index 100%
rename from misc/wasmtime-rust/README.md
rename to misc/rust/README.md
diff --git a/misc/wasmtime-rust/examples/markdown.rs b/misc/rust/examples/markdown.rs
similarity index 100%
rename from misc/wasmtime-rust/examples/markdown.rs
rename to misc/rust/examples/markdown.rs
diff --git a/misc/wasmtime-rust/macro/Cargo.toml b/misc/rust/macro/Cargo.toml
similarity index 100%
rename from misc/wasmtime-rust/macro/Cargo.toml
rename to misc/rust/macro/Cargo.toml
diff --git a/misc/wasmtime-rust/macro/README.md b/misc/rust/macro/README.md
similarity index 100%
rename from misc/wasmtime-rust/macro/README.md
rename to misc/rust/macro/README.md
diff --git a/misc/wasmtime-rust/macro/src/lib.rs b/misc/rust/macro/src/lib.rs
similarity index 100%
rename from misc/wasmtime-rust/macro/src/lib.rs
rename to misc/rust/macro/src/lib.rs
diff --git a/misc/wasmtime-rust/src/lib.rs b/misc/rust/src/lib.rs
similarity index 100%
rename from misc/wasmtime-rust/src/lib.rs
rename to misc/rust/src/lib.rs