diff --git a/Cargo.toml b/Cargo.toml
index d3bcfc88f19..c53acbb86a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -122,7 +122,6 @@ template = "installer-config/installer.wxs"
 resolver = "2"
 members = [
     "compiler",
-    "compiler/codegen",
     ".",
     "derive",
     "jit",
@@ -145,7 +144,7 @@ license = "MIT"
 [workspace.dependencies]
 rustpython-compiler-core = { path = "crates/compiler-core", version = "0.4.0" }
 rustpython-compiler = { path = "compiler", version = "0.4.0" }
-rustpython-codegen = { path = "compiler/codegen", version = "0.4.0" }
+rustpython-codegen = { path = "crates/codegen", 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" }
diff --git a/compiler/codegen/Cargo.toml b/crates/codegen/Cargo.toml
similarity index 100%
rename from compiler/codegen/Cargo.toml
rename to crates/codegen/Cargo.toml
diff --git a/compiler/codegen/src/compile.rs b/crates/codegen/src/compile.rs
similarity index 100%
rename from compiler/codegen/src/compile.rs
rename to crates/codegen/src/compile.rs
diff --git a/compiler/codegen/src/error.rs b/crates/codegen/src/error.rs
similarity index 100%
rename from compiler/codegen/src/error.rs
rename to crates/codegen/src/error.rs
diff --git a/compiler/codegen/src/ir.rs b/crates/codegen/src/ir.rs
similarity index 100%
rename from compiler/codegen/src/ir.rs
rename to crates/codegen/src/ir.rs
diff --git a/compiler/codegen/src/lib.rs b/crates/codegen/src/lib.rs
similarity index 100%
rename from compiler/codegen/src/lib.rs
rename to crates/codegen/src/lib.rs
diff --git a/compiler/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ands.snap b/crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ands.snap
similarity index 100%
rename from compiler/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ands.snap
rename to crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ands.snap
diff --git a/compiler/codegen/src/snapshots/rustpython_codegen__compile__tests__if_mixed.snap b/crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_mixed.snap
similarity index 100%
rename from compiler/codegen/src/snapshots/rustpython_codegen__compile__tests__if_mixed.snap
rename to crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_mixed.snap
diff --git a/compiler/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ors.snap b/crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ors.snap
similarity index 100%
rename from compiler/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ors.snap
rename to crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ors.snap
diff --git a/compiler/codegen/src/snapshots/rustpython_codegen__compile__tests__nested_double_async_with.snap b/crates/codegen/src/snapshots/rustpython_codegen__compile__tests__nested_double_async_with.snap
similarity index 100%
rename from compiler/codegen/src/snapshots/rustpython_codegen__compile__tests__nested_double_async_with.snap
rename to crates/codegen/src/snapshots/rustpython_codegen__compile__tests__nested_double_async_with.snap
diff --git a/compiler/codegen/src/snapshots/rustpython_compiler_core__compile__tests__if_ands.snap b/crates/codegen/src/snapshots/rustpython_compiler_core__compile__tests__if_ands.snap
similarity index 100%
rename from compiler/codegen/src/snapshots/rustpython_compiler_core__compile__tests__if_ands.snap
rename to crates/codegen/src/snapshots/rustpython_compiler_core__compile__tests__if_ands.snap
diff --git a/compiler/codegen/src/snapshots/rustpython_compiler_core__compile__tests__if_mixed.snap b/crates/codegen/src/snapshots/rustpython_compiler_core__compile__tests__if_mixed.snap
similarity index 100%
rename from compiler/codegen/src/snapshots/rustpython_compiler_core__compile__tests__if_mixed.snap
rename to crates/codegen/src/snapshots/rustpython_compiler_core__compile__tests__if_mixed.snap
diff --git a/compiler/codegen/src/snapshots/rustpython_compiler_core__compile__tests__if_ors.snap b/crates/codegen/src/snapshots/rustpython_compiler_core__compile__tests__if_ors.snap
similarity index 100%
rename from compiler/codegen/src/snapshots/rustpython_compiler_core__compile__tests__if_ors.snap
rename to crates/codegen/src/snapshots/rustpython_compiler_core__compile__tests__if_ors.snap
diff --git a/compiler/codegen/src/snapshots/rustpython_compiler_core__compile__tests__nested_double_async_with.snap b/crates/codegen/src/snapshots/rustpython_compiler_core__compile__tests__nested_double_async_with.snap
similarity index 100%
rename from compiler/codegen/src/snapshots/rustpython_compiler_core__compile__tests__nested_double_async_with.snap
rename to crates/codegen/src/snapshots/rustpython_compiler_core__compile__tests__nested_double_async_with.snap
diff --git a/compiler/codegen/src/string_parser.rs b/crates/codegen/src/string_parser.rs
similarity index 100%
rename from compiler/codegen/src/string_parser.rs
rename to crates/codegen/src/string_parser.rs
diff --git a/compiler/codegen/src/symboltable.rs b/crates/codegen/src/symboltable.rs
similarity index 100%
rename from compiler/codegen/src/symboltable.rs
rename to crates/codegen/src/symboltable.rs
diff --git a/compiler/codegen/src/unparse.rs b/crates/codegen/src/unparse.rs
similarity index 100%
rename from compiler/codegen/src/unparse.rs
rename to crates/codegen/src/unparse.rs