diff --git a/crates/lang/Cargo.toml b/crates/aiken-lang/Cargo.toml
similarity index 100%
rename from crates/lang/Cargo.toml
rename to crates/aiken-lang/Cargo.toml
diff --git a/crates/lang/src/air.rs b/crates/aiken-lang/src/air.rs
similarity index 100%
rename from crates/lang/src/air.rs
rename to crates/aiken-lang/src/air.rs
diff --git a/crates/lang/src/ast.rs b/crates/aiken-lang/src/ast.rs
similarity index 100%
rename from crates/lang/src/ast.rs
rename to crates/aiken-lang/src/ast.rs
diff --git a/crates/lang/src/builder.rs b/crates/aiken-lang/src/builder.rs
similarity index 100%
rename from crates/lang/src/builder.rs
rename to crates/aiken-lang/src/builder.rs
diff --git a/crates/lang/src/builtins.rs b/crates/aiken-lang/src/builtins.rs
similarity index 100%
rename from crates/lang/src/builtins.rs
rename to crates/aiken-lang/src/builtins.rs
diff --git a/crates/lang/src/expr.rs b/crates/aiken-lang/src/expr.rs
similarity index 100%
rename from crates/lang/src/expr.rs
rename to crates/aiken-lang/src/expr.rs
diff --git a/crates/lang/src/format.rs b/crates/aiken-lang/src/format.rs
similarity index 100%
rename from crates/lang/src/format.rs
rename to crates/aiken-lang/src/format.rs
diff --git a/crates/lang/src/lib.rs b/crates/aiken-lang/src/lib.rs
similarity index 100%
rename from crates/lang/src/lib.rs
rename to crates/aiken-lang/src/lib.rs
diff --git a/crates/lang/src/parser.rs b/crates/aiken-lang/src/parser.rs
similarity index 100%
rename from crates/lang/src/parser.rs
rename to crates/aiken-lang/src/parser.rs
diff --git a/crates/lang/src/parser/error.rs b/crates/aiken-lang/src/parser/error.rs
similarity index 100%
rename from crates/lang/src/parser/error.rs
rename to crates/aiken-lang/src/parser/error.rs
diff --git a/crates/lang/src/parser/extra.rs b/crates/aiken-lang/src/parser/extra.rs
similarity index 100%
rename from crates/lang/src/parser/extra.rs
rename to crates/aiken-lang/src/parser/extra.rs
diff --git a/crates/lang/src/parser/lexer.rs b/crates/aiken-lang/src/parser/lexer.rs
similarity index 100%
rename from crates/lang/src/parser/lexer.rs
rename to crates/aiken-lang/src/parser/lexer.rs
diff --git a/crates/lang/src/parser/token.rs b/crates/aiken-lang/src/parser/token.rs
similarity index 100%
rename from crates/lang/src/parser/token.rs
rename to crates/aiken-lang/src/parser/token.rs
diff --git a/crates/lang/src/pretty.rs b/crates/aiken-lang/src/pretty.rs
similarity index 100%
rename from crates/lang/src/pretty.rs
rename to crates/aiken-lang/src/pretty.rs
diff --git a/crates/lang/src/tests/lexer.rs b/crates/aiken-lang/src/tests/lexer.rs
similarity index 100%
rename from crates/lang/src/tests/lexer.rs
rename to crates/aiken-lang/src/tests/lexer.rs
diff --git a/crates/lang/src/tests/mod.rs b/crates/aiken-lang/src/tests/mod.rs
similarity index 100%
rename from crates/lang/src/tests/mod.rs
rename to crates/aiken-lang/src/tests/mod.rs
diff --git a/crates/lang/src/tests/parser.rs b/crates/aiken-lang/src/tests/parser.rs
similarity index 100%
rename from crates/lang/src/tests/parser.rs
rename to crates/aiken-lang/src/tests/parser.rs
diff --git a/crates/lang/src/tipo.rs b/crates/aiken-lang/src/tipo.rs
similarity index 100%
rename from crates/lang/src/tipo.rs
rename to crates/aiken-lang/src/tipo.rs
diff --git a/crates/lang/src/tipo/environment.rs b/crates/aiken-lang/src/tipo/environment.rs
similarity index 100%
rename from crates/lang/src/tipo/environment.rs
rename to crates/aiken-lang/src/tipo/environment.rs
diff --git a/crates/lang/src/tipo/error.rs b/crates/aiken-lang/src/tipo/error.rs
similarity index 100%
rename from crates/lang/src/tipo/error.rs
rename to crates/aiken-lang/src/tipo/error.rs
diff --git a/crates/lang/src/tipo/expr.rs b/crates/aiken-lang/src/tipo/expr.rs
similarity index 100%
rename from crates/lang/src/tipo/expr.rs
rename to crates/aiken-lang/src/tipo/expr.rs
diff --git a/crates/lang/src/tipo/fields.rs b/crates/aiken-lang/src/tipo/fields.rs
similarity index 100%
rename from crates/lang/src/tipo/fields.rs
rename to crates/aiken-lang/src/tipo/fields.rs
diff --git a/crates/lang/src/tipo/hydrator.rs b/crates/aiken-lang/src/tipo/hydrator.rs
similarity index 100%
rename from crates/lang/src/tipo/hydrator.rs
rename to crates/aiken-lang/src/tipo/hydrator.rs
diff --git a/crates/lang/src/tipo/infer.rs b/crates/aiken-lang/src/tipo/infer.rs
similarity index 100%
rename from crates/lang/src/tipo/infer.rs
rename to crates/aiken-lang/src/tipo/infer.rs
diff --git a/crates/lang/src/tipo/pattern.rs b/crates/aiken-lang/src/tipo/pattern.rs
similarity index 100%
rename from crates/lang/src/tipo/pattern.rs
rename to crates/aiken-lang/src/tipo/pattern.rs
diff --git a/crates/lang/src/tipo/pipe.rs b/crates/aiken-lang/src/tipo/pipe.rs
similarity index 100%
rename from crates/lang/src/tipo/pipe.rs
rename to crates/aiken-lang/src/tipo/pipe.rs
diff --git a/crates/lang/src/tipo/pretty.rs b/crates/aiken-lang/src/tipo/pretty.rs
similarity index 100%
rename from crates/lang/src/tipo/pretty.rs
rename to crates/aiken-lang/src/tipo/pretty.rs
diff --git a/crates/lang/src/uplc.rs b/crates/aiken-lang/src/uplc.rs
similarity index 100%
rename from crates/lang/src/uplc.rs
rename to crates/aiken-lang/src/uplc.rs
diff --git a/crates/lsp/Cargo.toml b/crates/aiken-lsp/Cargo.toml
similarity index 79%
rename from crates/lsp/Cargo.toml
rename to crates/aiken-lsp/Cargo.toml
index 33e83720..86bbf5b0 100644
--- a/crates/lsp/Cargo.toml
+++ b/crates/aiken-lsp/Cargo.toml
@@ -10,8 +10,8 @@ authors = ["Lucas Rosa <x@rvcas.dev>"]
 
 
 [dependencies]
