diff --git a/firmware/Cargo.lock b/firmware/Cargo.lock
index 53e3c93..0e22394 100644
--- a/firmware/Cargo.lock
+++ b/firmware/Cargo.lock
@@ -3,5 +3,5 @@
 version = 3
 
 [[package]]
-name = "film-scanner-fw"
+name = "jerk_control"
 version = "0.1.0"
diff --git a/firmware/Cargo.toml b/firmware/Cargo.toml
index 94beeac..a9e0ceb 100644
--- a/firmware/Cargo.toml
+++ b/firmware/Cargo.toml
@@ -1,8 +1,2 @@
-[package]
-name = "film-scanner-fw"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
+[workspace]
+members = [ "jerk_control" ]
diff --git a/firmware/jerk_control/Cargo.toml b/firmware/jerk_control/Cargo.toml
new file mode 100644
index 0000000..8b68b77
--- /dev/null
+++ b/firmware/jerk_control/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "jerk_control"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/firmware/src/main.rs b/firmware/jerk_control/src/main.rs
similarity index 100%
rename from firmware/src/main.rs
rename to firmware/jerk_control/src/main.rs
diff --git a/firmware/src/motion/planner.rs b/firmware/jerk_control/src/motion/planner.rs
similarity index 100%
rename from firmware/src/motion/planner.rs
rename to firmware/jerk_control/src/motion/planner.rs