diff --git a/zynq/.cargo/config.toml b/firmware/.cargo/config.toml
similarity index 100%
rename from zynq/.cargo/config.toml
rename to firmware/.cargo/config.toml
diff --git a/zynq/.gitignore b/firmware/.gitignore
similarity index 100%
rename from zynq/.gitignore
rename to firmware/.gitignore
diff --git a/zynq/Cargo.toml b/firmware/Cargo.toml
similarity index 100%
rename from zynq/Cargo.toml
rename to firmware/Cargo.toml
diff --git a/zynq/examples/embassy/Cargo.toml b/firmware/examples/embassy/Cargo.toml
similarity index 100%
rename from zynq/examples/embassy/Cargo.toml
rename to firmware/examples/embassy/Cargo.toml
diff --git a/zynq/examples/embassy/build.rs b/firmware/examples/embassy/build.rs
similarity index 100%
rename from zynq/examples/embassy/build.rs
rename to firmware/examples/embassy/build.rs
diff --git a/zynq/examples/embassy/memory.x b/firmware/examples/embassy/memory.x
similarity index 100%
rename from zynq/examples/embassy/memory.x
rename to firmware/examples/embassy/memory.x
diff --git a/zynq/examples/embassy/src/bin/dht22-open-drain-pins.rs b/firmware/examples/embassy/src/bin/dht22-open-drain-pins.rs
similarity index 100%
rename from zynq/examples/embassy/src/bin/dht22-open-drain-pins.rs
rename to firmware/examples/embassy/src/bin/dht22-open-drain-pins.rs
diff --git a/zynq/examples/embassy/src/bin/embassy-hello.rs b/firmware/examples/embassy/src/bin/embassy-hello.rs
similarity index 100%
rename from zynq/examples/embassy/src/bin/embassy-hello.rs
rename to firmware/examples/embassy/src/bin/embassy-hello.rs
diff --git a/zynq/examples/embassy/src/bin/logger-non-blocking.rs b/firmware/examples/embassy/src/bin/logger-non-blocking.rs
similarity index 100%
rename from zynq/examples/embassy/src/bin/logger-non-blocking.rs
rename to firmware/examples/embassy/src/bin/logger-non-blocking.rs
diff --git a/zynq/examples/embassy/src/bin/pwm.rs b/firmware/examples/embassy/src/bin/pwm.rs
similarity index 100%
rename from zynq/examples/embassy/src/bin/pwm.rs
rename to firmware/examples/embassy/src/bin/pwm.rs
diff --git a/zynq/examples/embassy/src/main.rs b/firmware/examples/embassy/src/main.rs
similarity index 100%
rename from zynq/examples/embassy/src/main.rs
rename to firmware/examples/embassy/src/main.rs
diff --git a/zynq/examples/simple/Cargo.toml b/firmware/examples/simple/Cargo.toml
similarity index 100%
rename from zynq/examples/simple/Cargo.toml
rename to firmware/examples/simple/Cargo.toml
diff --git a/zynq/examples/simple/build.rs b/firmware/examples/simple/build.rs
similarity index 100%
rename from zynq/examples/simple/build.rs
rename to firmware/examples/simple/build.rs
diff --git a/zynq/examples/simple/memory.x b/firmware/examples/simple/memory.x
similarity index 100%
rename from zynq/examples/simple/memory.x
rename to firmware/examples/simple/memory.x
diff --git a/zynq/examples/simple/src/bin/blinky.rs b/firmware/examples/simple/src/bin/blinky.rs
similarity index 100%
rename from zynq/examples/simple/src/bin/blinky.rs
rename to firmware/examples/simple/src/bin/blinky.rs
diff --git a/zynq/examples/simple/src/bin/gtc-ticks.rs b/firmware/examples/simple/src/bin/gtc-ticks.rs
similarity index 100%
rename from zynq/examples/simple/src/bin/gtc-ticks.rs
rename to firmware/examples/simple/src/bin/gtc-ticks.rs
diff --git a/zynq/examples/simple/src/bin/logger.rs b/firmware/examples/simple/src/bin/logger.rs
similarity index 100%
rename from zynq/examples/simple/src/bin/logger.rs
rename to firmware/examples/simple/src/bin/logger.rs
diff --git a/zynq/examples/simple/src/main.rs b/firmware/examples/simple/src/main.rs
similarity index 100%
rename from zynq/examples/simple/src/main.rs
rename to firmware/examples/simple/src/main.rs
diff --git a/zynq/examples/zedboard/Cargo.toml b/firmware/examples/zedboard/Cargo.toml
similarity index 100%
rename from zynq/examples/zedboard/Cargo.toml
rename to firmware/examples/zedboard/Cargo.toml
diff --git a/zynq/examples/zedboard/build.rs b/firmware/examples/zedboard/build.rs
similarity index 100%
rename from zynq/examples/zedboard/build.rs
rename to firmware/examples/zedboard/build.rs
diff --git a/zynq/examples/zedboard/memory.x b/firmware/examples/zedboard/memory.x
similarity index 100%
rename from zynq/examples/zedboard/memory.x
rename to firmware/examples/zedboard/memory.x
diff --git a/zynq/examples/zedboard/src/bin/ethernet.rs b/firmware/examples/zedboard/src/bin/ethernet.rs
similarity index 100%
rename from zynq/examples/zedboard/src/bin/ethernet.rs
rename to firmware/examples/zedboard/src/bin/ethernet.rs
diff --git a/zynq/examples/zedboard/src/bin/l3gd20h-i2c-mio.rs b/firmware/examples/zedboard/src/bin/l3gd20h-i2c-mio.rs
similarity index 100%
rename from zynq/examples/zedboard/src/bin/l3gd20h-i2c-mio.rs
rename to firmware/examples/zedboard/src/bin/l3gd20h-i2c-mio.rs
diff --git a/zynq/examples/zedboard/src/bin/l3gd20h-spi-mio.rs b/firmware/examples/zedboard/src/bin/l3gd20h-spi-mio.rs
similarity index 100%
rename from zynq/examples/zedboard/src/bin/l3gd20h-spi-mio.rs
rename to firmware/examples/zedboard/src/bin/l3gd20h-spi-mio.rs
diff --git a/zynq/examples/zedboard/src/bin/qspi.rs b/firmware/examples/zedboard/src/bin/qspi.rs
similarity index 100%
rename from zynq/examples/zedboard/src/bin/qspi.rs
rename to firmware/examples/zedboard/src/bin/qspi.rs
diff --git a/zynq/examples/zedboard/src/bin/uart-blocking.rs b/firmware/examples/zedboard/src/bin/uart-blocking.rs
similarity index 100%
rename from zynq/examples/zedboard/src/bin/uart-blocking.rs
rename to firmware/examples/zedboard/src/bin/uart-blocking.rs
diff --git a/zynq/examples/zedboard/src/bin/uart-non-blocking.rs b/firmware/examples/zedboard/src/bin/uart-non-blocking.rs
similarity index 100%
rename from zynq/examples/zedboard/src/bin/uart-non-blocking.rs
rename to firmware/examples/zedboard/src/bin/uart-non-blocking.rs
diff --git a/zynq/examples/zedboard/src/lib.rs b/firmware/examples/zedboard/src/lib.rs
similarity index 100%
rename from zynq/examples/zedboard/src/lib.rs
rename to firmware/examples/zedboard/src/lib.rs
diff --git a/zynq/examples/zedboard/src/main.rs b/firmware/examples/zedboard/src/main.rs
similarity index 100%
rename from zynq/examples/zedboard/src/main.rs
rename to firmware/examples/zedboard/src/main.rs
diff --git a/zynq/gdb.gdb b/firmware/gdb.gdb
similarity index 100%
rename from zynq/gdb.gdb
rename to firmware/gdb.gdb
diff --git a/zynq/zedboard-bsp/CHANGELOG.md b/firmware/zedboard-bsp/CHANGELOG.md
similarity index 100%
rename from zynq/zedboard-bsp/CHANGELOG.md
rename to firmware/zedboard-bsp/CHANGELOG.md
diff --git a/zynq/zedboard-bsp/Cargo.toml b/firmware/zedboard-bsp/Cargo.toml
similarity index 100%
rename from zynq/zedboard-bsp/Cargo.toml
rename to firmware/zedboard-bsp/Cargo.toml
diff --git a/zynq/zedboard-bsp/LICENSE-APACHE b/firmware/zedboard-bsp/LICENSE-APACHE
similarity index 100%
rename from zynq/zedboard-bsp/LICENSE-APACHE
rename to firmware/zedboard-bsp/LICENSE-APACHE
diff --git a/zynq/zedboard-bsp/LICENSE-MIT b/firmware/zedboard-bsp/LICENSE-MIT
similarity index 100%
rename from zynq/zedboard-bsp/LICENSE-MIT
rename to firmware/zedboard-bsp/LICENSE-MIT
diff --git a/zynq/zedboard-bsp/README.md b/firmware/zedboard-bsp/README.md
similarity index 100%
rename from zynq/zedboard-bsp/README.md
rename to firmware/zedboard-bsp/README.md
diff --git a/zynq/zedboard-bsp/src/ddrc_config_autogen.rs b/firmware/zedboard-bsp/src/ddrc_config_autogen.rs
similarity index 100%
rename from zynq/zedboard-bsp/src/ddrc_config_autogen.rs
rename to firmware/zedboard-bsp/src/ddrc_config_autogen.rs
diff --git a/zynq/zedboard-bsp/src/ddriob_config_autogen.rs b/firmware/zedboard-bsp/src/ddriob_config_autogen.rs
similarity index 100%
rename from zynq/zedboard-bsp/src/ddriob_config_autogen.rs
rename to firmware/zedboard-bsp/src/ddriob_config_autogen.rs
diff --git a/zynq/zedboard-bsp/src/lib.rs b/firmware/zedboard-bsp/src/lib.rs
similarity index 100%
rename from zynq/zedboard-bsp/src/lib.rs
rename to firmware/zedboard-bsp/src/lib.rs
diff --git a/zynq/zedboard-bsp/src/phy_marvell.rs b/firmware/zedboard-bsp/src/phy_marvell.rs
similarity index 100%
rename from zynq/zedboard-bsp/src/phy_marvell.rs
rename to firmware/zedboard-bsp/src/phy_marvell.rs
diff --git a/zynq/zedboard-bsp/src/qspi_spansion.rs b/firmware/zedboard-bsp/src/qspi_spansion.rs
similarity index 100%
rename from zynq/zedboard-bsp/src/qspi_spansion.rs
rename to firmware/zedboard-bsp/src/qspi_spansion.rs
diff --git a/zynq/zedboard-fsbl/Cargo.toml b/firmware/zedboard-fsbl/Cargo.toml
similarity index 94%
rename from zynq/zedboard-fsbl/Cargo.toml
rename to firmware/zedboard-fsbl/Cargo.toml
index 5eb69b7..bdf6218 100644
--- a/zynq/zedboard-fsbl/Cargo.toml
+++ b/firmware/zedboard-fsbl/Cargo.toml
@@ -13,7 +13,7 @@ aarch32-cpu = { version = "0.1", features = ["critical-section-single-core"] }
 zynq7000-rt = { path = "../zynq7000-rt" }
 zynq7000 = { path = "../zynq7000" }
 zynq7000-hal = { path = "../zynq7000-hal" }
