diff --git a/conf/airframes/esden/quady_ll11a2pwm.xml b/conf/airframes/esden/quady_ll11a2pwm.xml
diff --git a/conf/airframes/esden/lisa_m_pwm.xml → conf/airframes/esden/quady_lm1a1pwm.xml b/conf/airframes/esden/lisa_m_pwm.xml → conf/airframes/esden/quady_lm1a1pwm.xml
diff --git a/conf/airframes/esden/lisa_m_2_asp_2_pwm.xml → conf/airframes/esden/quady_lm2a2pwm.xml b/conf/airframes/esden/lisa_m_2_asp_2_pwm.xml → conf/airframes/esden/quady_lm2a2pwm.xml
diff --git a/conf/airframes/esden/synerani_4B.xml b/conf/airframes/esden/synerani_4B.xml
diff --git a/conf/airframes/examples/booz2.xml b/conf/airframes/examples/booz2.xml
diff --git a/.../airframes/delta_wing_minimal_example.xml → ...airframes/examples/delta_wing_minimal.xml b/.../airframes/delta_wing_minimal_example.xml → ...airframes/examples/delta_wing_minimal.xml
diff --git a/conf/airframes/demo.xml → conf/airframes/examples/demo.xml b/conf/airframes/demo.xml → conf/airframes/examples/demo.xml
diff --git a/conf/airframes/demo_module.xml → conf/airframes/examples/demo_module.xml b/conf/airframes/demo_module.xml → conf/airframes/examples/demo_module.xml
diff --git a/conf/airframes/easy_glider_example.xml → conf/airframes/examples/easy_glider.xml b/conf/airframes/easy_glider_example.xml → conf/airframes/examples/easy_glider.xml
diff --git a/conf/airframes/easystar_example.xml → conf/airframes/examples/easystar.xml b/conf/airframes/easystar_example.xml → conf/airframes/examples/easystar.xml
diff --git a/conf/airframes/easystar_ets_example.xml → conf/airframes/examples/easystar_ets.xml b/conf/airframes/easystar_ets_example.xml → conf/airframes/examples/easystar_ets.xml
diff --git a/conf/airframes/funjet_example.xml → conf/airframes/examples/funjet.xml b/conf/airframes/funjet_example.xml → conf/airframes/examples/funjet.xml
diff --git a/conf/airframes/funjet_cam_example.xml → conf/airframes/examples/funjet_cam.xml b/conf/airframes/funjet_cam_example.xml → conf/airframes/examples/funjet_cam.xml
diff --git a/conf/airframes/examples/h_hex.xml b/conf/airframes/examples/h_hex.xml
diff --git a/conf/airframes/esden/lisa_asctec.xml → conf/airframes/examples/lisa_asctec.xml b/conf/airframes/esden/lisa_asctec.xml → conf/airframes/examples/lisa_asctec.xml
diff --git a/conf/airframes/microjet_example.xml → conf/airframes/examples/microjet.xml b/conf/airframes/microjet_example.xml → conf/airframes/examples/microjet.xml
diff --git a/conf/airframes/examples/microjet_lisa_m.xml b/conf/airframes/examples/microjet_lisa_m.xml
diff --git a/conf/airframes/examples/quadrotor_lisa_m_2_pwm.xml b/conf/airframes/examples/quadrotor_lisa_m_2_pwm.xml
diff --git a/conf/airframes/examples/quadrotor_lisa_m_mkk.xml b/conf/airframes/examples/quadrotor_lisa_m_mkk.xml
diff --git a/conf/airframes/examples/setup_lisam2.xml b/conf/airframes/examples/setup_lisam2.xml
diff --git a/conf/airframes/twinjet_example.xml → conf/airframes/examples/twinjet.xml b/conf/airframes/twinjet_example.xml → conf/airframes/examples/twinjet.xml
diff --git a/conf/airframes/twinstar_example.xml → conf/airframes/examples/twinstar.xml b/conf/airframes/twinstar_example.xml → conf/airframes/examples/twinstar.xml
diff --git a/conf/airframes/example_twog_analogimu.xml → conf/airframes/examples/twog_analogimu.xml b/conf/airframes/example_twog_analogimu.xml → conf/airframes/examples/twog_analogimu.xml
diff --git a/conf/airframes/flixr_discovery.xml b/conf/airframes/flixr_discovery.xml
diff --git a/conf/airframes/fraser_lisa_m_rotorcraft.xml b/conf/airframes/fraser_lisa_m_rotorcraft.xml
diff --git a/conf/airframes/jsbsim.xml b/conf/airframes/jsbsim.xml
diff --git a/conf/airframes/logger_sd.xml b/conf/airframes/logger_sd.xml
diff --git a/conf/airframes/logomatic.xml b/conf/airframes/logomatic.xml
diff --git a/conf/airframes/mentor_tum.xml b/conf/airframes/mentor_tum.xml
diff --git a/conf/airframes/mm/extra/logger_sd_adc.xml b/conf/airframes/mm/extra/logger_sd_adc.xml
diff --git a/conf/airframes/mm/extra/logger_sd_twog.xml b/conf/airframes/mm/extra/logger_sd_twog.xml
diff --git a/conf/airframes/mm/extra/press_t.xml b/conf/airframes/mm/extra/press_t.xml
diff --git a/conf/airframes/mm/extra/probe_t.xml b/conf/airframes/mm/extra/probe_t.xml
diff --git a/conf/airframes/mm/extra/quiet.xml b/conf/airframes/mm/extra/quiet.xml
diff --git a/conf/airframes/mm/extra/rctx.xml b/conf/airframes/mm/extra/rctx.xml
diff --git a/conf/airframes/mm/extra/turbine_trigger.xml b/conf/airframes/mm/extra/turbine_trigger.xml
diff --git a/conf/airframes/mm/fixed-wing/drops.xml b/conf/airframes/mm/fixed-wing/drops.xml
diff --git a/conf/airframes/mm/fixed-wing/funjet43.xml b/conf/airframes/mm/fixed-wing/funjet43.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetdca.xml b/conf/airframes/mm/fixed-wing/funjetdca.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetdcb.xml b/conf/airframes/mm/fixed-wing/funjetdcb.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetdcc.xml b/conf/airframes/mm/fixed-wing/funjetdcc.xml
diff --git a/conf/airframes/mm/fixed-wing/funjeteth1.xml b/conf/airframes/mm/fixed-wing/funjeteth1.xml
diff --git a/conf/airframes/mm/fixed-wing/funjeteth2.xml b/conf/airframes/mm/fixed-wing/funjeteth2.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetfmi1.xml b/conf/airframes/mm/fixed-wing/funjetfmi1.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetfmi2.xml b/conf/airframes/mm/fixed-wing/funjetfmi2.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetfmi3.xml b/conf/airframes/mm/fixed-wing/funjetfmi3.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi1.xml b/conf/airframes/mm/fixed-wing/funjetgfi1.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi3.xml b/conf/airframes/mm/fixed-wing/funjetgfi3.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi4.xml b/conf/airframes/mm/fixed-wing/funjetgfi4.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi5.xml b/conf/airframes/mm/fixed-wing/funjetgfi5.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi6.xml b/conf/airframes/mm/fixed-wing/funjetgfi6.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi7.xml b/conf/airframes/mm/fixed-wing/funjetgfi7.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi8.xml b/conf/airframes/mm/fixed-wing/funjetgfi8.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi9.xml b/conf/airframes/mm/fixed-wing/funjetgfi9.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetlisa.xml b/conf/airframes/mm/fixed-wing/funjetlisa.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetlisam.xml b/conf/airframes/mm/fixed-wing/funjetlisam.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetmm.xml b/conf/airframes/mm/fixed-wing/funjetmm.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetmm2.xml b/conf/airframes/mm/fixed-wing/funjetmm2.xml
diff --git a/conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml b/conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
diff --git a/conf/airframes/mm/fixed-wing/merlin.xml b/conf/airframes/mm/fixed-wing/merlin.xml
diff --git a/conf/airframes/mm/fixed-wing/miniwing.xml b/conf/airframes/mm/fixed-wing/miniwing.xml
diff --git a/conf/airframes/mm/fixed-wing/slowfast.xml b/conf/airframes/mm/fixed-wing/slowfast.xml
diff --git a/conf/airframes/mm/fixed-wing/slowfast2.xml b/conf/airframes/mm/fixed-wing/slowfast2.xml
diff --git a/conf/airframes/mm/fixed-wing/trojan.xml b/conf/airframes/mm/fixed-wing/trojan.xml
diff --git a/conf/airframes/mm/fixed-wing/twinstarmm.xml b/conf/airframes/mm/fixed-wing/twinstarmm.xml
diff --git a/conf/airframes/mm/hangar/black_one.xml b/conf/airframes/mm/hangar/black_one.xml
diff --git a/conf/airframes/mm/hangar/glass_one1.xml b/conf/airframes/mm/hangar/glass_one1.xml
diff --git a/conf/airframes/mm/hangar/glass_one2.xml b/conf/airframes/mm/hangar/glass_one2.xml
diff --git a/conf/airframes/mm/hangar/glass_one3.xml b/conf/airframes/mm/hangar/glass_one3.xml
diff --git a/conf/airframes/mm/hangar/lila.xml b/conf/airframes/mm/hangar/lila.xml
diff --git a/conf/airframes/mm/hangar/mac06a.xml b/conf/airframes/mm/hangar/mac06a.xml
diff --git a/conf/airframes/mm/hangar/red_one.xml b/conf/airframes/mm/hangar/red_one.xml
diff --git a/conf/airframes/mm/rotor/qmk1.xml b/conf/airframes/mm/rotor/qmk1.xml
diff --git a/conf/airframes/mm/rotor/quadrotor_lisa_l_mkk.xml b/conf/airframes/mm/rotor/quadrotor_lisa_l_mkk.xml
diff --git a/conf/airframes/mm/rotor/quadrotor_lisa_m_1_pwm.xml b/conf/airframes/mm/rotor/quadrotor_lisa_m_1_pwm.xml
diff --git a/conf/airframes/mm/rotor/quadrotor_lisa_m_2_pwm.xml b/conf/airframes/mm/rotor/quadrotor_lisa_m_2_pwm.xml
diff --git a/conf/airframes/ENAC/quadrotor/g1_vision.xml → conf/airframes/obsolete/ENAC/g1_vision.xml b/conf/airframes/ENAC/quadrotor/g1_vision.xml → conf/airframes/obsolete/ENAC/g1_vision.xml
diff --git a/.../airframes/ENAC/quadrotor/mkk1-vision.xml → conf/airframes/obsolete/ENAC/mkk1-vision.xml b/.../airframes/ENAC/quadrotor/mkk1-vision.xml → conf/airframes/obsolete/ENAC/mkk1-vision.xml
diff --git a/conf/airframes/ENAC/quadrotor/mkk1.xml → conf/airframes/obsolete/ENAC/mkk1.xml b/conf/airframes/ENAC/quadrotor/mkk1.xml → conf/airframes/obsolete/ENAC/mkk1.xml
diff --git a/conf/airframes/ENAC/quadrotor/nova1.xml → conf/airframes/obsolete/ENAC/nova1.xml b/conf/airframes/ENAC/quadrotor/nova1.xml → conf/airframes/obsolete/ENAC/nova1.xml
diff --git a/...quadrotor/ppzuav_booz2_asctec_example.xml → ...quadrotor/ppzuav_booz2_asctec_example.xml b/...quadrotor/ppzuav_booz2_asctec_example.xml → ...quadrotor/ppzuav_booz2_asctec_example.xml
diff --git a/...AV/quadrotor/ppzuav_booz2_mkk_example.xml → ...AV/quadrotor/ppzuav_booz2_mkk_example.xml b/...AV/quadrotor/ppzuav_booz2_mkk_example.xml → ...AV/quadrotor/ppzuav_booz2_mkk_example.xml
diff --git a/conf/airframes/UofAdelaide/A1000_BOOZ.xml → ...rames/obsolete/UofAdelaide/A1000_BOOZ.xml b/conf/airframes/UofAdelaide/A1000_BOOZ.xml → ...rames/obsolete/UofAdelaide/A1000_BOOZ.xml
diff --git a/conf/airframes/UofAdelaide/A1000_LISA.xml → ...rames/obsolete/UofAdelaide/A1000_LISA.xml b/conf/airframes/UofAdelaide/A1000_LISA.xml → ...rames/obsolete/UofAdelaide/A1000_LISA.xml
diff --git a/conf/airframes/UofAdelaide/A1000_NOVA.xml → ...rames/obsolete/UofAdelaide/A1000_NOVA.xml b/conf/airframes/UofAdelaide/A1000_NOVA.xml → ...rames/obsolete/UofAdelaide/A1000_NOVA.xml
diff --git a/...rames/UofAdelaide/booz2_NoVa_001_1000.xml → ...olete/UofAdelaide/booz2_NoVa_001_1000.xml b/...rames/UofAdelaide/booz2_NoVa_001_1000.xml → ...olete/UofAdelaide/booz2_NoVa_001_1000.xml
diff --git a/conf/airframes/UofAdelaide/booz2_a1000.xml → ...ames/obsolete/UofAdelaide/booz2_a1000.xml b/conf/airframes/UofAdelaide/booz2_a1000.xml → ...ames/obsolete/UofAdelaide/booz2_a1000.xml
diff --git a/conf/airframes/UofAdelaide/lisa_a1000.xml → ...rames/obsolete/UofAdelaide/lisa_a1000.xml b/conf/airframes/UofAdelaide/lisa_a1000.xml → ...rames/obsolete/UofAdelaide/lisa_a1000.xml
diff --git a/conf/airframes/obsolete/autoplato.xml b/conf/airframes/obsolete/autoplato.xml
diff --git a/conf/airframes/obsolete/booz2_Aron.xml b/conf/airframes/obsolete/booz2_Aron.xml
diff --git a/conf/airframes/obsolete/booz2_NoVa.xml b/conf/airframes/obsolete/booz2_NoVa.xml
diff --git a/conf/airframes/obsolete/booz2_NoVa_001.xml b/conf/airframes/obsolete/booz2_NoVa_001.xml
diff --git a/conf/airframes/obsolete/booz2_NoVa_002.xml b/conf/airframes/obsolete/booz2_NoVa_002.xml
diff --git a/conf/airframes/Poine/booz2_a1p.xml → conf/airframes/obsolete/booz2_a1p.xml b/conf/airframes/Poine/booz2_a1p.xml → conf/airframes/obsolete/booz2_a1p.xml
diff --git a/conf/airframes/obsolete/booz2_a2.xml b/conf/airframes/obsolete/booz2_a2.xml
diff --git a/conf/airframes/obsolete/booz2_a3.xml b/conf/airframes/obsolete/booz2_a3.xml
diff --git a/conf/airframes/obsolete/booz2_a4.xml b/conf/airframes/obsolete/booz2_a4.xml
diff --git a/conf/airframes/obsolete/booz2_a5.xml b/conf/airframes/obsolete/booz2_a5.xml
diff --git a/conf/airframes/obsolete/booz2_s1.xml b/conf/airframes/obsolete/booz2_s1.xml
diff --git a/conf/airframes/obsolete/booz2_x1.xml b/conf/airframes/obsolete/booz2_x1.xml
diff --git a/conf/airframes/obsolete/easystar2.xml b/conf/airframes/obsolete/easystar2.xml
diff --git a/conf/airframes/obsolete/example_heli_lisam.xml b/conf/airframes/obsolete/example_heli_lisam.xml
diff --git a/conf/airframes/obsolete/hitl_usb.xml b/conf/airframes/obsolete/hitl_usb.xml
diff --git a/conf/airframes/obsolete/kalscott_easystar.xml b/conf/airframes/obsolete/kalscott_easystar.xml
diff --git a/conf/airframes/obsolete/malolo_sim.xml b/conf/airframes/obsolete/malolo_sim.xml
diff --git a/conf/airframes/obsolete/microjet5.xml b/conf/airframes/obsolete/microjet5.xml
diff --git a/conf/airframes/obsolete/microjet5_tp_auto.xml b/conf/airframes/obsolete/microjet5_tp_auto.xml
diff --git a/conf/airframes/obsolete/microjet6.xml b/conf/airframes/obsolete/microjet6.xml
diff --git a/conf/airframes/obsolete/microjetI.xml b/conf/airframes/obsolete/microjetI.xml
diff --git a/conf/airframes/obsolete/microjetII.xml b/conf/airframes/obsolete/microjetII.xml
diff --git a/conf/airframes/obsolete/microjetIII.xml b/conf/airframes/obsolete/microjetIII.xml
diff --git a/conf/airframes/obsolete/microjet_raw_makefile.xml b/conf/airframes/obsolete/microjet_raw_makefile.xml
diff --git a/conf/airframes/obsolete/minimag1.xml b/conf/airframes/obsolete/minimag1.xml
diff --git a/conf/airframes/obsolete/minimag_fs.xml b/conf/airframes/obsolete/minimag_fs.xml
diff --git a/conf/airframes/obsolete/mmlaas_N1_carto_cam.xml b/conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
diff --git a/conf/airframes/obsolete/osam_xsens_twog.xml b/conf/airframes/obsolete/osam_xsens_twog.xml
diff --git a/conf/airframes/obsolete/slayer1.xml b/conf/airframes/obsolete/slayer1.xml
diff --git a/conf/airframes/obsolete/slayer3.xml b/conf/airframes/obsolete/slayer3.xml
diff --git a/conf/airframes/obsolete/slayerJH.xml b/conf/airframes/obsolete/slayerJH.xml
diff --git a/conf/airframes/obsolete/slicer1.xml b/conf/airframes/obsolete/slicer1.xml
diff --git a/conf/airframes/obsolete/slicer2.xml b/conf/airframes/obsolete/slicer2.xml
diff --git a/conf/airframes/obsolete/spirit.xml b/conf/airframes/obsolete/spirit.xml
diff --git a/conf/airframes/obsolete/spirit_proto.xml b/conf/airframes/obsolete/spirit_proto.xml
diff --git a/conf/airframes/obsolete/storm1.xml b/conf/airframes/obsolete/storm1.xml
diff --git a/conf/airframes/test_hb.xml → conf/airframes/obsolete/test_hb.xml b/conf/airframes/test_hb.xml → conf/airframes/obsolete/test_hb.xml
diff --git a/conf/airframes/obsolete/tiny2.xml b/conf/airframes/obsolete/tiny2.xml
diff --git a/conf/airframes/obsolete/tiny_hitl.xml b/conf/airframes/obsolete/tiny_hitl.xml
diff --git a/conf/airframes/obsolete/tl.xml b/conf/airframes/obsolete/tl.xml
diff --git a/conf/airframes/obsolete/twinjet1.xml b/conf/airframes/obsolete/twinjet1.xml
diff --git a/conf/airframes/obsolete/twinstar1.xml b/conf/airframes/obsolete/twinstar1.xml
diff --git a/conf/airframes/obsolete/twinstar6.xml b/conf/airframes/obsolete/twinstar6.xml
diff --git a/conf/airframes/obsolete/twisted.xml b/conf/airframes/obsolete/twisted.xml
diff --git a/conf/airframes/obsolete/tyto1.xml b/conf/airframes/obsolete/tyto1.xml
diff --git a/conf/airframes/obsolete/whirly.xml b/conf/airframes/obsolete/whirly.xml
diff --git a/conf/airframes/obsolete/xxx1.xml b/conf/airframes/obsolete/xxx1.xml
diff --git a/conf/airframes/twinjet_overo.xml b/conf/airframes/twinjet_overo.xml
diff --git a/conf/airframes/usb_test.xml b/conf/airframes/usb_test.xml
diff --git a/conf/autopilot/subsystems/booz2_fms_datalink.makefile b/conf/autopilot/subsystems/booz2_fms_datalink.makefile
diff --git a/conf/autopilot/subsystems/booz2_fms_test_signal.makefile b/conf/autopilot/subsystems/booz2_fms_test_signal.makefile
diff --git a/conf/autopilot/subsystems/booz2_gps_core.makefile b/conf/autopilot/subsystems/booz2_gps_core.makefile
diff --git a/conf/autopilot/subsystems/booz2_radio_control_dummy.makefile b/conf/autopilot/subsystems/booz2_radio_control_dummy.makefile
diff --git a/conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile b/conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
diff --git a/conf/autopilot/subsystems/fixedwing/telemetry_dummy.makefile b/conf/autopilot/subsystems/fixedwing/telemetry_dummy.makefile
diff --git a/conf/autopilot/subsystems/rotorcraft/actuators_pwm_supervision.makefile b/conf/autopilot/subsystems/rotorcraft/actuators_pwm_supervision.makefile
diff --git a/conf/autopilot/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile b/conf/autopilot/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
diff --git a/conf/autopilot/subsystems/rotorcraft/ahrs_mlkf.makefile b/conf/autopilot/subsystems/rotorcraft/ahrs_mlkf.makefile
diff --git a/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile b/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
diff --git a/conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile b/conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile
diff --git a/conf/autopilot/subsystems/shared/imu_aspirin_v2.0.makefile b/conf/autopilot/subsystems/shared/imu_aspirin_v2.0.makefile
diff --git a/conf/boards/lisa_l_1.0.makefile b/conf/boards/lisa_l_1.0.makefile
diff --git a/conf/boards/lisa_l_1.1.makefile b/conf/boards/lisa_l_1.1.makefile
diff --git a/conf/boards/lisa_m_1.0.makefile b/conf/boards/lisa_m_1.0.makefile
diff --git a/conf/boards/lisa_m_2.0.makefile b/conf/boards/lisa_m_2.0.makefile
diff --git a/conf/boards/logom_2.6.makefile b/conf/boards/logom_2.6.makefile
diff --git a/conf/boards/navgo_1.0.makefile b/conf/boards/navgo_1.0.makefile
diff --git a/conf/boards/sdlog_1.0.makefile b/conf/boards/sdlog_1.0.makefile
diff --git a/conf/boards/tiny_0.99.makefile b/conf/boards/tiny_0.99.makefile
diff --git a/conf/boards/tiny_1.1.makefile b/conf/boards/tiny_1.1.makefile
diff --git a/conf/boards/tiny_2.1.makefile b/conf/boards/tiny_2.1.makefile
diff --git a/conf/boards/tiny_2.11.makefile b/conf/boards/tiny_2.11.makefile
diff --git a/conf/boards/twog_1.0.makefile b/conf/boards/twog_1.0.makefile
diff --git a/conf/boards/twog_1.makefile b/conf/boards/twog_1.makefile
diff --git a/conf/boards/umarim_1.0.makefile b/conf/boards/umarim_1.0.makefile
diff --git a/conf/conf.xml.example b/conf/conf.xml.example
diff --git a/conf/control_panel.xml.example b/conf/control_panel.xml.example
diff --git a/conf/autopilot/booz2_common.makefile → conf/firmwares/booz2_common.makefile b/conf/autopilot/booz2_common.makefile → conf/firmwares/booz2_common.makefile
diff --git a/conf/autopilot/booz2_test_progs.makefile → conf/firmwares/booz2_test_progs.makefile b/conf/autopilot/booz2_test_progs.makefile → conf/firmwares/booz2_test_progs.makefile
diff --git a/conf/autopilot/fixedwing.makefile → conf/firmwares/fixedwing.makefile b/conf/autopilot/fixedwing.makefile → conf/firmwares/fixedwing.makefile
diff --git a/conf/autopilot/fixedwing.xml → conf/firmwares/fixedwing.xml b/conf/autopilot/fixedwing.xml → conf/firmwares/fixedwing.xml
diff --git a/conf/autopilot/lisa_passthrough.makefile → conf/firmwares/lisa_passthrough.makefile b/conf/autopilot/lisa_passthrough.makefile → conf/firmwares/lisa_passthrough.makefile
diff --git a/conf/autopilot/lisa_test_progs.makefile → conf/firmwares/lisa_test_progs.makefile b/conf/autopilot/lisa_test_progs.makefile → conf/firmwares/lisa_test_progs.makefile
diff --git a/conf/autopilot/lisa_test_progs.xml → conf/firmwares/lisa_test_progs.xml b/conf/autopilot/lisa_test_progs.xml → conf/firmwares/lisa_test_progs.xml
diff --git a/conf/autopilot/logger.makefile → conf/firmwares/logger.makefile b/conf/autopilot/logger.makefile → conf/firmwares/logger.makefile
diff --git a/conf/autopilot/rotorcraft.makefile → conf/firmwares/rotorcraft.makefile b/conf/autopilot/rotorcraft.makefile → conf/firmwares/rotorcraft.makefile
diff --git a/conf/autopilot/rotorcraft.xml → conf/firmwares/rotorcraft.xml b/conf/autopilot/rotorcraft.xml → conf/firmwares/rotorcraft.xml
diff --git a/conf/autopilot/setup.makefile → conf/firmwares/setup.makefile b/conf/autopilot/setup.makefile → conf/firmwares/setup.makefile
diff --git a/...ot/subsystems/fixedwing/ahrs_dcm.makefile → ...es/subsystems/fixedwing/ahrs_dcm.makefile b/...ot/subsystems/fixedwing/ahrs_dcm.makefile → ...es/subsystems/fixedwing/ahrs_dcm.makefile
diff --git a/conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl.makefile b/conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl.makefile
diff --git a/...ystems/fixedwing/ahrs_float_cmpl.makefile → ...s/fixedwing/ahrs_float_cmpl_quat.makefile b/...ystems/fixedwing/ahrs_float_cmpl.makefile → ...s/fixedwing/ahrs_float_cmpl_quat.makefile
diff --git a/conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile b/conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
diff --git a/...systems/fixedwing/ahrs_float_dcm.makefile → ...systems/fixedwing/ahrs_float_dcm.makefile b/...systems/fixedwing/ahrs_float_dcm.makefile → ...systems/fixedwing/ahrs_float_dcm.makefile
diff --git a/...lot/subsystems/fixedwing/ahrs_ic.makefile → ...res/subsystems/fixedwing/ahrs_ic.makefile b/...lot/subsystems/fixedwing/ahrs_ic.makefile → ...res/subsystems/fixedwing/ahrs_ic.makefile
diff --git a/...bsystems/fixedwing/ahrs_infrared.makefile → ...bsystems/fixedwing/ahrs_infrared.makefile b/...bsystems/fixedwing/ahrs_infrared.makefile → ...bsystems/fixedwing/ahrs_infrared.makefile
diff --git a/...ms/fixedwing/ahrs_int_cmpl_euler.makefile → ...ms/fixedwing/ahrs_int_cmpl_euler.makefile b/...ms/fixedwing/ahrs_int_cmpl_euler.makefile → ...ms/fixedwing/ahrs_int_cmpl_euler.makefile
diff --git a/...ems/fixedwing/ahrs_int_cmpl_quat.makefile → ...ems/fixedwing/ahrs_int_cmpl_quat.makefile b/...ems/fixedwing/ahrs_int_cmpl_quat.makefile → ...ems/fixedwing/ahrs_int_cmpl_quat.makefile
diff --git a/...ubsystems/fixedwing/attitude_dcm.makefile → ...ubsystems/fixedwing/attitude_dcm.makefile b/...ubsystems/fixedwing/attitude_dcm.makefile → ...ubsystems/fixedwing/attitude_dcm.makefile
diff --git a/...tems/fixedwing/attitude_infrared.makefile → ...tems/fixedwing/attitude_infrared.makefile b/...tems/fixedwing/attitude_infrared.makefile → ...tems/fixedwing/attitude_infrared.makefile
diff --git a/.../fixedwing/attitude_infrared_i2c.makefile → .../fixedwing/attitude_infrared_i2c.makefile b/.../fixedwing/attitude_infrared_i2c.makefile → .../fixedwing/attitude_infrared_i2c.makefile
diff --git a/...t/subsystems/fixedwing/autopilot.makefile → ...s/subsystems/fixedwing/autopilot.makefile b/...t/subsystems/fixedwing/autopilot.makefile → ...s/subsystems/fixedwing/autopilot.makefile
diff --git a/...lot/subsystems/fixedwing/control.makefile → ...res/subsystems/fixedwing/control.makefile b/...lot/subsystems/fixedwing/control.makefile → ...res/subsystems/fixedwing/control.makefile
diff --git a/...stems/fixedwing/control_adaptive.makefile → ...stems/fixedwing/control_adaptive.makefile b/...stems/fixedwing/control_adaptive.makefile → ...stems/fixedwing/control_adaptive.makefile
diff --git a/...subsystems/fixedwing/control_new.makefile → ...subsystems/fixedwing/control_new.makefile b/...subsystems/fixedwing/control_new.makefile → ...subsystems/fixedwing/control_new.makefile
diff --git a/...systems/fixedwing/current_sensor.makefile → ...systems/fixedwing/current_sensor.makefile b/...systems/fixedwing/current_sensor.makefile → ...systems/fixedwing/current_sensor.makefile
diff --git a/...stems/fixedwing/gps_mediatek_diy.makefile → ...stems/fixedwing/gps_mediatek_diy.makefile b/...stems/fixedwing/gps_mediatek_diy.makefile → ...stems/fixedwing/gps_mediatek_diy.makefile
diff --git a/...ot/subsystems/fixedwing/gps_nmea.makefile → ...es/subsystems/fixedwing/gps_nmea.makefile b/...ot/subsystems/fixedwing/gps_nmea.makefile → ...es/subsystems/fixedwing/gps_nmea.makefile
diff --git a/conf/firmwares/subsystems/fixedwing/gps_skytraq.makefile b/conf/firmwares/subsystems/fixedwing/gps_skytraq.makefile
diff --git a/...t/subsystems/fixedwing/gps_ublox.makefile → ...s/subsystems/fixedwing/gps_ublox.makefile b/...t/subsystems/fixedwing/gps_ublox.makefile → ...s/subsystems/fixedwing/gps_ublox.makefile
diff --git a/...systems/fixedwing/gps_ublox_hitl.makefile → ...systems/fixedwing/gps_ublox_hitl.makefile b/...systems/fixedwing/gps_ublox_hitl.makefile → ...systems/fixedwing/gps_ublox_hitl.makefile
diff --git a/...ystems/fixedwing/gps_ublox_lea4p.makefile → ...ystems/fixedwing/gps_ublox_lea4p.makefile b/...ystems/fixedwing/gps_ublox_lea4p.makefile → ...ystems/fixedwing/gps_ublox_lea4p.makefile
diff --git a/...ystems/fixedwing/gps_ublox_lea5h.makefile → ...ystems/fixedwing/gps_ublox_lea5h.makefile b/...ystems/fixedwing/gps_ublox_lea5h.makefile → ...ystems/fixedwing/gps_ublox_lea5h.makefile
diff --git a/...bsystems/fixedwing/gps_ublox_utm.makefile → ...bsystems/fixedwing/gps_ublox_utm.makefile b/...bsystems/fixedwing/gps_ublox_utm.makefile → ...bsystems/fixedwing/gps_ublox_utm.makefile
diff --git a/.../subsystems/fixedwing/gyro_pitch.makefile → .../subsystems/fixedwing/gyro_pitch.makefile b/.../subsystems/fixedwing/gyro_pitch.makefile → .../subsystems/fixedwing/gyro_pitch.makefile
diff --git a/...t/subsystems/fixedwing/gyro_roll.makefile → ...s/subsystems/fixedwing/gyro_roll.makefile b/...t/subsystems/fixedwing/gyro_roll.makefile → ...s/subsystems/fixedwing/gyro_roll.makefile
diff --git a/...topilot/subsystems/fixedwing/i2c.makefile → ...rmwares/subsystems/fixedwing/i2c.makefile b/...topilot/subsystems/fixedwing/i2c.makefile → ...rmwares/subsystems/fixedwing/i2c.makefile
diff --git a/...stems/fixedwing/imu_aspirin2_i2c.makefile → ...stems/fixedwing/imu_aspirin2_i2c.makefile b/...stems/fixedwing/imu_aspirin2_i2c.makefile → ...stems/fixedwing/imu_aspirin2_i2c.makefile
diff --git a/...ystems/fixedwing/imu_aspirin_i2c.makefile → ...ystems/fixedwing/imu_aspirin_i2c.makefile b/...ystems/fixedwing/imu_aspirin_i2c.makefile → ...ystems/fixedwing/imu_aspirin_i2c.makefile
diff --git a/...ot/subsystems/fixedwing/imu_booz.makefile → ...es/subsystems/fixedwing/imu_booz.makefile b/...ot/subsystems/fixedwing/imu_booz.makefile → ...es/subsystems/fixedwing/imu_booz.makefile
diff --git a/.../subsystems/fixedwing/imu_ppzuav.makefile → .../subsystems/fixedwing/imu_ppzuav.makefile b/.../subsystems/fixedwing/imu_ppzuav.makefile → .../subsystems/fixedwing/imu_ppzuav.makefile
diff --git a/...t/subsystems/fixedwing/ins_xsens.makefile → ...s/subsystems/fixedwing/ins_xsens.makefile b/...t/subsystems/fixedwing/ins_xsens.makefile → ...s/subsystems/fixedwing/ins_xsens.makefile
diff --git a/...ot/subsystems/fixedwing/joystick.makefile → ...es/subsystems/fixedwing/joystick.makefile b/...ot/subsystems/fixedwing/joystick.makefile → ...es/subsystems/fixedwing/joystick.makefile
diff --git a/.../subsystems/fixedwing/navigation.makefile → .../subsystems/fixedwing/navigation.makefile b/.../subsystems/fixedwing/navigation.makefile → .../subsystems/fixedwing/navigation.makefile
diff --git a/...ystems/fixedwing/navigation_bomb.makefile → ...ystems/fixedwing/navigation_bomb.makefile b/...ystems/fixedwing/navigation_bomb.makefile → ...ystems/fixedwing/navigation_bomb.makefile
diff --git a/...stems/fixedwing/navigation_extra.makefile → ...stems/fixedwing/navigation_extra.makefile b/...stems/fixedwing/navigation_extra.makefile → ...stems/fixedwing/navigation_extra.makefile
diff --git a/...fixedwing/radio_control_datalink.makefile → ...fixedwing/radio_control_datalink.makefile b/...fixedwing/radio_control_datalink.makefile → ...fixedwing/radio_control_datalink.makefile
diff --git a/...subsystems/fixedwing/settings_rc.makefile → ...subsystems/fixedwing/settings_rc.makefile b/...subsystems/fixedwing/settings_rc.makefile → ...subsystems/fixedwing/settings_rc.makefile
diff --git a/...topilot/subsystems/fixedwing/spi.makefile → ...rmwares/subsystems/fixedwing/spi.makefile b/...topilot/subsystems/fixedwing/spi.makefile → ...rmwares/subsystems/fixedwing/spi.makefile
diff --git a/...ubsystems/fixedwing/spi_slave_hs.makefile → ...ubsystems/fixedwing/spi_slave_hs.makefile b/...ubsystems/fixedwing/spi_slave_hs.makefile → ...ubsystems/fixedwing/spi_slave_hs.makefile
diff --git a/.../fixedwing/telemetry_transparent.makefile → .../fixedwing/telemetry_transparent.makefile b/.../fixedwing/telemetry_transparent.makefile → .../fixedwing/telemetry_transparent.makefile
diff --git a/...edwing/telemetry_transparent_usb.makefile → ...edwing/telemetry_transparent_usb.makefile b/...edwing/telemetry_transparent_usb.makefile → ...edwing/telemetry_transparent_usb.makefile
diff --git a/...ems/fixedwing/telemetry_xbee_api.makefile → ...ems/fixedwing/telemetry_xbee_api.makefile b/...ems/fixedwing/telemetry_xbee_api.makefile → ...ems/fixedwing/telemetry_xbee_api.makefile
diff --git a/...stems/lisa_passthrough/ahrs_cmpl.makefile → ...stems/lisa_passthrough/ahrs_cmpl.makefile b/...stems/lisa_passthrough/ahrs_cmpl.makefile → ...stems/lisa_passthrough/ahrs_cmpl.makefile
diff --git a/...ssthrough/booz_stabilization_int.makefile → ...ssthrough/booz_stabilization_int.makefile b/...ssthrough/booz_stabilization_int.makefile → ...ssthrough/booz_stabilization_int.makefile
diff --git a/...ems/lisa_passthrough/imu_b2_v1.1.makefile → ...ems/lisa_passthrough/imu_b2_v1.1.makefile b/...ems/lisa_passthrough/imu_b2_v1.1.makefile → ...ems/lisa_passthrough/imu_b2_v1.1.makefile
diff --git a/...ems/lisa_passthrough/imu_b2_v1.2.makefile → ...ems/lisa_passthrough/imu_b2_v1.2.makefile b/...ems/lisa_passthrough/imu_b2_v1.2.makefile → ...ems/lisa_passthrough/imu_b2_v1.2.makefile
diff --git a/...a_passthrough/radio_control_joby.makefile → ...a_passthrough/radio_control_joby.makefile b/...a_passthrough/radio_control_joby.makefile → ...a_passthrough/radio_control_joby.makefile
diff --git a/...ssthrough/radio_control_spektrum.makefile → ...ssthrough/radio_control_spektrum.makefile b/...ssthrough/radio_control_spektrum.makefile → ...ssthrough/radio_control_spektrum.makefile
diff --git a/...topilot/subsystems/lisa_spi_link.makefile → ...rmwares/subsystems/lisa_spi_link.makefile b/...topilot/subsystems/lisa_spi_link.makefile → ...rmwares/subsystems/lisa_spi_link.makefile
diff --git a/...tems/rotorcraft/actuators_asctec.makefile → ...tems/rotorcraft/actuators_asctec.makefile b/...tems/rotorcraft/actuators_asctec.makefile → ...tems/rotorcraft/actuators_asctec.makefile
diff --git a/...s/rotorcraft/actuators_asctec_v2.makefile → ...s/rotorcraft/actuators_asctec_v2.makefile b/...s/rotorcraft/actuators_asctec_v2.makefile → ...s/rotorcraft/actuators_asctec_v2.makefile
diff --git a/...stems/rotorcraft/actuators_dummy.makefile → ...stems/rotorcraft/actuators_dummy.makefile b/...stems/rotorcraft/actuators_dummy.makefile → ...stems/rotorcraft/actuators_dummy.makefile
diff --git a/...ystems/rotorcraft/actuators_heli.makefile → ...ystems/rotorcraft/actuators_heli.makefile b/...ystems/rotorcraft/actuators_heli.makefile → ...ystems/rotorcraft/actuators_heli.makefile
diff --git a/...systems/rotorcraft/actuators_mkk.makefile → ...systems/rotorcraft/actuators_mkk.makefile b/...systems/rotorcraft/actuators_mkk.makefile → ...systems/rotorcraft/actuators_mkk.makefile
diff --git a/conf/firmwares/subsystems/rotorcraft/actuators_pwm_supervision.makefile b/conf/firmwares/subsystems/rotorcraft/actuators_pwm_supervision.makefile
diff --git a/...tems/rotorcraft/actuators_skiron.makefile → ...tems/rotorcraft/actuators_skiron.makefile b/...tems/rotorcraft/actuators_skiron.makefile → ...tems/rotorcraft/actuators_skiron.makefile
diff --git a/.../subsystems/rotorcraft/ahrs_cmpl.makefile → .../subsystems/rotorcraft/ahrs_cmpl.makefile b/.../subsystems/rotorcraft/ahrs_cmpl.makefile → .../subsystems/rotorcraft/ahrs_cmpl.makefile
diff --git a/conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl.makefile b/conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl.makefile
diff --git a/...stems/rotorcraft/ahrs_float_cmpl.makefile → .../rotorcraft/ahrs_float_cmpl_quat.makefile b/...stems/rotorcraft/ahrs_float_cmpl.makefile → .../rotorcraft/ahrs_float_cmpl_quat.makefile
diff --git a/conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile b/conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
diff --git a/...ot/subsystems/rotorcraft/ahrs_ic.makefile → ...es/subsystems/rotorcraft/ahrs_ic.makefile b/...ot/subsystems/rotorcraft/ahrs_ic.makefile → ...es/subsystems/rotorcraft/ahrs_ic.makefile
diff --git a/...s/rotorcraft/ahrs_int_cmpl_euler.makefile → ...s/rotorcraft/ahrs_int_cmpl_euler.makefile b/...s/rotorcraft/ahrs_int_cmpl_euler.makefile → ...s/rotorcraft/ahrs_int_cmpl_euler.makefile
diff --git a/...ms/rotorcraft/ahrs_int_cmpl_quat.makefile → ...ms/rotorcraft/ahrs_int_cmpl_quat.makefile b/...ms/rotorcraft/ahrs_int_cmpl_quat.makefile → ...ms/rotorcraft/ahrs_int_cmpl_quat.makefile
diff --git a/...t/subsystems/rotorcraft/ahrs_lkf.makefile → ...s/subsystems/rotorcraft/ahrs_lkf.makefile b/...t/subsystems/rotorcraft/ahrs_lkf.makefile → ...s/subsystems/rotorcraft/ahrs_lkf.makefile
diff --git a/conf/firmwares/subsystems/rotorcraft/ahrs_mlkf.makefile b/conf/firmwares/subsystems/rotorcraft/ahrs_mlkf.makefile
diff --git a/conf/firmwares/subsystems/rotorcraft/fdm_nps.makefile b/conf/firmwares/subsystems/rotorcraft/fdm_nps.makefile
diff --git a/conf/firmwares/subsystems/rotorcraft/gps_nmea.makefile b/conf/firmwares/subsystems/rotorcraft/gps_nmea.makefile
diff --git a/conf/firmwares/subsystems/rotorcraft/gps_skytraq.makefile b/conf/firmwares/subsystems/rotorcraft/gps_skytraq.makefile
diff --git a/.../subsystems/rotorcraft/gps_ublox.makefile → .../subsystems/rotorcraft/gps_ublox.makefile b/.../subsystems/rotorcraft/gps_ublox.makefile → .../subsystems/rotorcraft/gps_ublox.makefile
diff --git a/...systems/rotorcraft/gps_ublox_utm.makefile → ...systems/rotorcraft/gps_ublox_utm.makefile b/...systems/rotorcraft/gps_ublox_utm.makefile → ...systems/rotorcraft/gps_ublox_utm.makefile
diff --git a/...subsystems/rotorcraft/imu_crista.makefile → ...subsystems/rotorcraft/imu_crista.makefile b/...subsystems/rotorcraft/imu_crista.makefile → ...subsystems/rotorcraft/imu_crista.makefile
diff --git a/...ms/rotorcraft/imu_crista_hmc5843.makefile → ...ms/rotorcraft/imu_crista_hmc5843.makefile b/...ms/rotorcraft/imu_crista_hmc5843.makefile → ...ms/rotorcraft/imu_crista_hmc5843.makefile
diff --git a/...ot/subsystems/rotorcraft/ins_hff.makefile → ...es/subsystems/rotorcraft/ins_hff.makefile b/...ot/subsystems/rotorcraft/ins_hff.makefile → ...es/subsystems/rotorcraft/ins_hff.makefile
diff --git a/...s/rotorcraft/stabilization_euler.makefile → ...s/rotorcraft/stabilization_euler.makefile b/...s/rotorcraft/stabilization_euler.makefile → ...s/rotorcraft/stabilization_euler.makefile
diff --git a/conf/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile b/conf/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile
diff --git a/...orcraft/stabilization_quaternion.makefile → ...otorcraft/stabilization_int_quat.makefile b/...orcraft/stabilization_quaternion.makefile → ...otorcraft/stabilization_int_quat.makefile
diff --git a/conf/firmwares/subsystems/rotorcraft/stabilization_int_quat_transition.makefile b/conf/firmwares/subsystems/rotorcraft/stabilization_int_quat_transition.makefile
diff --git a/conf/firmwares/subsystems/rotorcraft/stabilization_quaternion.makefile b/conf/firmwares/subsystems/rotorcraft/stabilization_quaternion.makefile
diff --git a/...rotorcraft/telemetry_transparent.makefile → ...rotorcraft/telemetry_transparent.makefile b/...rotorcraft/telemetry_transparent.makefile → ...rotorcraft/telemetry_transparent.makefile
diff --git a/...rcraft/telemetry_transparent_usb.makefile → ...rcraft/telemetry_transparent_usb.makefile b/...rcraft/telemetry_transparent_usb.makefile → ...rcraft/telemetry_transparent_usb.makefile
diff --git a/...ms/rotorcraft/telemetry_xbee_api.makefile → ...ms/rotorcraft/telemetry_xbee_api.makefile b/...ms/rotorcraft/telemetry_xbee_api.makefile → ...ms/rotorcraft/telemetry_xbee_api.makefile
diff --git a/...subsystems/shared/actuators_4015.makefile → ...subsystems/shared/actuators_4015.makefile b/...subsystems/shared/actuators_4015.makefile → ...subsystems/shared/actuators_4015.makefile
diff --git a/...subsystems/shared/actuators_4017.makefile → ...subsystems/shared/actuators_4017.makefile b/...subsystems/shared/actuators_4017.makefile → ...subsystems/shared/actuators_4017.makefile
diff --git a/...bsystems/shared/actuators_direct.makefile → ...bsystems/shared/actuators_direct.makefile b/...bsystems/shared/actuators_direct.makefile → ...bsystems/shared/actuators_direct.makefile
diff --git a/.../subsystems/shared/actuators_ppm.makefile → .../subsystems/shared/actuators_ppm.makefile b/.../subsystems/shared/actuators_ppm.makefile → .../subsystems/shared/actuators_ppm.makefile
diff --git a/...lot/subsystems/shared/i2c_select.makefile → ...res/subsystems/shared/i2c_select.makefile b/...lot/subsystems/shared/i2c_select.makefile → ...res/subsystems/shared/i2c_select.makefile
diff --git a/...lot/subsystems/shared/imu_analog.makefile → ...res/subsystems/shared/imu_analog.makefile b/...lot/subsystems/shared/imu_analog.makefile → ...res/subsystems/shared/imu_analog.makefile
diff --git a/...ot/subsystems/shared/imu_aspirin.makefile → ...es/subsystems/shared/imu_aspirin.makefile b/...ot/subsystems/shared/imu_aspirin.makefile → ...es/subsystems/shared/imu_aspirin.makefile
diff --git a/...ystems/shared/imu_aspirin_common.makefile → ...ystems/shared/imu_aspirin_common.makefile b/...ystems/shared/imu_aspirin_common.makefile → ...ystems/shared/imu_aspirin_common.makefile
diff --git a/...bsystems/shared/imu_aspirin_v1.0.makefile → ...bsystems/shared/imu_aspirin_v1.0.makefile b/...bsystems/shared/imu_aspirin_v1.0.makefile → ...bsystems/shared/imu_aspirin_v1.0.makefile
diff --git a/...bsystems/shared/imu_aspirin_v1.5.makefile → ...bsystems/shared/imu_aspirin_v1.5.makefile b/...bsystems/shared/imu_aspirin_v1.5.makefile → ...bsystems/shared/imu_aspirin_v1.5.makefile
diff --git a/conf/firmwares/subsystems/shared/imu_aspirin_v2.0.makefile b/conf/firmwares/subsystems/shared/imu_aspirin_v2.0.makefile
diff --git a/conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile b/conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile
diff --git a/.../subsystems/shared/imu_b2_common.makefile → .../subsystems/shared/imu_b2_common.makefile b/.../subsystems/shared/imu_b2_common.makefile → .../subsystems/shared/imu_b2_common.makefile
diff --git a/...ot/subsystems/shared/imu_b2_v1.0.makefile → ...es/subsystems/shared/imu_b2_v1.0.makefile b/...ot/subsystems/shared/imu_b2_v1.0.makefile → ...es/subsystems/shared/imu_b2_v1.0.makefile
diff --git a/...ot/subsystems/shared/imu_b2_v1.1.makefile → ...es/subsystems/shared/imu_b2_v1.1.makefile b/...ot/subsystems/shared/imu_b2_v1.1.makefile → ...es/subsystems/shared/imu_b2_v1.1.makefile
diff --git a/...ot/subsystems/shared/imu_b2_v1.2.makefile → ...es/subsystems/shared/imu_b2_v1.2.makefile b/...ot/subsystems/shared/imu_b2_v1.2.makefile → ...es/subsystems/shared/imu_b2_v1.2.makefile
diff --git a/...ilot/subsystems/shared/imu_navgo.makefile → ...ares/subsystems/shared/imu_navgo.makefile b/...ilot/subsystems/shared/imu_navgo.makefile → ...ares/subsystems/shared/imu_navgo.makefile
diff --git a/conf/firmwares/subsystems/shared/imu_nps.makefile b/conf/firmwares/subsystems/shared/imu_nps.makefile
diff --git a/...lot/subsystems/shared/imu_umarim.makefile → ...res/subsystems/shared/imu_umarim.makefile b/...lot/subsystems/shared/imu_umarim.makefile → ...res/subsystems/shared/imu_umarim.makefile
diff --git a/...opilot/subsystems/shared/imu_yai.makefile → ...mwares/subsystems/shared/imu_yai.makefile b/...opilot/subsystems/shared/imu_yai.makefile → ...mwares/subsystems/shared/imu_yai.makefile
diff --git a/...systems/shared/radio_control_ppm.makefile → ...systems/shared/radio_control_ppm.makefile b/...systems/shared/radio_control_ppm.makefile → ...systems/shared/radio_control_ppm.makefile
diff --git a/...ms/shared/radio_control_spektrum.makefile → ...ms/shared/radio_control_spektrum.makefile b/...ms/shared/radio_control_spektrum.makefile → ...ms/shared/radio_control_spektrum.makefile
diff --git a/conf/flight_plans/flight_plan.dtd b/conf/flight_plans/flight_plan.dtd
diff --git a/conf/flight_plans/grosslobke_demo.xml b/conf/flight_plans/grosslobke_demo.xml
diff --git a/conf/flight_plans/grosslobke_kreise.xml b/conf/flight_plans/grosslobke_kreise.xml
diff --git a/conf/gcs/papgets.xml b/conf/gcs/papgets.xml
diff --git a/conf/gcs/solar.xml b/conf/gcs/solar.xml
diff --git a/conf/gps/Tiny_LEA-4P-v6_POSLLH.txt b/conf/gps/Tiny_LEA-4P-v6_POSLLH.txt
diff --git a/conf/joystick/attack3_booz_nav.xml b/conf/joystick/attack3_booz_nav.xml
diff --git a/conf/joystick/aurora_skate_controller.xml b/conf/joystick/aurora_skate_controller.xml
diff --git a/conf/joystick/cockpit_sx.xml b/conf/joystick/cockpit_sx.xml
diff --git a/conf/joystick/gp_interlink.xml b/conf/joystick/gp_interlink.xml
diff --git a/conf/joystick/ikarus_usb.xml b/conf/joystick/ikarus_usb.xml
diff --git a/conf/joystick/logitech_dual_action.xml b/conf/joystick/logitech_dual_action.xml
diff --git a/conf/joystick/logitech_f710.xml b/conf/joystick/logitech_f710.xml
diff --git a/conf/joystick/ngs_set_actuators.xml b/conf/joystick/ngs_set_actuators.xml
diff --git a/conf/joystick/xbox_booz_cam.xml b/conf/joystick/xbox_booz_cam.xml
diff --git a/conf/joystick/xbox_booz_nav.xml b/conf/joystick/xbox_booz_nav.xml
diff --git a/conf/messages.xml b/conf/messages.xml
diff --git a/conf/messages/DIA.xml b/conf/messages/DIA.xml
diff --git a/conf/messages/airborne.xml b/conf/messages/airborne.xml