diff --git a/conf/airframes/flixr_discovery.xml b/conf/airframes/flixr_discovery.xml
index 2f4019f0cc..67f58b3f8e 100644
--- a/conf/airframes/flixr_discovery.xml
+++ b/conf/airframes/flixr_discovery.xml
@@ -40,7 +40,7 @@ http://paparazzi.enac.fr/w/index.php?title=Theory_of_Operation
     <subsystem name="ahrs" type="float_dcm"/>
 
     <!-- Sensors -->
-    <subsystem name="imu" type="booz"/>
+    <subsystem name="imu" type="b2_v1.0"/>
     <subsystem name="gps" type="ublox"/>
     <subsystem name="current_sensor">
       <configure name="ADC_CURRENT_SENSOR" value="ADC_3"/>
diff --git a/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.0.makefile b/conf/autopilot/subsystems/shared/imu_b2_v1.0.makefile
similarity index 100%
rename from conf/autopilot/subsystems/rotorcraft/imu_b2_v1.0.makefile
rename to conf/autopilot/subsystems/shared/imu_b2_v1.0.makefile
diff --git a/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile b/conf/autopilot/subsystems/shared/imu_b2_v1.1.makefile
similarity index 100%
rename from conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile
rename to conf/autopilot/subsystems/shared/imu_b2_v1.1.makefile
diff --git a/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.2.makefile b/conf/autopilot/subsystems/shared/imu_b2_v1.2.makefile
similarity index 100%
rename from conf/autopilot/subsystems/rotorcraft/imu_b2_v1.2.makefile
rename to conf/autopilot/subsystems/shared/imu_b2_v1.2.makefile