-zynq7000-boot-image = { path = "../../zynq7000-boot-image" }
+zynq7000-boot-image = { path = "../../host/zynq7000-boot-image" }
 zedboard-bsp = { path = "../zedboard-bsp" }
 embedded-io = "0.7"
 embedded-hal = "1"
diff --git a/zynq/zedboard-fsbl/README.md b/firmware/zedboard-fsbl/README.md
similarity index 100%
rename from zynq/zedboard-fsbl/README.md
rename to firmware/zedboard-fsbl/README.md
diff --git a/zynq/zedboard-fsbl/build.rs b/firmware/zedboard-fsbl/build.rs
similarity index 100%
rename from zynq/zedboard-fsbl/build.rs
rename to firmware/zedboard-fsbl/build.rs
diff --git a/zynq/zedboard-fsbl/memory.x b/firmware/zedboard-fsbl/memory.x
similarity index 100%
rename from zynq/zedboard-fsbl/memory.x
rename to firmware/zedboard-fsbl/memory.x
diff --git a/zynq/zedboard-fsbl/src/main.rs b/firmware/zedboard-fsbl/src/main.rs
similarity index 100%
rename from zynq/zedboard-fsbl/src/main.rs
rename to firmware/zedboard-fsbl/src/main.rs
diff --git a/zynq/zedboard-qspi-flasher/Cargo.toml b/firmware/zedboard-qspi-flasher/Cargo.toml
similarity index 85%
rename from zynq/zedboard-qspi-flasher/Cargo.toml
rename to firmware/zedboard-qspi-flasher/Cargo.toml
index 12aecdb..ff1645c 100644
--- a/zynq/zedboard-qspi-flasher/Cargo.toml
+++ b/firmware/zedboard-qspi-flasher/Cargo.toml
@@ -8,7 +8,7 @@ aarch32-cpu = { version = "0.1", features = ["critical-section-single-core"] }
 zynq7000-rt = { path = "../zynq7000-rt" }
 zynq7000 = { path = "../zynq7000" }
 zynq7000-hal = { path = "../zynq7000-hal" }
-zynq7000-boot-image = { path = "../../zynq7000-boot-image" }
+zynq7000-boot-image = { path = "../../host/zynq7000-boot-image" }
 zedboard-bsp = { path = "../zedboard-bsp" }
 embedded-io = "0.7"
 embedded-hal = "1"