-aiken-lang = { path = '../lang', version = "0.0.26" }
-aiken-project = { path = '../project', version = "0.0.26" }
+aiken-lang = { path = '../aiken-lang', version = "0.0.26" }
+aiken-project = { path = '../aiken-project', version = "0.0.26" }
 crossbeam-channel = "0.5.6"
 lsp-server = "0.6.0"
 lsp-types = "0.93.2"
diff --git a/crates/lsp/src/error.rs b/crates/aiken-lsp/src/error.rs
similarity index 100%
rename from crates/lsp/src/error.rs
rename to crates/aiken-lsp/src/error.rs
diff --git a/crates/lsp/src/lib.rs b/crates/aiken-lsp/src/lib.rs
similarity index 100%
rename from crates/lsp/src/lib.rs
rename to crates/aiken-lsp/src/lib.rs
diff --git a/crates/lsp/src/line_numbers.rs b/crates/aiken-lsp/src/line_numbers.rs
similarity index 100%
rename from crates/lsp/src/line_numbers.rs
rename to crates/aiken-lsp/src/line_numbers.rs
diff --git a/crates/lsp/src/server.rs b/crates/aiken-lsp/src/server.rs
similarity index 100%
rename from crates/lsp/src/server.rs
rename to crates/aiken-lsp/src/server.rs
diff --git a/crates/project/Cargo.toml b/crates/aiken-project/Cargo.toml
similarity index 94%
rename from crates/project/Cargo.toml
rename to crates/aiken-project/Cargo.toml
index 03bcba85..8968b841 100644
--- a/crates/project/Cargo.toml
+++ b/crates/aiken-project/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
 authors = ["Lucas Rosa <x@rvcas.dev>", "Kasey White <kwhitemsg@gmail.com>"]
 
 [dependencies]
