diff --git a/Cargo.toml b/Cargo.toml
index 1a71e18..55505e1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,15 +1,15 @@
 [workspace]
 resolver = "2"
 members = [
-    "./cmd/skate",
     "./cmd/skate-treewalk",
-    "./crates/compiler",
-    "./crates/diagnostics",
-    "./crates/parser",
-    "./crates/rt_common",
-    "./crates/treewalk",
-    "./crates/value",
-    "./crates/vm",
+    "./cmd/skate",
     "./playground",
+    "./skate/compiler",
+    "./skate/diagnostics",
+    "./skate/parser",
+    "./skate/rt_common",
+    "./skate/treewalk",
+    "./skate/value",
+    "./skate/vm",
     "./tests/runner",
 ]
diff --git a/cmd/skate-treewalk/Cargo.toml b/cmd/skate-treewalk/Cargo.toml
index 27f5e79..40fa153 100644
--- a/cmd/skate-treewalk/Cargo.toml
+++ b/cmd/skate-treewalk/Cargo.toml
@@ -9,13 +9,13 @@ repository = "https://github.com/aDotInTheVoid/skate/"
 
 [dependencies]
 codespan-reporting = "0.11.1"
-diagnostics = { path = "../../crates/diagnostics" }
+diagnostics = { path = "../../skate/diagnostics" }
 eyre = "0.6.5"
 fs-err = "2.6.0"
-parser = { path = "../../crates/parser" }
-rt_common = { path = "../../crates/rt_common" }
-treewalk = { path = "../../crates/treewalk" }
-value = { path = "../../crates/value" }
+parser = { path = "../../skate/parser" }
+rt_common = { path = "../../skate/rt_common" }
+treewalk = { path = "../../skate/treewalk" }
+value = { path = "../../skate/value" }
 wasm-bindgen = "0.2.74"
 
 [build-dependencies]
diff --git a/cmd/skate/Cargo.toml b/cmd/skate/Cargo.toml
index 0853903..767393d 100644
--- a/cmd/skate/Cargo.toml
+++ b/cmd/skate/Cargo.toml
@@ -7,12 +7,12 @@ edition = "2018"
 
 [dependencies]
 codespan-reporting = "0.11.1"
-compiler = { path = "../../crates/compiler" }
+compiler = { path = "../../skate/compiler" }
 debug2 = "0.1"
-diagnostics = { path = "../../crates/diagnostics" }
+diagnostics = { path = "../../skate/diagnostics" }
 eyre = "0.6.5"
 fs-err = "2.6.0"
-parser = { path = "../../crates/parser" }
-rt_common = { path = "../../crates/rt_common" }
+parser = { path = "../../skate/parser" }
+rt_common = { path = "../../skate/rt_common" }
 structopt = "0.3.22"
-vm = { path = "../../crates/vm" }
+vm = { path = "../../skate/vm" }
diff --git a/playground/Cargo.toml b/playground/Cargo.toml
index 2c15328..26bba6a 100644
--- a/playground/Cargo.toml
+++ b/playground/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 codespan-reporting = "0.11.1"
 console_error_panic_hook = "0.1.6"
-diagnostics = { path = "../crates/diagnostics" }
+diagnostics = { path = "../skate/diagnostics" }
 skate-treewalk = { path = "../cmd/skate-treewalk" }
 termcolor = "1.1.2"
 wasm-bindgen = "0.2.74"