diff --git a/zynq/zedboard-qspi-flasher/README.md b/firmware/zedboard-qspi-flasher/README.md
similarity index 100%
rename from zynq/zedboard-qspi-flasher/README.md
rename to firmware/zedboard-qspi-flasher/README.md
diff --git a/zynq/zedboard-qspi-flasher/build.rs b/firmware/zedboard-qspi-flasher/build.rs
similarity index 100%
rename from zynq/zedboard-qspi-flasher/build.rs
rename to firmware/zedboard-qspi-flasher/build.rs
diff --git a/zynq/zedboard-qspi-flasher/memory.x b/firmware/zedboard-qspi-flasher/memory.x
similarity index 100%
rename from zynq/zedboard-qspi-flasher/memory.x
rename to firmware/zedboard-qspi-flasher/memory.x
diff --git a/zynq/zedboard-qspi-flasher/qspi-flasher.tcl b/firmware/zedboard-qspi-flasher/qspi-flasher.tcl
similarity index 100%
rename from zynq/zedboard-qspi-flasher/qspi-flasher.tcl
rename to firmware/zedboard-qspi-flasher/qspi-flasher.tcl
diff --git a/zynq/zedboard-qspi-flasher/src/main.rs b/firmware/zedboard-qspi-flasher/src/main.rs
similarity index 100%
rename from zynq/zedboard-qspi-flasher/src/main.rs
rename to firmware/zedboard-qspi-flasher/src/main.rs
diff --git a/zynq/zynq7000-embassy/CHANGELOG.md b/firmware/zynq7000-embassy/CHANGELOG.md
similarity index 100%
rename from zynq/zynq7000-embassy/CHANGELOG.md
rename to firmware/zynq7000-embassy/CHANGELOG.md
diff --git a/zynq/zynq7000-embassy/Cargo.toml b/firmware/zynq7000-embassy/Cargo.toml
similarity index 100%
rename from zynq/zynq7000-embassy/Cargo.toml
rename to firmware/zynq7000-embassy/Cargo.toml
diff --git a/zynq/zynq7000-embassy/LICENSE-APACHE b/firmware/zynq7000-embassy/LICENSE-APACHE
similarity index 100%
rename from zynq/zynq7000-embassy/LICENSE-APACHE
rename to firmware/zynq7000-embassy/LICENSE-APACHE
diff --git a/zynq/zynq7000-embassy/LICENSE-MIT b/firmware/zynq7000-embassy/LICENSE-MIT
similarity index 100%
rename from zynq/zynq7000-embassy/LICENSE-MIT
rename to firmware/zynq7000-embassy/LICENSE-MIT
diff --git a/zynq/zynq7000-embassy/README.md b/firmware/zynq7000-embassy/README.md
similarity index 100%
rename from zynq/zynq7000-embassy/README.md
rename to firmware/zynq7000-embassy/README.md
diff --git a/zynq/zynq7000-embassy/src/lib.rs b/firmware/zynq7000-embassy/src/lib.rs
similarity index 100%
rename from zynq/zynq7000-embassy/src/lib.rs
rename to firmware/zynq7000-embassy/src/lib.rs
diff --git a/zynq/zynq7000-hal/CHANGELOG.md b/firmware/zynq7000-hal/CHANGELOG.md
similarity index 100%
rename from zynq/zynq7000-hal/CHANGELOG.md
rename to firmware/zynq7000-hal/CHANGELOG.md
diff --git a/zynq/zynq7000-hal/Cargo.toml b/firmware/zynq7000-hal/Cargo.toml
similarity index 100%
rename from zynq/zynq7000-hal/Cargo.toml
rename to firmware/zynq7000-hal/Cargo.toml
diff --git a/zynq/zynq7000-hal/LICENSE-APACHE b/firmware/zynq7000-hal/LICENSE-APACHE
similarity index 100%
rename from zynq/zynq7000-hal/LICENSE-APACHE
rename to firmware/zynq7000-hal/LICENSE-APACHE
diff --git a/zynq/zynq7000-hal/LICENSE-MIT b/firmware/zynq7000-hal/LICENSE-MIT
similarity index 100%
rename from zynq/zynq7000-hal/LICENSE-MIT
rename to firmware/zynq7000-hal/LICENSE-MIT
diff --git a/zynq/zynq7000-hal/README.md b/firmware/zynq7000-hal/README.md
similarity index 100%
rename from zynq/zynq7000-hal/README.md
rename to firmware/zynq7000-hal/README.md
diff --git a/zynq/zynq7000-hal/src/cache.rs b/firmware/zynq7000-hal/src/cache.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/cache.rs
rename to firmware/zynq7000-hal/src/cache.rs
diff --git a/zynq/zynq7000-hal/src/clocks/mod.rs b/firmware/zynq7000-hal/src/clocks/mod.rs
similarity index 99%
rename from zynq/zynq7000-hal/src/clocks/mod.rs
rename to firmware/zynq7000-hal/src/clocks/mod.rs
index e628a4d..a3aec6c 100644
--- a/zynq/zynq7000-hal/src/clocks/mod.rs
+++ b/firmware/zynq7000-hal/src/clocks/mod.rs
@@ -1,8 +1,4 @@
 //! # Clock module
-//!
-//! ## Examples
-//!
-//! - PLL initialization in [Zedboard FSBL](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/zynq/zedboard-fsbl)
 use arbitrary_int::{prelude::*, u6};
 
 pub mod pll;
diff --git a/zynq/zynq7000-hal/src/clocks/pll.rs b/firmware/zynq7000-hal/src/clocks/pll.rs
similarity index 99%
rename from zynq/zynq7000-hal/src/clocks/pll.rs
rename to firmware/zynq7000-hal/src/clocks/pll.rs
index a8fca0d..6dc777e 100644
--- a/zynq/zynq7000-hal/src/clocks/pll.rs
+++ b/firmware/zynq7000-hal/src/clocks/pll.rs
@@ -1,3 +1,4 @@
+//! # PLL support module
 use core::sync::atomic::AtomicBool;
 
 use arbitrary_int::{u4, u7, u10};
diff --git a/zynq/zynq7000-hal/src/ddr/ll.rs b/firmware/zynq7000-hal/src/ddr/ll.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/ddr/ll.rs
rename to firmware/zynq7000-hal/src/ddr/ll.rs
diff --git a/zynq/zynq7000-hal/src/ddr/mod.rs b/firmware/zynq7000-hal/src/ddr/mod.rs
similarity index 98%
rename from zynq/zynq7000-hal/src/ddr/mod.rs
rename to firmware/zynq7000-hal/src/ddr/mod.rs
index 0b48e2d..0616428 100644
--- a/zynq/zynq7000-hal/src/ddr/mod.rs
+++ b/firmware/zynq7000-hal/src/ddr/mod.rs
@@ -1,8 +1,4 @@
 //! # DDR module
