diff --git a/Cargo.lock b/Cargo.lock
index 83dc176..388d5d3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -139,7 +139,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "dcb-extract"
+name = "dcb-tools"
 version = "0.1.0"
 dependencies = [
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index da7ffa3..027aab7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,11 +1,18 @@
 [package]
-name = "dcb-extract"
+name = "dcb-tools"
 version = "0.1.0"
 authors = ["Filipe Rodrigues <filipejacintorodrigues1@gmail.com>"]
 edition = "2018"
 
-[dependencies]
+[[bin]]
+name = "extractor"
+path = "src/extractor/main.rs"
 
+[[bin]]
+name = "patcher"
+path = "src/patcher/main.rs"
+
+[dependencies]
 # Dcb
 dcb = { path = "../dcb" }
 
@@ -23,13 +30,12 @@ err-panic     = { path = "../err-panic", features = ["string-err-ext"] }
 err-ext       = { path = "../err-ext" }
 derive_more   = "0.99"
 
-
 # Serde
 serde_yaml = "0.8"
 
 # Build dependencies in release mode
 [profile.dev.package."*"]
 opt-level = 2
-[profile.dev.package.dcb] # Except dcb
+[profile.dev.package.dcb] # Except dcb for debugging
 opt-level = 0
 
diff --git a/src/cli.rs b/src/extractor/cli.rs
similarity index 100%
rename from src/cli.rs
rename to src/extractor/cli.rs
diff --git a/src/main.rs b/src/extractor/main.rs
similarity index 100%
rename from src/main.rs
rename to src/extractor/main.rs
diff --git a/src/panic.rs b/src/extractor/panic.rs
similarity index 100%
rename from src/panic.rs
rename to src/extractor/panic.rs