diff --git a/Cargo.lock b/Cargo.lock
index 9366642865089914ba331c8647ed52b2155c9f0c..08154d1244fb7c098006038f13860c855d45cd13 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,24 +11,62 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "allocator-api2"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
-
 [[package]]
 name = "anes"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
+[[package]]
+name = "anstream"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
 [[package]]
 name = "anstyle"
 version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+dependencies = [
+ "anstyle",
+ "once_cell",
+ "windows-sys",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.98"
@@ -124,6 +162,7 @@ version = "4.5.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5"
 dependencies = [
+ "anstream",
  "anstyle",
  "clap_lex",
  "strsim",
@@ -157,16 +196,6 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
-[[package]]
-name = "clap_mangen"
-version = "0.2.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "724842fa9b144f9b89b3f3d371a89f3455eea660361d13a554f68f8ae5d6c13a"
-dependencies = [
- "clap",
- "roff",
-]
-
 [[package]]
 name = "codespan"
 version = "0.12.0"
@@ -188,6 +217,12 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
 [[package]]
 name = "console"
 version = "0.15.11"
@@ -327,10 +362,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "foldhash"
-version = "0.1.5"
+name = "gdextension-api"
+version = "0.2.2"
+source = "git+https://github.com/godot-rust/godot4-prebuilt?branch=releases#09432b4c2c16f044f0296f96512661ea106003ff"
+
+[[package]]
+name = "glam"
+version = "0.30.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+checksum = "d0e9b6647e9b41d3a5ef02964c6be01311a7f2472fea40595c635c6d046c259e"
 
 [[package]]
 name = "globset"
@@ -346,43 +386,100 @@ dependencies = [
 ]
 
 [[package]]
-name = "grimoire_engine"
-version = "0.1.0"
+name = "godot"
+version = "0.2.4"
+source = "git+https://github.com/godot-rust/gdext.git#f883763b265317b7f3a6063edeb98ed26bf8ea55"
 dependencies = [
- "grimoire_engine_types",
- "log",
- "serde",
- "toml",
+ "godot-core",
+ "godot-macros",
 ]
 
 [[package]]
-name = "grimoire_engine_types"
-version = "0.1.0"
+name = "godot-bindings"
+version = "0.2.4"
+source = "git+https://github.com/godot-rust/gdext.git#f883763b265317b7f3a6063edeb98ed26bf8ea55"
 dependencies = [
- "bytecount",
- "cfg-if",
- "derive_more",
- "hashbrown",
- "log",
- "paste",
- "serde",
- "thiserror",
+ "gdextension-api",
 ]
 
 [[package]]
-name = "grimoire_parser"
-version = "0.1.0"
+name = "godot-cell"
+version = "0.2.4"
+source = "git+https://github.com/godot-rust/gdext.git#f883763b265317b7f3a6063edeb98ed26bf8ea55"
+
+[[package]]
+name = "godot-codegen"
+version = "0.2.4"
+source = "git+https://github.com/godot-rust/gdext.git#f883763b265317b7f3a6063edeb98ed26bf8ea55"
+dependencies = [
+ "godot-bindings",
+ "heck",
+ "nanoserde",
+ "proc-macro2",
+ "quote",
+ "regex",
+]
+
+[[package]]
+name = "godot-core"
+version = "0.2.4"
+source = "git+https://github.com/godot-rust/gdext.git#f883763b265317b7f3a6063edeb98ed26bf8ea55"
+dependencies = [
+ "glam",
+ "godot-bindings",
+ "godot-cell",
+ "godot-codegen",
+ "godot-ffi",
+]
+
+[[package]]
+name = "godot-ffi"
+version = "0.2.4"
+source = "git+https://github.com/godot-rust/gdext.git#f883763b265317b7f3a6063edeb98ed26bf8ea55"
+dependencies = [
+ "godot-bindings",
+ "godot-codegen",
+ "godot-macros",
+ "libc",
+]
+
+[[package]]
+name = "godot-macros"
+version = "0.2.4"
+source = "git+https://github.com/godot-rust/gdext.git#f883763b265317b7f3a6063edeb98ed26bf8ea55"
+dependencies = [
+ "godot-bindings",
+ "libc",
+ "litrs",
+ "markdown",
+ "proc-macro2",
+ "quote",
+ "venial",
+]
+
+[[package]]
+name = "grimoire"
+version = "0.0.1"
 dependencies = [
  "anyhow",
+ "clap",
+ "clap_complete",
+ "godot",
+ "grimoire-parser",
+ "thiserror",
+]
+
+[[package]]
+name = "grimoire-parser"
+version = "0.0.1"
+dependencies = [
  "bytecount",
  "cfg-if",
  "codespan",
  "codespan-reporting",
  "criterion",
  "derive_more",
- "grimoire_engine_types",
- "grimoire_parser_derive",
- "hashbrown",
+ "grimoire-parser-derive",
  "insta",
  "log",
  "paste",
@@ -391,8 +488,8 @@ dependencies = [
 ]
 
 [[package]]
-name = "grimoire_parser_derive"
-version = "0.1.0"
+name = "grimoire-parser-derive"
+version = "0.0.1"
 dependencies = [
  "indexmap",
  "proc-macro2",
@@ -400,22 +497,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "grimoire_runner"
-version = "0.1.0"
-dependencies = [
- "clap",
- "clap_complete",
- "clap_mangen",
- "grimoire_engine",
- "grimoire_engine_types",
- "grimoire_parser",
- "log",
- "serde",
- "thiserror",
- "toml",
-]
-
 [[package]]
 name = "half"
 version = "2.6.0"
@@ -431,11 +512,6 @@ name = "hashbrown"
 version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
-dependencies = [
- "allocator-api2",
- "equivalent",
- "foldhash",
-]
 
 [[package]]
 name = "heck"
@@ -486,6 +562,12 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -529,18 +611,51 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
+[[package]]
+name = "litrs"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
+dependencies = [
+ "proc-macro2",
+]
+
 [[package]]
 name = "log"
 version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
+[[package]]
+name = "markdown"
+version = "1.0.0-alpha.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9047e0a37a596d4e15411a1ffbdabe71c328908cb90a721cb9bf8dcf3434e6d2"
+dependencies = [
+ "unicode-id",
+]
+
 [[package]]
 name = "memchr"
 version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
+[[package]]
+name = "nanoserde"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a36fb3a748a4c9736ed7aeb5f2dfc99665247f1ce306abbddb2bf0ba2ac530a4"
+dependencies = [
+ "nanoserde-derive",
+]
+
+[[package]]
+name = "nanoserde-derive"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a846cbc04412cf509efcd8f3694b114fc700a035fb5a37f21517f9fb019f1ebc"
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -683,12 +798,6 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
-[[package]]
-name = "roff"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3"
-
 [[package]]
 name = "rustix"
 version = "1.0.5"
@@ -755,15 +864,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_spanned"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "similar"
 version = "2.7.0"
@@ -848,38 +948,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "toml"
-version = "0.8.20"
+name = "unicode-id"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
+checksum = "10103c57044730945224467c09f71a4db0071c123a0648cc3e818913bde6b561"
 
 [[package]]
 name = "unicode-ident"
@@ -905,6 +977,22 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "venial"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a42528baceab6c7784446df2a10f4185078c39bf73dc614f154353f1a6b1229"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
 [[package]]
 name = "walkdir"
 version = "2.5.0"
@@ -1064,12 +1152,3 @@ name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "winnow"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10"
-dependencies = [
- "memchr",
-]
diff --git a/Cargo.toml b/Cargo.toml
index 30424a8c482b1da4a8521c2198ed27a70dcbb00b..672f5befa9b3ce57f822da88e0dba257b4c4c986 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,19 +1,40 @@
 [workspace]
 resolver = "2"
-members = ["grimoire_*"]
+members = ["grimoire-*"]
+package = { version = "0.0.1", license = "MIT", rust-version = "1.86", edition = "2024", authors = [
+    "Maëlle Martin <maelle.martin@proton.me>",
+] }
 
 
-[workspace.package]
-version      = "0.1.0"
-description  = "The Grimoire Engine, a VN engine done for fun"
-edition      = "2024"
-license      = "MIT"
-rust-version = "1.86"
+[package]
+name        = "grimoire"
+description = "The Grimoire Engine, a VN engine done for fun"
 
+version.workspace      = true
+edition.workspace      = true
+license.workspace      = true
+authors.workspace      = true
+rust-version.workspace = true
 
-authors = [
-    "Maëlle Martin <maelle.martin@proton.me>",
-]
+
+[[bin]]
+name = "grimoire-check"
+path = "bin/check.rs"
+
+
+[lib]
+crate-type = ["cdylib", "lib"]
+
+
+[dependencies]
+grimoire-parser.workspace = true
+
+thiserror.workspace = true
+anyhow              = "1"
+clap_complete       = "4"
+
+clap = { version = "4", features = ["derive", "wrap_help"] }
+godot = { git = "https://github.com/godot-rust/gdext.git", features = ["api-4-4", "register-docs"] }
 
 
 [profile.release]
@@ -31,65 +52,14 @@ opt-level = "s"
 
 
 [workspace.dependencies]
-# Local dependencies
-grimoire_engine        = { path = "grimoire_engine" }
-grimoire_engine_types  = { path = "grimoire_engine_types" }
-grimoire_parser        = { path = "grimoire_parser" }
-grimoire_parser_derive = { path = "grimoire_parser_derive" }
-
-# Utils
-bytecount   = "*"
-cfg-if      = "*"
-paste       = "*"
-indexmap    = "*"
-thiserror   = "*"
-anyhow      = "*"
-log         = "*"
-hashbrown   = "*"
-cbindgen    = "*"
-termcolor   = "*"
-derive_more = { version = "*", features = ["full"] }
-smol_str    = { version = "*", features = ["serde"] }
-bitflags    = { version = "*", default-features = false }
-
-# Parsing
-unicode-segmentation = "*"
-codespan             = "*"
-codespan-reporting   = "*"
-regex = { version = "*", default-features = false, features = ["std"] }
-
-# SerDe
-serde_json = { version = "*", default-features = false, features = [
-    "std",
-    "preserve_order",
-] }
-serde = { version = "*", default-features = false, features = [
-    "std",
-    "rc",
-    "derive",
-] }
-toml = { version = "*", default-features = false, features = [
-    "parse",
-    "display",
-] }
-
-# ProcMacros
-quote       = "*"
-proc-macro2 = "*"
-
-# CLI
-clap_mangen   = "*" # TODO: Could be replace by something crafter by hand…
-clap_complete = "*"
-clap = { version = "*", default-features = false, features = [
-    "usage",
-    "help",
-    "std",
-    "suggestions",
-    "error-context",
-    "derive",
-    "wrap_help",
-] }
-
-# FOR TESTS
-criterion = "*"
-insta = { version = "*", features = ["glob", "yaml"] }
+grimoire-parser        = { path = "grimoire-parser" }
+grimoire-parser-derive = { path = "grimoire-parser-derive" }
+
+bytecount   = "0.6"
+cfg-if      = "1"
+thiserror   = "2"
+log         = "0.4"
+derive_more = { version = "2",   features = ["full"] }
+smol_str    = { version = "0.3", features = ["serde"] }
+bitflags    = { version = "2",   default-features = false }
+serde       = { version = "*", features = ["derive"] }
diff --git a/bin/check.rs b/bin/check.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f328e4d9d04c31d0d70d16d21a07d1613be9d577
--- /dev/null
+++ b/bin/check.rs
@@ -0,0 +1 @@
+fn main() {}
diff --git a/grimoire-parser-derive/Cargo.toml b/grimoire-parser-derive/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..4da1313d511822de34508ee85c9d2c0f295fec07
--- /dev/null
+++ b/grimoire-parser-derive/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name        = "grimoire-parser-derive"
+description = "Internally used for the grimoire-parser crate."
+
+
+license.workspace = true
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+
+
+[lib]
+proc-macro = true
+
+
+[dependencies]
+syn         = { version = "1", features = ["extra-traits"] }
+quote       = "1"
+proc-macro2 = "1"
+indexmap    = "2"
diff --git a/grimoire_engine/src/lib.rs b/grimoire-parser-derive/src/lib.rs
similarity index 100%
rename from grimoire_engine/src/lib.rs
rename to grimoire-parser-derive/src/lib.rs
diff --git a/grimoire-parser/Cargo.toml b/grimoire-parser/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..aebfafe64bc4f383d7d0611f9b25af46e89934c1
--- /dev/null
+++ b/grimoire-parser/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name        = "grimoire-parser"
+description = "A parser for Grimoire Scripts."
+
+license.workspace = true
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+
+[dependencies]
+grimoire-parser-derive.workspace = true
+
+bytecount.workspace          = true
+cfg-if.workspace             = true
+derive_more.workspace        = true
+serde.workspace              = true
+log.workspace                = true
+
+paste              = "1"
+termcolor          = "1"
+codespan           = "0.12"
+codespan-reporting = "0.12"
+
+[dev-dependencies]
+criterion = "0.5"
+insta = { version = "1", features = ["glob", "yaml"] }
diff --git a/grimoire_parser/src/lib.rs b/grimoire-parser/src/lib.rs
similarity index 100%
rename from grimoire_parser/src/lib.rs
rename to grimoire-parser/src/lib.rs
diff --git a/grimoire_engine/Cargo.toml b/grimoire_engine/Cargo.toml
deleted file mode 100644
index 61ba0bd112a58d7a157c1eec164fb0d71538a15e..0000000000000000000000000000000000000000
--- a/grimoire_engine/Cargo.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[package]
-name              = "grimoire_engine"
-description       = "The runtime for Grimoire"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-grimoire_engine_types.workspace = true
-
-log.workspace    = true
-serde.workspace  = true
-toml.workspace   = true
diff --git a/grimoire_engine_types/Cargo.toml b/grimoire_engine_types/Cargo.toml
deleted file mode 100644
index a7c6bce469c0ed65c650ee008191659a8b30ca13..0000000000000000000000000000000000000000
--- a/grimoire_engine_types/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name        = "grimoire_engine_types"
-description = "The types for Grimoire, to be used by the engine and the parser."
-
-license.workspace = true
-version.workspace = true
-edition.workspace = true
-authors.workspace = true
-
-[dependencies]
-bytecount.workspace   = true
-cfg-if.workspace      = true
-derive_more.workspace = true
-paste.workspace       = true
-serde.workspace       = true
-hashbrown.workspace   = true
-log.workspace         = true
-thiserror.workspace   = true
diff --git a/grimoire_parser/Cargo.toml b/grimoire_parser/Cargo.toml
deleted file mode 100644
index 149285003155ade75823c255959e8191dd1820ea..0000000000000000000000000000000000000000
--- a/grimoire_parser/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name        = "grimoire_parser"
-description = "A parser for Grimoire Scripts."
-
-license.workspace = true
-version.workspace = true
-edition.workspace = true
-authors.workspace = true
-
-[dependencies]
-grimoire_parser_derive.workspace = true
-grimoire_engine_types.workspace  = true
-
-bytecount.workspace          = true
-cfg-if.workspace             = true
-derive_more.workspace        = true
-paste.workspace              = true
-serde.workspace              = true
-hashbrown.workspace          = true
-anyhow.workspace             = true
-log.workspace                = true
-codespan.workspace           = true
-codespan-reporting.workspace = true
-termcolor.workspace          = true
-
-[dev-dependencies]
-criterion.workspace = true
-insta.workspace     = true
diff --git a/grimoire_parser_derive/Cargo.toml b/grimoire_parser_derive/Cargo.toml
deleted file mode 100644
index ab8516e95f92bb9303081f3bf768a1761f2b1e4e..0000000000000000000000000000000000000000
--- a/grimoire_parser_derive/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name        = "grimoire_parser_derive"
-description = "Internally used for the grimoire_parser crate."
-
-license.workspace = true
-version.workspace = true
-edition.workspace = true
-authors.workspace = true
-
-[lib]
-proc-macro = true
-
-[dependencies]
-indexmap.workspace    = true
-proc-macro2.workspace = true
-quote.workspace       = true
-
-syn = { version = "1", features = ["extra-traits"] }
diff --git a/grimoire_parser_derive/src/lib.rs b/grimoire_parser_derive/src/lib.rs
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/grimoire_runner/Cargo.toml b/grimoire_runner/Cargo.toml
deleted file mode 100644
index 48f4f85e8d35d63a4fbf43145e1eeeae6193b4bc..0000000000000000000000000000000000000000
--- a/grimoire_runner/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name        = "grimoire_runner"
-description = "The runner for Grimoire."
-
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-grimoire_engine_types.workspace = true
-grimoire_engine.workspace       = true
-grimoire_parser.workspace       = true
-
-thiserror.workspace     = true
-serde.workspace         = true
-toml.workspace          = true
-log.workspace           = true
-clap_mangen.workspace   = true
-clap_complete.workspace = true
-clap.workspace          = true
diff --git a/grimoire_runner/src/main.rs b/grimoire_runner/src/main.rs
deleted file mode 100644
index f79c691f0853c5b08e114041f7c8db43b0452fe0..0000000000000000000000000000000000000000
--- a/grimoire_runner/src/main.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-fn main() {
-}
diff --git a/grimoire_engine_types/src/error.rs b/src/error.rs
similarity index 100%
rename from grimoire_engine_types/src/error.rs
rename to src/error.rs
diff --git a/grimoire_engine_types/src/expr/mod.rs b/src/expr/mod.rs
similarity index 100%
rename from grimoire_engine_types/src/expr/mod.rs
rename to src/expr/mod.rs
diff --git a/grimoire_engine_types/src/lib.rs b/src/lib.rs
similarity index 100%
rename from grimoire_engine_types/src/lib.rs
rename to src/lib.rs
diff --git a/grimoire_engine_types/src/spell/arguments.rs b/src/spell/arguments.rs
similarity index 100%
rename from grimoire_engine_types/src/spell/arguments.rs
rename to src/spell/arguments.rs
diff --git a/grimoire_engine_types/src/spell/factory.rs b/src/spell/factory.rs
similarity index 100%
rename from grimoire_engine_types/src/spell/factory.rs
rename to src/spell/factory.rs
diff --git a/grimoire_engine_types/src/spell/mod.rs b/src/spell/mod.rs
similarity index 100%
rename from grimoire_engine_types/src/spell/mod.rs
rename to src/spell/mod.rs
diff --git a/grimoire_engine_types/src/spell/traits.rs b/src/spell/traits.rs
similarity index 100%
rename from grimoire_engine_types/src/spell/traits.rs
rename to src/spell/traits.rs
diff --git a/grimoire_engine_types/src/state.rs b/src/state.rs
similarity index 100%
rename from grimoire_engine_types/src/state.rs
rename to src/state.rs