-//!
-//! ## Examples
-//!
-//! - [Zedboard FSBL](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/zynq/zedboard-fsbl)
 use arbitrary_int::u6;
 use zynq7000::ddrc::MmioRegisters;
 
diff --git a/zynq/zynq7000-hal/src/devcfg.rs b/firmware/zynq7000-hal/src/devcfg.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/devcfg.rs
rename to firmware/zynq7000-hal/src/devcfg.rs
diff --git a/zynq/zynq7000-hal/src/eth/embassy_net.rs b/firmware/zynq7000-hal/src/eth/embassy_net.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/eth/embassy_net.rs
rename to firmware/zynq7000-hal/src/eth/embassy_net.rs
diff --git a/zynq/zynq7000-hal/src/eth/ll.rs b/firmware/zynq7000-hal/src/eth/ll.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/eth/ll.rs
rename to firmware/zynq7000-hal/src/eth/ll.rs
diff --git a/zynq/zynq7000-hal/src/eth/mdio.rs b/firmware/zynq7000-hal/src/eth/mdio.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/eth/mdio.rs
rename to firmware/zynq7000-hal/src/eth/mdio.rs
diff --git a/zynq/zynq7000-hal/src/eth/mod.rs b/firmware/zynq7000-hal/src/eth/mod.rs
similarity index 99%
rename from zynq/zynq7000-hal/src/eth/mod.rs
rename to firmware/zynq7000-hal/src/eth/mod.rs
index 2197144..044fab7 100644
--- a/zynq/zynq7000-hal/src/eth/mod.rs
+++ b/firmware/zynq7000-hal/src/eth/mod.rs
@@ -1,8 +1,4 @@
 //! # Ethernet module
