diff --git a/src/riot-rs-embassy/src/arch/dummy/gpio.rs b/src/riot-rs-embassy/src/arch/dummy/gpio.rs
new file mode 100644
index 000000000..13d28a9e1
--- /dev/null
+++ b/src/riot-rs-embassy/src/arch/dummy/gpio.rs
@@ -0,0 +1 @@
+//! See your architecture's Embassy crate documentation.
diff --git a/src/riot-rs-embassy/src/arch/dummy/mod.rs b/src/riot-rs-embassy/src/arch/dummy/mod.rs
index c98e4919b..c81de58c6 100644
--- a/src/riot-rs-embassy/src/arch/dummy/mod.rs
+++ b/src/riot-rs-embassy/src/arch/dummy/mod.rs
@@ -1,6 +1,7 @@
 //! Dummy module used to satisfy platform-independent tooling.
 
 mod executor;
+pub mod gpio;
 
 #[cfg(feature = "hwrng")]
 pub mod hwrng;
diff --git a/src/riot-rs-embassy/src/arch/esp/gpio.rs b/src/riot-rs-embassy/src/arch/esp/gpio.rs
new file mode 100644
index 000000000..ee1fdeab6
--- /dev/null
+++ b/src/riot-rs-embassy/src/arch/esp/gpio.rs
@@ -0,0 +1 @@
+pub use esp_hal::gpio::*;
diff --git a/src/riot-rs-embassy/src/arch/esp.rs b/src/riot-rs-embassy/src/arch/esp/mod.rs
similarity index 98%
rename from src/riot-rs-embassy/src/arch/esp.rs
rename to src/riot-rs-embassy/src/arch/esp/mod.rs
index 52bbc47bb..6e1479122 100644
--- a/src/riot-rs-embassy/src/arch/esp.rs
+++ b/src/riot-rs-embassy/src/arch/esp/mod.rs
@@ -1,3 +1,5 @@
+pub mod gpio;
+
 use esp_hal::{clock::ClockControl, embassy, prelude::*, timer::TimerGroup};
 
 pub use esp_hal::{
diff --git a/src/riot-rs-embassy/src/arch/nrf/gpio.rs b/src/riot-rs-embassy/src/arch/nrf/gpio.rs
new file mode 100644
index 000000000..ce0063a94
--- /dev/null
+++ b/src/riot-rs-embassy/src/arch/nrf/gpio.rs
@@ -0,0 +1 @@
+pub use embassy_nrf::gpio::*;
diff --git a/src/riot-rs-embassy/src/arch/nrf/mod.rs b/src/riot-rs-embassy/src/arch/nrf/mod.rs
index 1dccaf5cf..623311a7c 100644
--- a/src/riot-rs-embassy/src/arch/nrf/mod.rs
+++ b/src/riot-rs-embassy/src/arch/nrf/mod.rs
@@ -1,3 +1,5 @@
+pub mod gpio;
+
 #[cfg(feature = "hwrng")]
 pub mod hwrng;
 
diff --git a/src/riot-rs-embassy/src/arch/rp2040/gpio.rs b/src/riot-rs-embassy/src/arch/rp2040/gpio.rs
new file mode 100644
index 000000000..2aaf7978e
--- /dev/null
+++ b/src/riot-rs-embassy/src/arch/rp2040/gpio.rs
@@ -0,0 +1 @@
+pub use embassy_rp::gpio::*;
diff --git a/src/riot-rs-embassy/src/arch/rp2040/mod.rs b/src/riot-rs-embassy/src/arch/rp2040/mod.rs
index 7c3e53eb8..81d720d73 100644
--- a/src/riot-rs-embassy/src/arch/rp2040/mod.rs
+++ b/src/riot-rs-embassy/src/arch/rp2040/mod.rs
@@ -1,3 +1,5 @@
+pub mod gpio;
+
 #[cfg(feature = "usb")]
 pub mod usb;
 
diff --git a/src/riot-rs-embassy/src/lib.rs b/src/riot-rs-embassy/src/lib.rs
index e9c726d2b..4c25107dd 100644
--- a/src/riot-rs-embassy/src/lib.rs
+++ b/src/riot-rs-embassy/src/lib.rs
@@ -14,7 +14,7 @@ cfg_if::cfg_if! {
         #[path = "arch/rp2040/mod.rs"]
         pub mod arch;
     } else if #[cfg(context = "esp")] {
-        #[path = "arch/esp.rs"]
+        #[path = "arch/esp/mod.rs"]
         pub mod arch;
     } else if #[cfg(context = "riot-rs")] {
         compile_error!("this architecture is not supported");