diff --git a/crates/compiler/Cargo.toml b/skate/compiler/Cargo.toml
similarity index 100%
rename from crates/compiler/Cargo.toml
rename to skate/compiler/Cargo.toml
diff --git a/crates/compiler/src/bytecode.rs b/skate/compiler/src/bytecode.rs
similarity index 100%
rename from crates/compiler/src/bytecode.rs
rename to skate/compiler/src/bytecode.rs
diff --git a/crates/compiler/src/bytecode/debug2_impl.rs b/skate/compiler/src/bytecode/debug2_impl.rs
similarity index 100%
rename from crates/compiler/src/bytecode/debug2_impl.rs
rename to skate/compiler/src/bytecode/debug2_impl.rs
diff --git a/crates/compiler/src/bytecode/debug_impl.rs b/skate/compiler/src/bytecode/debug_impl.rs
similarity index 100%
rename from crates/compiler/src/bytecode/debug_impl.rs
rename to skate/compiler/src/bytecode/debug_impl.rs
diff --git a/crates/compiler/src/lib.rs b/skate/compiler/src/lib.rs
similarity index 100%
rename from crates/compiler/src/lib.rs
rename to skate/compiler/src/lib.rs
diff --git a/crates/compiler/src/utils.rs b/skate/compiler/src/utils.rs
similarity index 100%
rename from crates/compiler/src/utils.rs
rename to skate/compiler/src/utils.rs
diff --git a/crates/diagnostics/Cargo.toml b/skate/diagnostics/Cargo.toml
similarity index 100%
rename from crates/diagnostics/Cargo.toml
rename to skate/diagnostics/Cargo.toml
diff --git a/crates/diagnostics/src/lib.rs b/skate/diagnostics/src/lib.rs
similarity index 100%
rename from crates/diagnostics/src/lib.rs
rename to skate/diagnostics/src/lib.rs
diff --git a/crates/diagnostics/src/span.rs b/skate/diagnostics/src/span.rs
similarity index 100%
rename from crates/diagnostics/src/span.rs
rename to skate/diagnostics/src/span.rs
diff --git a/crates/parser/Cargo.toml b/skate/parser/Cargo.toml
similarity index 100%
rename from crates/parser/Cargo.toml
rename to skate/parser/Cargo.toml
diff --git a/crates/parser/build.rs b/skate/parser/build.rs
similarity index 100%
rename from crates/parser/build.rs
rename to skate/parser/build.rs
diff --git a/crates/parser/src/grammar.lalrpop b/skate/parser/src/grammar.lalrpop
similarity index 100%
rename from crates/parser/src/grammar.lalrpop
rename to skate/parser/src/grammar.lalrpop
diff --git a/crates/parser/src/lib.rs b/skate/parser/src/lib.rs
similarity index 100%
rename from crates/parser/src/lib.rs
rename to skate/parser/src/lib.rs
diff --git a/crates/rt_common/Cargo.toml b/skate/rt_common/Cargo.toml
similarity index 100%
rename from crates/rt_common/Cargo.toml
rename to skate/rt_common/Cargo.toml
diff --git a/crates/rt_common/src/binop.rs b/skate/rt_common/src/binop.rs
similarity index 100%
rename from crates/rt_common/src/binop.rs
rename to skate/rt_common/src/binop.rs
diff --git a/crates/rt_common/src/lib.rs b/skate/rt_common/src/lib.rs
similarity index 100%
rename from crates/rt_common/src/lib.rs
rename to skate/rt_common/src/lib.rs
diff --git a/crates/treewalk/Cargo.toml b/skate/treewalk/Cargo.toml
similarity index 100%
rename from crates/treewalk/Cargo.toml
rename to skate/treewalk/Cargo.toml
diff --git a/crates/treewalk/src/exec.rs b/skate/treewalk/src/exec.rs
similarity index 100%
rename from crates/treewalk/src/exec.rs
rename to skate/treewalk/src/exec.rs
diff --git a/crates/treewalk/src/lib.rs b/skate/treewalk/src/lib.rs
similarity index 100%
rename from crates/treewalk/src/lib.rs
rename to skate/treewalk/src/lib.rs
diff --git a/crates/treewalk/src/lvalue.rs b/skate/treewalk/src/lvalue.rs
similarity index 100%
rename from crates/treewalk/src/lvalue.rs
rename to skate/treewalk/src/lvalue.rs
diff --git a/crates/treewalk/src/scope.rs b/skate/treewalk/src/scope.rs
similarity index 100%
rename from crates/treewalk/src/scope.rs
rename to skate/treewalk/src/scope.rs
diff --git a/crates/treewalk/src/utils.rs b/skate/treewalk/src/utils.rs
similarity index 100%
rename from crates/treewalk/src/utils.rs
rename to skate/treewalk/src/utils.rs
diff --git a/crates/value/Cargo.toml b/skate/value/Cargo.toml
similarity index 100%
rename from crates/value/Cargo.toml
rename to skate/value/Cargo.toml
diff --git a/crates/value/src/lib.rs b/skate/value/src/lib.rs
similarity index 100%
rename from crates/value/src/lib.rs
rename to skate/value/src/lib.rs
diff --git a/crates/vm/Cargo.toml b/skate/vm/Cargo.toml
similarity index 100%
rename from crates/vm/Cargo.toml
rename to skate/vm/Cargo.toml
diff --git a/crates/vm/src/lib.rs b/skate/vm/src/lib.rs
similarity index 100%
rename from crates/vm/src/lib.rs
rename to skate/vm/src/lib.rs
diff --git a/crates/vm/src/tests.rs b/skate/vm/src/tests.rs
similarity index 100%
rename from crates/vm/src/tests.rs
rename to skate/vm/src/tests.rs
diff --git a/crates/vm/src/utils.rs b/skate/vm/src/utils.rs
similarity index 100%
rename from crates/vm/src/utils.rs
rename to skate/vm/src/utils.rs
diff --git a/tests/runner/Cargo.toml b/tests/runner/Cargo.toml
index a9bd8ae..7bf61ba 100644
--- a/tests/runner/Cargo.toml
+++ b/tests/runner/Cargo.toml
@@ -7,12 +7,12 @@ edition = "2018"
 
 [dependencies]
 camino = "1.0.4"
-compiler = { path = "../../crates/compiler" }
-diagnostics = { path = "../../crates/diagnostics" }
+compiler = { path = "../../skate/compiler" }
+diagnostics = { path = "../../skate/diagnostics" }
 eyre = "0.6.5"
 fs-err = "2.6.0"
 glob = "0.3.0"
-parser = { path = "../../crates/parser" }
+parser = { path = "../../skate/parser" }
 structopt = "0.3.22"
 threadpool = "1.8.1"
-vm = { path = "../../crates/vm" }
+vm = { path = "../../skate/vm" }