-//!
-//! ## Examples
-//!
-//! - [Zedboard Ethernet](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/zynq/examples/zedboard/src/bin/ethernet.rs)
 use arbitrary_int::{u2, u3};
 pub use zynq7000::eth::MdcClockDivisor;
 use zynq7000::eth::{
diff --git a/zynq/zynq7000-hal/src/eth/rx_descr.rs b/firmware/zynq7000-hal/src/eth/rx_descr.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/eth/rx_descr.rs
rename to firmware/zynq7000-hal/src/eth/rx_descr.rs
diff --git a/zynq/zynq7000-hal/src/eth/smoltcp.rs b/firmware/zynq7000-hal/src/eth/smoltcp.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/eth/smoltcp.rs
rename to firmware/zynq7000-hal/src/eth/smoltcp.rs
diff --git a/zynq/zynq7000-hal/src/eth/tx_descr.rs b/firmware/zynq7000-hal/src/eth/tx_descr.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/eth/tx_descr.rs
rename to firmware/zynq7000-hal/src/eth/tx_descr.rs
diff --git a/zynq/zynq7000-hal/src/gic.rs b/firmware/zynq7000-hal/src/gic.rs
similarity index 99%
rename from zynq/zynq7000-hal/src/gic.rs
rename to firmware/zynq7000-hal/src/gic.rs
index 1de4060..75a69a4 100644
--- a/zynq/zynq7000-hal/src/gic.rs
+++ b/firmware/zynq7000-hal/src/gic.rs
@@ -2,10 +2,6 @@
 //!
 //! The primary interface to configure and allow handling the interrupts are the
 //! [GicConfigurator] and the [GicInterruptHelper] structures.
-//!
-//! # Examples
-//!
-//! - [GTC ticks](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/examples/simple/src/bin/gtc-ticks.rs)
 #![deny(missing_docs)]
 use arbitrary_int::prelude::*;
 
@@ -314,7 +310,7 @@ pub struct InvalidSgiInterruptId(pub usize);
 ///    to have a certain value. It also sets the priority mask to 0xff by calling
 ///    [Self::set_priority_mask] to prevent masking of the interrupts.
 /// 2. Perform the configuration of the interrupt targets and the interrupt sensitivities.
-///    The CPU targets are encoded with [TargetCpu] while the sensitivities are encoded by
+///    The CPU targets are encoded with [TargetCpus] while the sensitivities are encoded by
 ///    the [SpiSensitivity] enum. You can use the following (helper) API to configure the
 ///    interrupts:
 ///
diff --git a/zynq/zynq7000-hal/src/gpio/emio.rs b/firmware/zynq7000-hal/src/gpio/emio.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/gpio/emio.rs
rename to firmware/zynq7000-hal/src/gpio/emio.rs
diff --git a/zynq/zynq7000-hal/src/gpio/ll.rs b/firmware/zynq7000-hal/src/gpio/ll.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/gpio/ll.rs
rename to firmware/zynq7000-hal/src/gpio/ll.rs
diff --git a/zynq/zynq7000-hal/src/gpio/mio.rs b/firmware/zynq7000-hal/src/gpio/mio.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/gpio/mio.rs
rename to firmware/zynq7000-hal/src/gpio/mio.rs
diff --git a/zynq/zynq7000-hal/src/gpio/mod.rs b/firmware/zynq7000-hal/src/gpio/mod.rs
similarity index 97%
rename from zynq/zynq7000-hal/src/gpio/mod.rs
rename to firmware/zynq7000-hal/src/gpio/mod.rs
index cfbac72..d6acebd 100644
--- a/zynq/zynq7000-hal/src/gpio/mod.rs
+++ b/firmware/zynq7000-hal/src/gpio/mod.rs
@@ -2,12 +2,6 @@
 //!
 //! This module contains a MIO and EMIO pin resource managements singleton as well as abstractions
 //! to use these pins as GPIOs.
-//!
-//! # Examples
-//!
-//! - [Blinky](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/zynq/examples/simple/src/main.rs)
-//! - [Logger example](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/zynq/examples/simple/src/bin/logger.rs)
-//!   which uses MIO pins for the UART.
 pub mod emio;
 pub mod ll;
 pub mod mio;
diff --git a/zynq/zynq7000-hal/src/gtc.rs b/firmware/zynq7000-hal/src/gtc.rs
similarity index 94%
rename from zynq/zynq7000-hal/src/gtc.rs
rename to firmware/zynq7000-hal/src/gtc.rs
index 0acda1f..f4626e7 100644
--- a/zynq/zynq7000-hal/src/gtc.rs
+++ b/firmware/zynq7000-hal/src/gtc.rs
@@ -1,9 +1,4 @@
 //! # Global timer counter driver module
-//!
-//! ## Examples
-//!
-//! - [GTC ticks example](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/zynq/examples/simple/src/bin/gtc-ticks.rs)
-//! - [Embassy Timer Driver](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/zynq/zynq7000-embassy/src/lib.rs)
 #![deny(missing_docs)]
 use zynq7000::gtc::MmioRegisters;
 
diff --git a/zynq/zynq7000-hal/src/i2c.rs b/firmware/zynq7000-hal/src/i2c.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/i2c.rs
rename to firmware/zynq7000-hal/src/i2c.rs
diff --git a/zynq/zynq7000-hal/src/l2_cache.rs b/firmware/zynq7000-hal/src/l2_cache.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/l2_cache.rs
rename to firmware/zynq7000-hal/src/l2_cache.rs
diff --git a/zynq/zynq7000-hal/src/lib.rs b/firmware/zynq7000-hal/src/lib.rs
similarity index 97%
rename from zynq/zynq7000-hal/src/lib.rs
rename to firmware/zynq7000-hal/src/lib.rs
index e2cf379..9f0cbdf 100644
--- a/zynq/zynq7000-hal/src/lib.rs
+++ b/firmware/zynq7000-hal/src/lib.rs
@@ -10,8 +10,8 @@
 //!
 //! ## Examples
 //!
-//! All exaples can be found inside the [examples folder](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/zynq/examples)
-//! of the project
+//! All exaples can be found inside the [examples folder](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/firmware/examples)
+//! and [firmware folder](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/firmware) of the project
 #![no_std]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
diff --git a/zynq/zynq7000-hal/src/log.rs b/firmware/zynq7000-hal/src/log.rs
similarity index 97%
rename from zynq/zynq7000-hal/src/log.rs
rename to firmware/zynq7000-hal/src/log.rs
index 75b21d3..d6db008 100644
--- a/zynq/zynq7000-hal/src/log.rs
+++ b/firmware/zynq7000-hal/src/log.rs
@@ -1,9 +1,4 @@
 //! # Simple logging providers
-//!
-//! ## Examples
-//!
-//! - [Logger example](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/zynq/examples/simple/src/bin/logger.rs)
-//!   which uses MIO pins for the UART.
 
 use core::sync::atomic::{AtomicBool, AtomicU8};
 
diff --git a/zynq/zynq7000-hal/src/prelude.rs b/firmware/zynq7000-hal/src/prelude.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/prelude.rs
rename to firmware/zynq7000-hal/src/prelude.rs
diff --git a/zynq/zynq7000-hal/src/priv_tim.rs b/firmware/zynq7000-hal/src/priv_tim.rs
similarity index 95%
rename from zynq/zynq7000-hal/src/priv_tim.rs
rename to firmware/zynq7000-hal/src/priv_tim.rs
index 36ad87c..4a5a3b4 100644
--- a/zynq/zynq7000-hal/src/priv_tim.rs
+++ b/firmware/zynq7000-hal/src/priv_tim.rs
@@ -1,8 +1,4 @@
 //! # CPU private timer module
-//!
-//! ## Examples
-//!
-//! - Private timer as delay provider in [blinky](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/zynq/examples/simple/src/bin/blinky.rs)
 #![deny(missing_docs)]
 use core::{marker::PhantomData, sync::atomic::AtomicBool};
 
diff --git a/zynq/zynq7000-hal/src/qspi/lqspi_configs.rs b/firmware/zynq7000-hal/src/qspi/lqspi_configs.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/qspi/lqspi_configs.rs
rename to firmware/zynq7000-hal/src/qspi/lqspi_configs.rs
diff --git a/zynq/zynq7000-hal/src/qspi/mod.rs b/firmware/zynq7000-hal/src/qspi/mod.rs
similarity index 99%
rename from zynq/zynq7000-hal/src/qspi/mod.rs
rename to firmware/zynq7000-hal/src/qspi/mod.rs
index 1731aee..d360897 100644
--- a/zynq/zynq7000-hal/src/qspi/mod.rs
+++ b/firmware/zynq7000-hal/src/qspi/mod.rs
@@ -1,8 +1,4 @@
 //! # QSPI module
-//!
-//! ## Examples
-//!
-//! - [Zedboard QSPI](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/zynq/examples/zedboard/src/bin/qspi.rs)
 use core::ops::{Deref, DerefMut};
 
 use arbitrary_int::{prelude::*, u2, u3, u6};
diff --git a/zynq/zynq7000-hal/src/slcr.rs b/firmware/zynq7000-hal/src/slcr.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/slcr.rs
rename to firmware/zynq7000-hal/src/slcr.rs
diff --git a/zynq/zynq7000-hal/src/spi/asynch.rs b/firmware/zynq7000-hal/src/spi/asynch.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/spi/asynch.rs
rename to firmware/zynq7000-hal/src/spi/asynch.rs
diff --git a/zynq/zynq7000-hal/src/spi/mod.rs b/firmware/zynq7000-hal/src/spi/mod.rs
similarity index 99%
rename from zynq/zynq7000-hal/src/spi/mod.rs
rename to firmware/zynq7000-hal/src/spi/mod.rs
index ea20042..4bb3a32 100644
--- a/zynq/zynq7000-hal/src/spi/mod.rs
+++ b/firmware/zynq7000-hal/src/spi/mod.rs
@@ -1,8 +1,4 @@
 //! SPI module
-//!
-//! ## Examples
-//!
-//! - [L3GD20H SPI sensor](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/zynq/examples/zedboard/src/bin/l3gd20h-spi-mio.rs)
 use core::convert::Infallible;
 
 use crate::clocks::Clocks;
diff --git a/zynq/zynq7000-hal/src/time.rs b/firmware/zynq7000-hal/src/time.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/time.rs
rename to firmware/zynq7000-hal/src/time.rs
diff --git a/zynq/zynq7000-hal/src/ttc.rs b/firmware/zynq7000-hal/src/ttc.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/ttc.rs
rename to firmware/zynq7000-hal/src/ttc.rs
diff --git a/zynq/zynq7000-hal/src/uart/mod.rs b/firmware/zynq7000-hal/src/uart/mod.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/uart/mod.rs
rename to firmware/zynq7000-hal/src/uart/mod.rs
diff --git a/zynq/zynq7000-hal/src/uart/rx.rs b/firmware/zynq7000-hal/src/uart/rx.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/uart/rx.rs
rename to firmware/zynq7000-hal/src/uart/rx.rs
diff --git a/zynq/zynq7000-hal/src/uart/tx.rs b/firmware/zynq7000-hal/src/uart/tx.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/uart/tx.rs
rename to firmware/zynq7000-hal/src/uart/tx.rs
diff --git a/zynq/zynq7000-hal/src/uart/tx_async.rs b/firmware/zynq7000-hal/src/uart/tx_async.rs
similarity index 100%
rename from zynq/zynq7000-hal/src/uart/tx_async.rs
rename to firmware/zynq7000-hal/src/uart/tx_async.rs
diff --git a/zynq/zynq7000-mmu/CHANGELOG.md b/firmware/zynq7000-mmu/CHANGELOG.md
similarity index 100%
rename from zynq/zynq7000-mmu/CHANGELOG.md
rename to firmware/zynq7000-mmu/CHANGELOG.md
diff --git a/zynq/zynq7000-mmu/Cargo.toml b/firmware/zynq7000-mmu/Cargo.toml
similarity index 100%
rename from zynq/zynq7000-mmu/Cargo.toml
rename to firmware/zynq7000-mmu/Cargo.toml
diff --git a/zynq/zynq7000-mmu/LICENSE-APACHE b/firmware/zynq7000-mmu/LICENSE-APACHE
similarity index 100%
rename from zynq/zynq7000-mmu/LICENSE-APACHE
rename to firmware/zynq7000-mmu/LICENSE-APACHE
diff --git a/zynq/zynq7000-mmu/LICENSE-MIT b/firmware/zynq7000-mmu/LICENSE-MIT
similarity index 100%
rename from zynq/zynq7000-mmu/LICENSE-MIT
rename to firmware/zynq7000-mmu/LICENSE-MIT
diff --git a/zynq/zynq7000-mmu/README.md b/firmware/zynq7000-mmu/README.md
similarity index 100%
rename from zynq/zynq7000-mmu/README.md
rename to firmware/zynq7000-mmu/README.md
diff --git a/zynq/zynq7000-mmu/build.rs b/firmware/zynq7000-mmu/build.rs
similarity index 100%
rename from zynq/zynq7000-mmu/build.rs
rename to firmware/zynq7000-mmu/build.rs
diff --git a/zynq/zynq7000-mmu/src/lib.rs b/firmware/zynq7000-mmu/src/lib.rs
similarity index 100%
rename from zynq/zynq7000-mmu/src/lib.rs
rename to firmware/zynq7000-mmu/src/lib.rs
diff --git a/zynq/zynq7000-rt/CHANGELOG.md b/firmware/zynq7000-rt/CHANGELOG.md
similarity index 100%
rename from zynq/zynq7000-rt/CHANGELOG.md
rename to firmware/zynq7000-rt/CHANGELOG.md
diff --git a/zynq/zynq7000-rt/Cargo.toml b/firmware/zynq7000-rt/Cargo.toml
similarity index 100%
rename from zynq/zynq7000-rt/Cargo.toml
rename to firmware/zynq7000-rt/Cargo.toml
diff --git a/zynq/zynq7000-rt/LICENSE-APACHE b/firmware/zynq7000-rt/LICENSE-APACHE
similarity index 100%
rename from zynq/zynq7000-rt/LICENSE-APACHE
rename to firmware/zynq7000-rt/LICENSE-APACHE
diff --git a/zynq/zynq7000-rt/LICENSE-MIT b/firmware/zynq7000-rt/LICENSE-MIT
similarity index 100%
rename from zynq/zynq7000-rt/LICENSE-MIT
rename to firmware/zynq7000-rt/LICENSE-MIT
diff --git a/zynq/zynq7000-rt/README.md b/firmware/zynq7000-rt/README.md
similarity index 100%
rename from zynq/zynq7000-rt/README.md
rename to firmware/zynq7000-rt/README.md
diff --git a/zynq/zynq7000-rt/build.rs b/firmware/zynq7000-rt/build.rs
similarity index 100%
rename from zynq/zynq7000-rt/build.rs
rename to firmware/zynq7000-rt/build.rs
diff --git a/zynq/zynq7000-rt/src/lib.rs b/firmware/zynq7000-rt/src/lib.rs
similarity index 100%
rename from zynq/zynq7000-rt/src/lib.rs
rename to firmware/zynq7000-rt/src/lib.rs
diff --git a/zynq/zynq7000-rt/src/mmu.rs b/firmware/zynq7000-rt/src/mmu.rs
similarity index 100%
rename from zynq/zynq7000-rt/src/mmu.rs
rename to firmware/zynq7000-rt/src/mmu.rs
diff --git a/zynq/zynq7000-rt/src/mmu_table.rs b/firmware/zynq7000-rt/src/mmu_table.rs
similarity index 100%
rename from zynq/zynq7000-rt/src/mmu_table.rs
rename to firmware/zynq7000-rt/src/mmu_table.rs
diff --git a/zynq/zynq7000-rt/src/rt.rs b/firmware/zynq7000-rt/src/rt.rs
similarity index 100%
rename from zynq/zynq7000-rt/src/rt.rs
rename to firmware/zynq7000-rt/src/rt.rs
diff --git a/zynq/zynq7000/CHANGELOG.md b/firmware/zynq7000/CHANGELOG.md
similarity index 100%
rename from zynq/zynq7000/CHANGELOG.md
rename to firmware/zynq7000/CHANGELOG.md
diff --git a/zynq/zynq7000/Cargo.toml b/firmware/zynq7000/Cargo.toml
similarity index 100%
rename from zynq/zynq7000/Cargo.toml
rename to firmware/zynq7000/Cargo.toml
diff --git a/zynq/zynq7000/LICENSE-APACHE b/firmware/zynq7000/LICENSE-APACHE
similarity index 100%
rename from zynq/zynq7000/LICENSE-APACHE
rename to firmware/zynq7000/LICENSE-APACHE
diff --git a/zynq/zynq7000/LICENSE-MIT b/firmware/zynq7000/LICENSE-MIT
similarity index 100%
rename from zynq/zynq7000/LICENSE-MIT
rename to firmware/zynq7000/LICENSE-MIT
diff --git a/zynq/zynq7000/README.md b/firmware/zynq7000/README.md
similarity index 100%
rename from zynq/zynq7000/README.md
rename to firmware/zynq7000/README.md
diff --git a/zynq/zynq7000/src/ddrc.rs b/firmware/zynq7000/src/ddrc.rs
similarity index 100%
rename from zynq/zynq7000/src/ddrc.rs
rename to firmware/zynq7000/src/ddrc.rs
diff --git a/zynq/zynq7000/src/devcfg.rs b/firmware/zynq7000/src/devcfg.rs
similarity index 100%
rename from zynq/zynq7000/src/devcfg.rs
rename to firmware/zynq7000/src/devcfg.rs
diff --git a/zynq/zynq7000/src/eth.rs b/firmware/zynq7000/src/eth.rs
similarity index 100%
rename from zynq/zynq7000/src/eth.rs
rename to firmware/zynq7000/src/eth.rs
diff --git a/zynq/zynq7000/src/gic.rs b/firmware/zynq7000/src/gic.rs
similarity index 100%
rename from zynq/zynq7000/src/gic.rs
rename to firmware/zynq7000/src/gic.rs
diff --git a/zynq/zynq7000/src/gpio.rs b/firmware/zynq7000/src/gpio.rs
similarity index 100%
rename from zynq/zynq7000/src/gpio.rs
rename to firmware/zynq7000/src/gpio.rs
diff --git a/zynq/zynq7000/src/gtc.rs b/firmware/zynq7000/src/gtc.rs
similarity index 100%
rename from zynq/zynq7000/src/gtc.rs
rename to firmware/zynq7000/src/gtc.rs
diff --git a/zynq/zynq7000/src/i2c.rs b/firmware/zynq7000/src/i2c.rs
similarity index 100%
rename from zynq/zynq7000/src/i2c.rs
rename to firmware/zynq7000/src/i2c.rs
diff --git a/zynq/zynq7000/src/l2_cache.rs b/firmware/zynq7000/src/l2_cache.rs
similarity index 100%
rename from zynq/zynq7000/src/l2_cache.rs
rename to firmware/zynq7000/src/l2_cache.rs
diff --git a/zynq/zynq7000/src/lib.rs b/firmware/zynq7000/src/lib.rs
similarity index 100%
rename from zynq/zynq7000/src/lib.rs
rename to firmware/zynq7000/src/lib.rs
diff --git a/zynq/zynq7000/src/mpcore.rs b/firmware/zynq7000/src/mpcore.rs
similarity index 100%
rename from zynq/zynq7000/src/mpcore.rs
rename to firmware/zynq7000/src/mpcore.rs
diff --git a/zynq/zynq7000/src/priv_tim.rs b/firmware/zynq7000/src/priv_tim.rs
similarity index 100%
rename from zynq/zynq7000/src/priv_tim.rs
rename to firmware/zynq7000/src/priv_tim.rs
diff --git a/zynq/zynq7000/src/qspi.rs b/firmware/zynq7000/src/qspi.rs
similarity index 100%
rename from zynq/zynq7000/src/qspi.rs
rename to firmware/zynq7000/src/qspi.rs
diff --git a/zynq/zynq7000/src/slcr/clocks.rs b/firmware/zynq7000/src/slcr/clocks.rs
similarity index 100%
rename from zynq/zynq7000/src/slcr/clocks.rs
rename to firmware/zynq7000/src/slcr/clocks.rs
diff --git a/zynq/zynq7000/src/slcr/ddriob.rs b/firmware/zynq7000/src/slcr/ddriob.rs
similarity index 100%
rename from zynq/zynq7000/src/slcr/ddriob.rs
rename to firmware/zynq7000/src/slcr/ddriob.rs
diff --git a/zynq/zynq7000/src/slcr/mio.rs b/firmware/zynq7000/src/slcr/mio.rs
similarity index 100%
rename from zynq/zynq7000/src/slcr/mio.rs
rename to firmware/zynq7000/src/slcr/mio.rs
diff --git a/zynq/zynq7000/src/slcr/mod.rs b/firmware/zynq7000/src/slcr/mod.rs
similarity index 100%
rename from zynq/zynq7000/src/slcr/mod.rs
rename to firmware/zynq7000/src/slcr/mod.rs
diff --git a/zynq/zynq7000/src/slcr/reset.rs b/firmware/zynq7000/src/slcr/reset.rs
similarity index 100%
rename from zynq/zynq7000/src/slcr/reset.rs
rename to firmware/zynq7000/src/slcr/reset.rs
diff --git a/zynq/zynq7000/src/spi.rs b/firmware/zynq7000/src/spi.rs
similarity index 100%
rename from zynq/zynq7000/src/spi.rs
rename to firmware/zynq7000/src/spi.rs
diff --git a/zynq/zynq7000/src/ttc.rs b/firmware/zynq7000/src/ttc.rs
similarity index 100%
rename from zynq/zynq7000/src/ttc.rs
rename to firmware/zynq7000/src/ttc.rs
diff --git a/zynq/zynq7000/src/uart.rs b/firmware/zynq7000/src/uart.rs
similarity index 100%
rename from zynq/zynq7000/src/uart.rs
rename to firmware/zynq7000/src/uart.rs
diff --git a/zynq/zynq7000/src/xadc.rs b/firmware/zynq7000/src/xadc.rs
similarity index 100%
rename from zynq/zynq7000/src/xadc.rs
rename to firmware/zynq7000/src/xadc.rs
diff --git a/tools/Cargo.lock b/host/Cargo.lock
similarity index 100%
rename from tools/Cargo.lock
rename to host/Cargo.lock
diff --git a/tools/Cargo.toml b/host/Cargo.toml
similarity index 81%
rename from tools/Cargo.toml
rename to host/Cargo.toml
index c3e5666..2b9e11c 100644
--- a/tools/Cargo.toml
+++ b/host/Cargo.toml
@@ -4,4 +4,5 @@ members = [
   "boot-image-test",
   "mmu-table-gen",
   "zynq7000-ps7init-extract",
+  "zynq7000-boot-image",
 ]
diff --git a/tools/boot-image-test/.gitignore b/host/boot-image-test/.gitignore
similarity index 100%
rename from tools/boot-image-test/.gitignore
rename to host/boot-image-test/.gitignore
diff --git a/tools/boot-image-test/Cargo.lock b/host/boot-image-test/Cargo.lock
similarity index 100%
rename from tools/boot-image-test/Cargo.lock
rename to host/boot-image-test/Cargo.lock
diff --git a/tools/boot-image-test/Cargo.toml b/host/boot-image-test/Cargo.toml
similarity index 69%
rename from tools/boot-image-test/Cargo.toml
rename to host/boot-image-test/Cargo.toml
index cdca892..9202755 100644
--- a/tools/boot-image-test/Cargo.toml
+++ b/host/boot-image-test/Cargo.toml
@@ -4,5 +4,5 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-zynq7000-boot-image= { path = "../../zynq7000-boot-image" }
+zynq7000-boot-image= { path = "../zynq7000-boot-image" }
 clap = { version = "4", features = ["derive"] }
diff --git a/tools/boot-image-test/src/main.rs b/host/boot-image-test/src/main.rs
similarity index 100%
rename from tools/boot-image-test/src/main.rs
rename to host/boot-image-test/src/main.rs
diff --git a/host/mmu-table-gen/Cargo.toml b/host/mmu-table-gen/Cargo.toml
new file mode 100644
index 0000000..179941b
--- /dev/null
+++ b/host/mmu-table-gen/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "mmu-table-gen"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+zynq7000-rt = { path = "../../firmware/zynq7000-rt", default-features = false }
+zynq7000-mmu = { path = "../../firmware/zynq7000-mmu", features = ["tools"] }
diff --git a/tools/mmu-table-gen/src/main.rs b/host/mmu-table-gen/src/main.rs
similarity index 100%
rename from tools/mmu-table-gen/src/main.rs
rename to host/mmu-table-gen/src/main.rs
diff --git a/zynq7000-boot-image/.gitignore b/host/zynq7000-boot-image/.gitignore
similarity index 100%
rename from zynq7000-boot-image/.gitignore
rename to host/zynq7000-boot-image/.gitignore
diff --git a/zynq7000-boot-image/Cargo.toml b/host/zynq7000-boot-image/Cargo.toml
similarity index 100%
rename from zynq7000-boot-image/Cargo.toml
rename to host/zynq7000-boot-image/Cargo.toml
diff --git a/zynq7000-boot-image/src/lib.rs b/host/zynq7000-boot-image/src/lib.rs
similarity index 100%
rename from zynq7000-boot-image/src/lib.rs
rename to host/zynq7000-boot-image/src/lib.rs
diff --git a/zynq7000-boot-image/staging/.gitignore b/host/zynq7000-boot-image/staging/.gitignore
similarity index 100%
rename from zynq7000-boot-image/staging/.gitignore
rename to host/zynq7000-boot-image/staging/.gitignore
diff --git a/zynq7000-boot-image/staging/README.md b/host/zynq7000-boot-image/staging/README.md
similarity index 100%
rename from zynq7000-boot-image/staging/README.md
rename to host/zynq7000-boot-image/staging/README.md
diff --git a/zynq7000-boot-image/staging/boot.bif b/host/zynq7000-boot-image/staging/boot.bif
similarity index 100%
rename from zynq7000-boot-image/staging/boot.bif
rename to host/zynq7000-boot-image/staging/boot.bif
diff --git a/tools/zynq7000-ps7init-extract/.gitignore b/host/zynq7000-ps7init-extract/.gitignore
similarity index 100%
rename from tools/zynq7000-ps7init-extract/.gitignore
rename to host/zynq7000-ps7init-extract/.gitignore
diff --git a/tools/zynq7000-ps7init-extract/Cargo.lock b/host/zynq7000-ps7init-extract/Cargo.lock
similarity index 100%
rename from tools/zynq7000-ps7init-extract/Cargo.lock
rename to host/zynq7000-ps7init-extract/Cargo.lock
diff --git a/tools/zynq7000-ps7init-extract/Cargo.toml b/host/zynq7000-ps7init-extract/Cargo.toml
similarity index 82%
rename from tools/zynq7000-ps7init-extract/Cargo.toml
rename to host/zynq7000-ps7init-extract/Cargo.toml
index 27b5b51..ddc99c0 100644
--- a/tools/zynq7000-ps7init-extract/Cargo.toml
+++ b/host/zynq7000-ps7init-extract/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2024"
 
 [dependencies]
 clap = { version = "4", features = ["derive"] }
-zynq7000 = { path = "../../zynq/zynq7000" }
+zynq7000 = { path = "../../firmware/zynq7000" }
 log = "0.4"
 simple_logger = "5"
 regex = "1"
diff --git a/tools/zynq7000-ps7init-extract/README.md b/host/zynq7000-ps7init-extract/README.md
similarity index 100%
rename from tools/zynq7000-ps7init-extract/README.md
rename to host/zynq7000-ps7init-extract/README.md
diff --git a/tools/zynq7000-ps7init-extract/src/main.rs b/host/zynq7000-ps7init-extract/src/main.rs
similarity index 100%
rename from tools/zynq7000-ps7init-extract/src/main.rs
rename to host/zynq7000-ps7init-extract/src/main.rs
diff --git a/justfile b/justfile
index 13aac3e..7b42148 100644
--- a/justfile
+++ b/justfile
@@ -1,10 +1,10 @@
 all: check-all build-all clean-all fmt-all clippy-all docs-zynq
 
-check-all: (check "zynq") (check "tools") (check "zynq7000-boot-image")
-clean-all: (clean "zynq") (clean "tools") (clean "zynq7000-boot-image")
-build-all: build-zynq (build "tools") (build "zynq7000-boot-image")
-fmt-all: (fmt "zynq") (fmt "tools") (fmt "zynq7000-boot-image")
-clippy-all: (clippy "zynq") (clippy "tools") (clippy "zynq7000-boot-image")
+check-all: (check "firmware") (check "host")
+clean-all: (clean "firmware") (clean "host")
+build-all: build-zynq (build "host")
+fmt-all: (fmt "firmware") (fmt "host")
+clippy-all: (clippy "firmware") (clippy "host")
 
 check target:
   cd {{target}} && cargo check
@@ -12,8 +12,8 @@ check target:
 build target:
   cd {{target}} && cargo build
 
-build-zynq: (build "zynq")
-  cd "zynq/zedboard-fsbl" && cargo build --release
+build-zynq: (build "firmware")
+  cd "firmware/zedboard-fsbl" && cargo build --release
 
 clean target:
   cd {{target}} && cargo clean
@@ -24,24 +24,24 @@ fmt target:
 clippy target:
   cd {{target}} && cargo clippy -- -D warnings
 
-[working-directory: 'zynq']
+[working-directory: 'firmware']
 docs-zynq: docs-pac docs-hal
   RUSTDOCFLAGS="--cfg docsrs --generate-link-to-definition -Z unstable-options" cargo +nightly doc -p zynq7000-mmu
   RUSTDOCFLAGS="--cfg docsrs --generate-link-to-definition -Z unstable-options" cargo +nightly doc -p zynq7000-rt
-[working-directory: 'zynq']
+[working-directory: 'firmware']
 docs-pac:
   RUSTDOCFLAGS="--cfg docsrs --generate-link-to-definition -Z unstable-options" cargo +nightly doc -p zynq7000
-[working-directory: 'zynq']
+[working-directory: 'firmware']
 docs-pac-html:
   RUSTDOCFLAGS="--cfg docsrs --generate-link-to-definition -Z unstable-options" cargo +nightly doc -p zynq7000 --open
-[working-directory: 'zynq']
+[working-directory: 'firmware']
 docs-hal:
   RUSTDOCFLAGS="--cfg docsrs --generate-link-to-definition -Z unstable-options" cargo +nightly doc -p zynq7000-hal --features alloc --no-deps
-[working-directory: 'zynq']
+[working-directory: 'firmware']
 docs-hal-html:
   RUSTDOCFLAGS="--cfg docsrs --generate-link-to-definition -Z unstable-options" cargo +nightly doc -p zynq7000-hal --features alloc --open
 
-[working-directory: 'zynq-boot-image/staging']
+[working-directory: 'firmware/zynq-boot-image/staging']
 bootgen:
   bootgen -arch zynq -image boot.bif -o boot.bin -w on
   echo "Generated boot.bin at zynq-boot-image/staging"
diff --git a/tools/mmu-table-gen/Cargo.toml b/tools/mmu-table-gen/Cargo.toml
deleted file mode 100644
index 9736709..0000000
--- a/tools/mmu-table-gen/Cargo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[package]
-name = "mmu-table-gen"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-zynq7000-rt = { path = "../../zynq/zynq7000-rt", default-features = false }
-zynq7000-mmu = { path = "../../zynq/zynq7000-mmu", features = ["tools"] }