diff --git a/Cargo.toml b/Cargo.toml
index b01734ae7ae..9a484ee0b1e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -126,7 +126,6 @@ members = [
     "compiler/codegen",
     "compiler/literal",
     ".",
-    "common",
     "derive",
     "jit",
     "vm",
@@ -151,7 +150,7 @@ license = "MIT"
 rustpython-compiler-core = { path = "compiler/core", version = "0.4.0" }
 rustpython-compiler = { path = "compiler", version = "0.4.0" }
 rustpython-codegen = { path = "compiler/codegen", version = "0.4.0" }
-rustpython-common = { path = "common", version = "0.4.0" }
+rustpython-common = { path = "crates/common", version = "0.4.0" }
 rustpython-derive = { path = "derive", version = "0.4.0" }
 rustpython-derive-impl = { path = "derive-impl", version = "0.4.0" }
 rustpython-jit = { path = "jit", version = "0.4.0" }
diff --git a/common/Cargo.toml b/crates/common/Cargo.toml
similarity index 100%
rename from common/Cargo.toml
rename to crates/common/Cargo.toml
diff --git a/common/src/atomic.rs b/crates/common/src/atomic.rs
similarity index 100%
rename from common/src/atomic.rs
rename to crates/common/src/atomic.rs
diff --git a/common/src/borrow.rs b/crates/common/src/borrow.rs
similarity index 100%
rename from common/src/borrow.rs
rename to crates/common/src/borrow.rs
diff --git a/common/src/boxvec.rs b/crates/common/src/boxvec.rs
similarity index 100%
rename from common/src/boxvec.rs
rename to crates/common/src/boxvec.rs
diff --git a/common/src/cformat.rs b/crates/common/src/cformat.rs
similarity index 100%
rename from common/src/cformat.rs
rename to crates/common/src/cformat.rs
diff --git a/common/src/crt_fd.rs b/crates/common/src/crt_fd.rs
similarity index 100%
rename from common/src/crt_fd.rs
rename to crates/common/src/crt_fd.rs
diff --git a/common/src/encodings.rs b/crates/common/src/encodings.rs
similarity index 100%
rename from common/src/encodings.rs
rename to crates/common/src/encodings.rs
diff --git a/common/src/fileutils.rs b/crates/common/src/fileutils.rs
similarity index 100%
rename from common/src/fileutils.rs
rename to crates/common/src/fileutils.rs
diff --git a/common/src/float_ops.rs b/crates/common/src/float_ops.rs
similarity index 100%
rename from common/src/float_ops.rs
rename to crates/common/src/float_ops.rs
diff --git a/common/src/format.rs b/crates/common/src/format.rs
similarity index 100%
rename from common/src/format.rs
rename to crates/common/src/format.rs
diff --git a/common/src/hash.rs b/crates/common/src/hash.rs
similarity index 100%
rename from common/src/hash.rs
rename to crates/common/src/hash.rs
diff --git a/common/src/int.rs b/crates/common/src/int.rs
similarity index 100%
rename from common/src/int.rs
rename to crates/common/src/int.rs
diff --git a/common/src/lib.rs b/crates/common/src/lib.rs
similarity index 100%
rename from common/src/lib.rs
rename to crates/common/src/lib.rs
diff --git a/common/src/linked_list.rs b/crates/common/src/linked_list.rs
similarity index 100%
rename from common/src/linked_list.rs
rename to crates/common/src/linked_list.rs
diff --git a/common/src/lock.rs b/crates/common/src/lock.rs
similarity index 100%
rename from common/src/lock.rs
rename to crates/common/src/lock.rs
diff --git a/common/src/lock/cell_lock.rs b/crates/common/src/lock/cell_lock.rs
similarity index 100%
rename from common/src/lock/cell_lock.rs
rename to crates/common/src/lock/cell_lock.rs
diff --git a/common/src/lock/immutable_mutex.rs b/crates/common/src/lock/immutable_mutex.rs
similarity index 100%
rename from common/src/lock/immutable_mutex.rs
rename to crates/common/src/lock/immutable_mutex.rs
diff --git a/common/src/lock/thread_mutex.rs b/crates/common/src/lock/thread_mutex.rs
similarity index 100%
rename from common/src/lock/thread_mutex.rs
rename to crates/common/src/lock/thread_mutex.rs
diff --git a/common/src/macros.rs b/crates/common/src/macros.rs
similarity index 100%
rename from common/src/macros.rs
rename to crates/common/src/macros.rs
diff --git a/common/src/os.rs b/crates/common/src/os.rs
similarity index 100%
rename from common/src/os.rs
rename to crates/common/src/os.rs
diff --git a/common/src/rand.rs b/crates/common/src/rand.rs
similarity index 100%
rename from common/src/rand.rs
rename to crates/common/src/rand.rs
diff --git a/common/src/rc.rs b/crates/common/src/rc.rs
similarity index 100%
rename from common/src/rc.rs
rename to crates/common/src/rc.rs
diff --git a/common/src/refcount.rs b/crates/common/src/refcount.rs
similarity index 100%
rename from common/src/refcount.rs
rename to crates/common/src/refcount.rs
diff --git a/common/src/static_cell.rs b/crates/common/src/static_cell.rs
similarity index 100%
rename from common/src/static_cell.rs
rename to crates/common/src/static_cell.rs
diff --git a/common/src/str.rs b/crates/common/src/str.rs
similarity index 100%
rename from common/src/str.rs
rename to crates/common/src/str.rs
diff --git a/common/src/windows.rs b/crates/common/src/windows.rs
similarity index 100%
rename from common/src/windows.rs
rename to crates/common/src/windows.rs