diff --git a/Cargo.toml b/Cargo.toml
index 77c2c030..9bb3bc2c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,13 +36,13 @@ libtock_i2c_master = { path = "apis/peripherals/i2c_master" }
 libtock_i2c_master_slave = { path = "apis/peripherals/i2c_master_slave" }
 libtock_key_value = { path = "apis/storage/key_value" }
 libtock_leds = { path = "apis/interface/leds" }
-libtock_servo = { path = "apis/interface/servo" }
 libtock_low_level_debug = { path = "apis/kernel/low_level_debug" }
 libtock_ninedof = { path = "apis/sensors/ninedof" }
 libtock_platform = { path = "platform" }
 libtock_proximity = { path = "apis/sensors/proximity" }
 libtock_rng = { path = "apis/peripherals/rng" }
 libtock_runtime = { path = "runtime" }
+libtock_servo = { path = "apis/interface/servo" }
 libtock_small_panic = { path = "panic_handlers/small_panic" }
 libtock_sound_pressure = { path = "apis/sensors/sound_pressure" }
 libtock_spi_controller = { path = "apis/peripherals/spi_controller" }
@@ -70,9 +70,9 @@ exclude = ["tock"]
 members = [
     "apis/interface/buttons",
     "apis/interface/buzzer",
-    "apis/interface/servo",
     "apis/interface/console",
     "apis/interface/leds",
+    "apis/interface/servo",
     "apis/kernel/low_level_debug",
     "apis/peripherals/adc",
     "apis/peripherals/alarm",
diff --git a/src/lib.rs b/src/lib.rs
index 853de44d..5632f5b6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -66,10 +66,6 @@ pub mod leds {
     use libtock_leds as leds;
     pub type Leds = leds::Leds<super::runtime::TockSyscalls>;
 }
-pub mod servo {
-    use libtock_servo as servo;
-    pub type Servo = servo::Servo<super::runtime::TockSyscalls>;
-}
 pub mod low_level_debug {
     use libtock_low_level_debug as lldb;
     pub type LowLevelDebug = lldb::LowLevelDebug<super::runtime::TockSyscalls>;
@@ -89,6 +85,10 @@ pub mod rng {
     pub type Rng = rng::Rng<super::runtime::TockSyscalls>;
     pub use rng::RngListener;
 }
+pub mod servo {
+    use libtock_servo as servo;
+    pub type Servo = servo::Servo<super::runtime::TockSyscalls>;
+}
 pub mod sound_pressure {
     use libtock_sound_pressure as sound_pressure;
     pub type SoundPressure = sound_pressure::SoundPressure<super::runtime::TockSyscalls>;