-aiken-lang = { path = "../lang", version = "0.0.26" }
+aiken-lang = { path = "../aiken-lang", version = "0.0.26" }
 askama = "0.10.5"
 dirs = "4.0.0"
 fslock = "0.2.1"
diff --git a/crates/project/README.md b/crates/aiken-project/README.md
similarity index 100%
rename from crates/project/README.md
rename to crates/aiken-project/README.md
diff --git a/crates/project/src/config.rs b/crates/aiken-project/src/config.rs
similarity index 100%
rename from crates/project/src/config.rs
rename to crates/aiken-project/src/config.rs
diff --git a/crates/project/src/deps.rs b/crates/aiken-project/src/deps.rs
similarity index 100%
rename from crates/project/src/deps.rs
rename to crates/aiken-project/src/deps.rs
diff --git a/crates/project/src/deps/downloader.rs b/crates/aiken-project/src/deps/downloader.rs
similarity index 100%
rename from crates/project/src/deps/downloader.rs
rename to crates/aiken-project/src/deps/downloader.rs
diff --git a/crates/project/src/deps/manifest.rs b/crates/aiken-project/src/deps/manifest.rs
similarity index 100%
rename from crates/project/src/deps/manifest.rs
rename to crates/aiken-project/src/deps/manifest.rs
diff --git a/crates/project/src/docs.rs b/crates/aiken-project/src/docs.rs
similarity index 100%
rename from crates/project/src/docs.rs
rename to crates/aiken-project/src/docs.rs
diff --git a/crates/project/src/error.rs b/crates/aiken-project/src/error.rs
similarity index 100%
rename from crates/project/src/error.rs
rename to crates/aiken-project/src/error.rs
diff --git a/crates/project/src/format.rs b/crates/aiken-project/src/format.rs
similarity index 100%
rename from crates/project/src/format.rs
rename to crates/aiken-project/src/format.rs
diff --git a/crates/project/src/lib.rs b/crates/aiken-project/src/lib.rs
similarity index 100%
rename from crates/project/src/lib.rs
rename to crates/aiken-project/src/lib.rs
diff --git a/crates/project/src/module.rs b/crates/aiken-project/src/module.rs
similarity index 100%
rename from crates/project/src/module.rs
rename to crates/aiken-project/src/module.rs
diff --git a/crates/project/src/options.rs b/crates/aiken-project/src/options.rs
similarity index 100%
rename from crates/project/src/options.rs
rename to crates/aiken-project/src/options.rs
diff --git a/crates/project/src/paths.rs b/crates/aiken-project/src/paths.rs
similarity index 100%
rename from crates/project/src/paths.rs
rename to crates/aiken-project/src/paths.rs
diff --git a/crates/project/src/pretty.rs b/crates/aiken-project/src/pretty.rs
similarity index 100%
rename from crates/project/src/pretty.rs
rename to crates/aiken-project/src/pretty.rs
diff --git a/crates/project/src/script.rs b/crates/aiken-project/src/script.rs
similarity index 100%
rename from crates/project/src/script.rs
rename to crates/aiken-project/src/script.rs
diff --git a/crates/project/src/telemetry.rs b/crates/aiken-project/src/telemetry.rs
similarity index 100%
rename from crates/project/src/telemetry.rs
rename to crates/aiken-project/src/telemetry.rs
diff --git a/crates/project/templates/_layout.html b/crates/aiken-project/templates/_layout.html
similarity index 100%
rename from crates/project/templates/_layout.html
rename to crates/aiken-project/templates/_layout.html
diff --git a/crates/project/templates/css/atom-one-dark.min.css b/crates/aiken-project/templates/css/atom-one-dark.min.css
similarity index 100%
rename from crates/project/templates/css/atom-one-dark.min.css
rename to crates/aiken-project/templates/css/atom-one-dark.min.css
diff --git a/crates/project/templates/css/atom-one-light.min.css b/crates/aiken-project/templates/css/atom-one-light.min.css
similarity index 100%
rename from crates/project/templates/css/atom-one-light.min.css
rename to crates/aiken-project/templates/css/atom-one-light.min.css
diff --git a/crates/project/templates/css/index.css b/crates/aiken-project/templates/css/index.css
similarity index 100%
rename from crates/project/templates/css/index.css
rename to crates/aiken-project/templates/css/index.css
diff --git a/crates/project/templates/favicon.svg b/crates/aiken-project/templates/favicon.svg
similarity index 100%
rename from crates/project/templates/favicon.svg
rename to crates/aiken-project/templates/favicon.svg
diff --git a/crates/project/templates/js/highlight.min.js b/crates/aiken-project/templates/js/highlight.min.js
similarity index 100%
rename from crates/project/templates/js/highlight.min.js
rename to crates/aiken-project/templates/js/highlight.min.js
diff --git a/crates/project/templates/js/highlightjs-aiken.js b/crates/aiken-project/templates/js/highlightjs-aiken.js
similarity index 100%
rename from crates/project/templates/js/highlightjs-aiken.js
rename to crates/aiken-project/templates/js/highlightjs-aiken.js
diff --git a/crates/project/templates/js/index.js b/crates/aiken-project/templates/js/index.js
similarity index 100%
rename from crates/project/templates/js/index.js
rename to crates/aiken-project/templates/js/index.js
diff --git a/crates/project/templates/js/lunr.min.js b/crates/aiken-project/templates/js/lunr.min.js
similarity index 100%
rename from crates/project/templates/js/lunr.min.js
rename to crates/aiken-project/templates/js/lunr.min.js
diff --git a/crates/project/templates/module.html b/crates/aiken-project/templates/module.html
similarity index 100%
rename from crates/project/templates/module.html
rename to crates/aiken-project/templates/module.html
diff --git a/crates/project/templates/page.html b/crates/aiken-project/templates/page.html
similarity index 100%
rename from crates/project/templates/page.html
rename to crates/aiken-project/templates/page.html
diff --git a/crates/cli/Cargo.toml b/crates/aiken/Cargo.toml
similarity index 80%
rename from crates/cli/Cargo.toml
rename to crates/aiken/Cargo.toml
index 139bdc56..59107a24 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/aiken/Cargo.toml
@@ -24,7 +24,7 @@ pallas-traverse = "0.14.0"
 regex = "1.5.4"
 thiserror = "1.0.31"
 
