diff --git a/conf/airframes/mm/extra/logger_sd_adc.xml b/conf/airframes/obsolete/mm/extra/logger_sd_adc.xml
similarity index 100%
rename from conf/airframes/mm/extra/logger_sd_adc.xml
rename to conf/airframes/obsolete/mm/extra/logger_sd_adc.xml
diff --git a/conf/airframes/mm/extra/logger_sd_twog.xml b/conf/airframes/obsolete/mm/extra/logger_sd_twog.xml
similarity index 100%
rename from conf/airframes/mm/extra/logger_sd_twog.xml
rename to conf/airframes/obsolete/mm/extra/logger_sd_twog.xml
diff --git a/conf/airframes/mm/extra/press_t.xml b/conf/airframes/obsolete/mm/extra/press_t.xml
similarity index 100%
rename from conf/airframes/mm/extra/press_t.xml
rename to conf/airframes/obsolete/mm/extra/press_t.xml
diff --git a/conf/airframes/mm/extra/probe_t.xml b/conf/airframes/obsolete/mm/extra/probe_t.xml
similarity index 100%
rename from conf/airframes/mm/extra/probe_t.xml
rename to conf/airframes/obsolete/mm/extra/probe_t.xml
diff --git a/conf/airframes/mm/extra/quiet.xml b/conf/airframes/obsolete/mm/extra/quiet.xml
similarity index 100%
rename from conf/airframes/mm/extra/quiet.xml
rename to conf/airframes/obsolete/mm/extra/quiet.xml
diff --git a/conf/airframes/mm/extra/rctx.xml b/conf/airframes/obsolete/mm/extra/rctx.xml
similarity index 100%
rename from conf/airframes/mm/extra/rctx.xml
rename to conf/airframes/obsolete/mm/extra/rctx.xml
diff --git a/conf/airframes/mm/extra/turbine_trigger.xml b/conf/airframes/obsolete/mm/extra/turbine_trigger.xml
similarity index 100%
rename from conf/airframes/mm/extra/turbine_trigger.xml
rename to conf/airframes/obsolete/mm/extra/turbine_trigger.xml
diff --git a/conf/airframes/mm/fixed-wing/drops.xml b/conf/airframes/obsolete/mm/fixed-wing/drops.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/drops.xml
rename to conf/airframes/obsolete/mm/fixed-wing/drops.xml
diff --git a/conf/airframes/mm/fixed-wing/funjet43.xml b/conf/airframes/obsolete/mm/fixed-wing/funjet43.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjet43.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjet43.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetdca.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetdca.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetdca.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetdca.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetdcb.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetdcb.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetdcb.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetdcb.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetdcc.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetdcc.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetdcc.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetdcc.xml
diff --git a/conf/airframes/mm/fixed-wing/funjeteth1.xml b/conf/airframes/obsolete/mm/fixed-wing/funjeteth1.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjeteth1.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjeteth1.xml
diff --git a/conf/airframes/mm/fixed-wing/funjeteth2.xml b/conf/airframes/obsolete/mm/fixed-wing/funjeteth2.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjeteth2.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjeteth2.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetfmi1.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetfmi1.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetfmi1.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetfmi1.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetfmi2.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetfmi2.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetfmi2.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetfmi2.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetfmi3.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetfmi3.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetfmi3.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetfmi3.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi1.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi1.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetgfi1.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetgfi1.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi3.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi3.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetgfi3.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetgfi3.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi4.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi4.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetgfi4.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetgfi4.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi5.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi5.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetgfi5.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetgfi5.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi6.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi6.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetgfi6.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetgfi6.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi7.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi7.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetgfi7.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetgfi7.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi8.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi8.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetgfi8.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetgfi8.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi9.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi9.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetgfi9.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetgfi9.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetlisa.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetlisa.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetlisa.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetlisa.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetlisam.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetlisam.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetlisam.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetlisam.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetmm.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetmm.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetmm.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetmm.xml
diff --git a/conf/airframes/mm/fixed-wing/funjetmm2.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetmm2.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/funjetmm2.xml
rename to conf/airframes/obsolete/mm/fixed-wing/funjetmm2.xml
diff --git a/conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml b/conf/airframes/obsolete/mm/fixed-wing/fw_ins_arduimu.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
rename to conf/airframes/obsolete/mm/fixed-wing/fw_ins_arduimu.xml
diff --git a/conf/airframes/mm/fixed-wing/merlin.xml b/conf/airframes/obsolete/mm/fixed-wing/merlin.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/merlin.xml
rename to conf/airframes/obsolete/mm/fixed-wing/merlin.xml
diff --git a/conf/airframes/mm/fixed-wing/miniwing.xml b/conf/airframes/obsolete/mm/fixed-wing/miniwing.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/miniwing.xml
rename to conf/airframes/obsolete/mm/fixed-wing/miniwing.xml
diff --git a/conf/airframes/mm/fixed-wing/slowfast.xml b/conf/airframes/obsolete/mm/fixed-wing/slowfast.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/slowfast.xml
rename to conf/airframes/obsolete/mm/fixed-wing/slowfast.xml
diff --git a/conf/airframes/mm/fixed-wing/slowfast2.xml b/conf/airframes/obsolete/mm/fixed-wing/slowfast2.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/slowfast2.xml
rename to conf/airframes/obsolete/mm/fixed-wing/slowfast2.xml
diff --git a/conf/airframes/mm/fixed-wing/trojan.xml b/conf/airframes/obsolete/mm/fixed-wing/trojan.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/trojan.xml
rename to conf/airframes/obsolete/mm/fixed-wing/trojan.xml
diff --git a/conf/airframes/mm/fixed-wing/twinstarmm.xml b/conf/airframes/obsolete/mm/fixed-wing/twinstarmm.xml
similarity index 100%
rename from conf/airframes/mm/fixed-wing/twinstarmm.xml
rename to conf/airframes/obsolete/mm/fixed-wing/twinstarmm.xml
diff --git a/conf/airframes/mm/hangar/black_one.xml b/conf/airframes/obsolete/mm/hangar/black_one.xml
similarity index 100%
rename from conf/airframes/mm/hangar/black_one.xml
rename to conf/airframes/obsolete/mm/hangar/black_one.xml
diff --git a/conf/airframes/mm/hangar/glass_one1.xml b/conf/airframes/obsolete/mm/hangar/glass_one1.xml
similarity index 100%
rename from conf/airframes/mm/hangar/glass_one1.xml
rename to conf/airframes/obsolete/mm/hangar/glass_one1.xml
diff --git a/conf/airframes/mm/hangar/glass_one2.xml b/conf/airframes/obsolete/mm/hangar/glass_one2.xml
similarity index 100%
rename from conf/airframes/mm/hangar/glass_one2.xml
rename to conf/airframes/obsolete/mm/hangar/glass_one2.xml
diff --git a/conf/airframes/mm/hangar/glass_one3.xml b/conf/airframes/obsolete/mm/hangar/glass_one3.xml
similarity index 100%
rename from conf/airframes/mm/hangar/glass_one3.xml
rename to conf/airframes/obsolete/mm/hangar/glass_one3.xml
diff --git a/conf/airframes/mm/hangar/lila.xml b/conf/airframes/obsolete/mm/hangar/lila.xml
similarity index 100%
rename from conf/airframes/mm/hangar/lila.xml
rename to conf/airframes/obsolete/mm/hangar/lila.xml
diff --git a/conf/airframes/mm/hangar/mac06a.xml b/conf/airframes/obsolete/mm/hangar/mac06a.xml
similarity index 100%
rename from conf/airframes/mm/hangar/mac06a.xml
rename to conf/airframes/obsolete/mm/hangar/mac06a.xml
diff --git a/conf/airframes/mm/hangar/red_one.xml b/conf/airframes/obsolete/mm/hangar/red_one.xml
similarity index 100%
rename from conf/airframes/mm/hangar/red_one.xml
rename to conf/airframes/obsolete/mm/hangar/red_one.xml
diff --git a/conf/airframes/mm/rotor/qmk1.xml b/conf/airframes/obsolete/mm/rotor/qmk1.xml
similarity index 100%
rename from conf/airframes/mm/rotor/qmk1.xml
rename to conf/airframes/obsolete/mm/rotor/qmk1.xml
diff --git a/conf/airframes/mm/rotor/quadrotor_lisa_l_mkk.xml b/conf/airframes/obsolete/mm/rotor/quadrotor_lisa_l_mkk.xml
similarity index 100%
rename from conf/airframes/mm/rotor/quadrotor_lisa_l_mkk.xml
rename to conf/airframes/obsolete/mm/rotor/quadrotor_lisa_l_mkk.xml
diff --git a/conf/airframes/mm/rotor/quadrotor_lisa_m_1_pwm.xml b/conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_1_pwm.xml
similarity index 100%
rename from conf/airframes/mm/rotor/quadrotor_lisa_m_1_pwm.xml
rename to conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_1_pwm.xml
diff --git a/conf/airframes/mm/rotor/quadrotor_lisa_m_2_pwm.xml b/conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_2_pwm.xml
similarity index 100%
rename from conf/airframes/mm/rotor/quadrotor_lisa_m_2_pwm.xml
rename to conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_2_pwm.xml