-aiken-lang = { path = "../lang", version = "0.0.26" }
-aiken-lsp = { path = "../lsp", version = "0.0.26" }
-aiken-project = { path = '../project', version = "0.0.26" }
+aiken-lang = { path = "../aiken-lang", version = "0.0.26" }
+aiken-lsp = { path = "../aiken-lsp", version = "0.0.26" }
+aiken-project = { path = '../aiken-project', version = "0.0.26" }
 uplc = { path = '../uplc', version = "0.0.25" }
diff --git a/crates/cli/README.md b/crates/aiken/README.md
similarity index 100%
rename from crates/cli/README.md
rename to crates/aiken/README.md
diff --git a/crates/cli/src/cmd/build.rs b/crates/aiken/src/cmd/build.rs
similarity index 100%
rename from crates/cli/src/cmd/build.rs
rename to crates/aiken/src/cmd/build.rs
diff --git a/crates/cli/src/cmd/check.rs b/crates/aiken/src/cmd/check.rs
similarity index 100%
rename from crates/cli/src/cmd/check.rs
rename to crates/aiken/src/cmd/check.rs
diff --git a/crates/cli/src/cmd/docs.rs b/crates/aiken/src/cmd/docs.rs
similarity index 100%
rename from crates/cli/src/cmd/docs.rs
rename to crates/aiken/src/cmd/docs.rs
diff --git a/crates/cli/src/cmd/error.rs b/crates/aiken/src/cmd/error.rs
similarity index 100%
rename from crates/cli/src/cmd/error.rs
rename to crates/aiken/src/cmd/error.rs
diff --git a/crates/cli/src/cmd/fmt.rs b/crates/aiken/src/cmd/fmt.rs
similarity index 100%
rename from crates/cli/src/cmd/fmt.rs
rename to crates/aiken/src/cmd/fmt.rs
diff --git a/crates/cli/src/cmd/lsp.rs b/crates/aiken/src/cmd/lsp.rs
similarity index 100%
rename from crates/cli/src/cmd/lsp.rs
rename to crates/aiken/src/cmd/lsp.rs
diff --git a/crates/cli/src/cmd/mod.rs b/crates/aiken/src/cmd/mod.rs
similarity index 100%
rename from crates/cli/src/cmd/mod.rs
rename to crates/aiken/src/cmd/mod.rs
diff --git a/crates/cli/src/cmd/new.rs b/crates/aiken/src/cmd/new.rs
similarity index 100%
rename from crates/cli/src/cmd/new.rs
rename to crates/aiken/src/cmd/new.rs
diff --git a/crates/cli/src/cmd/tx/mod.rs b/crates/aiken/src/cmd/tx/mod.rs
similarity index 100%
rename from crates/cli/src/cmd/tx/mod.rs
rename to crates/aiken/src/cmd/tx/mod.rs
diff --git a/crates/cli/src/cmd/tx/simulate.rs b/crates/aiken/src/cmd/tx/simulate.rs
similarity index 100%
rename from crates/cli/src/cmd/tx/simulate.rs
rename to crates/aiken/src/cmd/tx/simulate.rs
diff --git a/crates/cli/src/cmd/uplc/eval.rs b/crates/aiken/src/cmd/uplc/eval.rs
similarity index 100%
rename from crates/cli/src/cmd/uplc/eval.rs
rename to crates/aiken/src/cmd/uplc/eval.rs
diff --git a/crates/cli/src/cmd/uplc/flat.rs b/crates/aiken/src/cmd/uplc/flat.rs
similarity index 100%
rename from crates/cli/src/cmd/uplc/flat.rs
rename to crates/aiken/src/cmd/uplc/flat.rs
diff --git a/crates/cli/src/cmd/uplc/fmt.rs b/crates/aiken/src/cmd/uplc/fmt.rs
similarity index 100%
rename from crates/cli/src/cmd/uplc/fmt.rs
rename to crates/aiken/src/cmd/uplc/fmt.rs
diff --git a/crates/cli/src/cmd/uplc/mod.rs b/crates/aiken/src/cmd/uplc/mod.rs
similarity index 100%
rename from crates/cli/src/cmd/uplc/mod.rs
rename to crates/aiken/src/cmd/uplc/mod.rs
diff --git a/crates/cli/src/cmd/uplc/unflat.rs b/crates/aiken/src/cmd/uplc/unflat.rs
similarity index 100%
rename from crates/cli/src/cmd/uplc/unflat.rs
rename to crates/aiken/src/cmd/uplc/unflat.rs
diff --git a/crates/cli/src/lib.rs b/crates/aiken/src/lib.rs
similarity index 100%
rename from crates/cli/src/lib.rs
rename to crates/aiken/src/lib.rs
diff --git a/crates/cli/src/main.rs b/crates/aiken/src/main.rs
similarity index 100%
rename from crates/cli/src/main.rs
rename to crates/aiken/src/main.rs
diff --git a/crates/flat/Cargo.toml b/crates/flat-rs/Cargo.toml
similarity index 100%
rename from crates/flat/Cargo.toml
rename to crates/flat-rs/Cargo.toml
diff --git a/crates/flat/README.md b/crates/flat-rs/README.md
similarity index 100%
rename from crates/flat/README.md
rename to crates/flat-rs/README.md
diff --git a/crates/flat/src/decode.rs b/crates/flat-rs/src/decode.rs
similarity index 100%
rename from crates/flat/src/decode.rs
rename to crates/flat-rs/src/decode.rs
diff --git a/crates/flat/src/decode/decoder.rs b/crates/flat-rs/src/decode/decoder.rs
similarity index 100%
rename from crates/flat/src/decode/decoder.rs
rename to crates/flat-rs/src/decode/decoder.rs
diff --git a/crates/flat/src/decode/error.rs b/crates/flat-rs/src/decode/error.rs
similarity index 100%
rename from crates/flat/src/decode/error.rs
rename to crates/flat-rs/src/decode/error.rs
diff --git a/crates/flat/src/encode.rs b/crates/flat-rs/src/encode.rs
similarity index 100%
rename from crates/flat/src/encode.rs
rename to crates/flat-rs/src/encode.rs
diff --git a/crates/flat/src/encode/encoder.rs b/crates/flat-rs/src/encode/encoder.rs
similarity index 100%
rename from crates/flat/src/encode/encoder.rs
rename to crates/flat-rs/src/encode/encoder.rs
diff --git a/crates/flat/src/encode/error.rs b/crates/flat-rs/src/encode/error.rs
similarity index 100%
rename from crates/flat/src/encode/error.rs
rename to crates/flat-rs/src/encode/error.rs
diff --git a/crates/flat/src/filler.rs b/crates/flat-rs/src/filler.rs
similarity index 100%
rename from crates/flat/src/filler.rs
rename to crates/flat-rs/src/filler.rs
diff --git a/crates/flat/src/lib.rs b/crates/flat-rs/src/lib.rs
similarity index 100%
rename from crates/flat/src/lib.rs
rename to crates/flat-rs/src/lib.rs
diff --git a/crates/flat/src/zigzag.rs b/crates/flat-rs/src/zigzag.rs
similarity index 100%
rename from crates/flat/src/zigzag.rs
rename to crates/flat-rs/src/zigzag.rs
diff --git a/crates/flat/tests/flat_test.rs b/crates/flat-rs/tests/flat_test.rs
similarity index 100%
rename from crates/flat/tests/flat_test.rs
rename to crates/flat-rs/tests/flat_test.rs
diff --git a/crates/flat/tests/zigzag_test.rs b/crates/flat-rs/tests/zigzag_test.rs
similarity index 100%
rename from crates/flat/tests/zigzag_test.rs
rename to crates/flat-rs/tests/zigzag_test.rs
diff --git a/crates/uplc/Cargo.toml b/crates/uplc/Cargo.toml
index 058d6c61..cc65fed0 100644
--- a/crates/uplc/Cargo.toml
+++ b/crates/uplc/Cargo.toml
@@ -14,7 +14,7 @@ exclude = ["test_data/*"]
 
 [dependencies]
 cryptoxide = "0.4.2"
-flat-rs = { path = "../flat", version = "0.0.21" }
+flat-rs = { path = "../flat-rs", version = "0.0.21" }
 hex = "0.4.3"
 pallas-addresses = "0.14.0"
 pallas-codec = "0.14.0"