diff --git a/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_fw.xml b/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_fw.xml
deleted file mode 100644
index ab07cfb2b8..0000000000
--- a/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_fw.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<airframe name="TestConfig">
-</airframe>
diff --git a/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_rc.xml b/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_rc.xml
deleted file mode 100644
index ab07cfb2b8..0000000000
--- a/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_rc.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<airframe name="TestConfig">
-</airframe>
diff --git a/conf/airframes/TestHardware/Tiny_2.11_fw.xml b/conf/airframes/TestHardware/Tiny_2.11_fw.xml
deleted file mode 100644
index ab07cfb2b8..0000000000
--- a/conf/airframes/TestHardware/Tiny_2.11_fw.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<airframe name="TestConfig">
-</airframe>
diff --git a/conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml b/conf/airframes/examples/krooz_sd_quad_mkk.xml
similarity index 99%
rename from conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
rename to conf/airframes/examples/krooz_sd_quad_mkk.xml
index 5072f37052..575892ff5f 100644
--- a/conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
+++ b/conf/airframes/examples/krooz_sd_quad_mkk.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "../../airframe.dtd">
+<!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <airframe name="Quadrotor KroozSD Mkk">
 
diff --git a/conf/airframes/examples/beagle_bone_black.xml b/conf/airframes/untested/beagle_bone_black.xml
similarity index 100%
rename from conf/airframes/examples/beagle_bone_black.xml
rename to conf/airframes/untested/beagle_bone_black.xml
diff --git a/conf/airframes/examples/delta_wing_minimal.xml b/conf/airframes/untested/delta_wing_minimal.xml
similarity index 100%
rename from conf/airframes/examples/delta_wing_minimal.xml
rename to conf/airframes/untested/delta_wing_minimal.xml
diff --git a/conf/airframes/examples/demo.xml b/conf/airframes/untested/demo.xml
similarity index 100%
rename from conf/airframes/examples/demo.xml
rename to conf/airframes/untested/demo.xml
diff --git a/conf/airframes/demo_cc3d.xml b/conf/airframes/untested/demo_cc3d.xml
similarity index 97%
rename from conf/airframes/demo_cc3d.xml
rename to conf/airframes/untested/demo_cc3d.xml
index 59ba6a10ba..09b6448cf0 100644
--- a/conf/airframes/demo_cc3d.xml
+++ b/conf/airframes/untested/demo_cc3d.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "airframe.dtd">
+<!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- this is a demo file for the OpenPilot CC3D board:
      * Autopilot:   OpenPilot CC3D         https://www.openpilot.org/product/coptercontrol/
diff --git a/conf/airframes/examples/easy_glider.xml b/conf/airframes/untested/easy_glider.xml
similarity index 100%
rename from conf/airframes/examples/easy_glider.xml
rename to conf/airframes/untested/easy_glider.xml
diff --git a/conf/airframes/examples/easystar.xml b/conf/airframes/untested/easystar.xml
similarity index 100%
rename from conf/airframes/examples/easystar.xml
rename to conf/airframes/untested/easystar.xml
diff --git a/conf/airframes/examples/funjet.xml b/conf/airframes/untested/funjet.xml
similarity index 100%
rename from conf/airframes/examples/funjet.xml
rename to conf/airframes/untested/funjet.xml
diff --git a/conf/airframes/examples/funjet_cam.xml b/conf/airframes/untested/funjet_cam.xml
similarity index 100%
rename from conf/airframes/examples/funjet_cam.xml
rename to conf/airframes/untested/funjet_cam.xml
diff --git a/conf/airframes/examples/krooz_sd/krooz_sd_bre_hexa_mkk.xml b/conf/airframes/untested/krooz_sd_bre_hexa_mkk.xml
similarity index 99%
rename from conf/airframes/examples/krooz_sd/krooz_sd_bre_hexa_mkk.xml
rename to conf/airframes/untested/krooz_sd_bre_hexa_mkk.xml
index 18305c8bf4..218258f51a 100644
--- a/conf/airframes/examples/krooz_sd/krooz_sd_bre_hexa_mkk.xml
+++ b/conf/airframes/untested/krooz_sd_bre_hexa_mkk.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "../../airframe.dtd">
+<!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <airframe name="Hexarotor KroozSD Big Rotorcraft Edition Mkk">
 
diff --git a/conf/airframes/examples/krooz_sd/fixedwing/krooz_sd_fw.xml b/conf/airframes/untested/krooz_sd_fw.xml
similarity index 99%
rename from conf/airframes/examples/krooz_sd/fixedwing/krooz_sd_fw.xml
rename to conf/airframes/untested/krooz_sd_fw.xml
index 6789f18b11..8c4cb65e90 100644
--- a/conf/airframes/examples/krooz_sd/fixedwing/krooz_sd_fw.xml
+++ b/conf/airframes/untested/krooz_sd_fw.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "../../../airframe.dtd">
+<!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <airframe name="KroozSD fixedwing example">
 
diff --git a/conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml b/conf/airframes/untested/krooz_sd_hexa_mkk.xml
similarity index 99%
rename from conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
rename to conf/airframes/untested/krooz_sd_hexa_mkk.xml
index bbdd5d48aa..67dc3f9a23 100644
--- a/conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
+++ b/conf/airframes/untested/krooz_sd_hexa_mkk.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "../../airframe.dtd">
+<!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <airframe name="Hexarotor KroozSD Mkk">
 
diff --git a/conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml b/conf/airframes/untested/krooz_sd_okto_mkk.xml
similarity index 99%
rename from conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
rename to conf/airframes/untested/krooz_sd_okto_mkk.xml
index d9cd3109c6..0099f0945d 100644
--- a/conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
+++ b/conf/airframes/untested/krooz_sd_okto_mkk.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "../../airframe.dtd">
+<!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <airframe name="Oktorotor KroozSD Mkk">
 
diff --git a/conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml b/conf/airframes/untested/krooz_sd_quad_pwm.xml
similarity index 99%
rename from conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
rename to conf/airframes/untested/krooz_sd_quad_pwm.xml
index a17ac6cc0a..e431b64d91 100644
--- a/conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
+++ b/conf/airframes/untested/krooz_sd_quad_pwm.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "../../airframe.dtd">
+<!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <airframe name="Quadrotor KroozSD Pwm">
 
diff --git a/conf/airframes/examples/lisa_asctec.xml b/conf/airframes/untested/lisa_asctec.xml
similarity index 100%
rename from conf/airframes/examples/lisa_asctec.xml
rename to conf/airframes/untested/lisa_asctec.xml
diff --git a/conf/airframes/logger_sd.xml b/conf/airframes/untested/logger_sd.xml
similarity index 95%
rename from conf/airframes/logger_sd.xml
rename to conf/airframes/untested/logger_sd.xml
index 7042581ce5..f4f63de1b0 100644
--- a/conf/airframes/logger_sd.xml
+++ b/conf/airframes/untested/logger_sd.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "airframe.dtd">
+<!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!--
 
diff --git a/conf/airframes/examples/quadrotor_lisa_m_mkk.xml b/conf/airframes/untested/quadrotor_lisa_m_mkk.xml
similarity index 100%
rename from conf/airframes/examples/quadrotor_lisa_m_mkk.xml
rename to conf/airframes/untested/quadrotor_lisa_m_mkk.xml
diff --git a/conf/airframes/examples/quadrotor_mlkf.xml b/conf/airframes/untested/quadrotor_mlkf.xml
similarity index 100%
rename from conf/airframes/examples/quadrotor_mlkf.xml
rename to conf/airframes/untested/quadrotor_mlkf.xml
diff --git a/conf/airframes/examples/quadrotor_px4fmu.xml b/conf/airframes/untested/quadrotor_px4fmu.xml
similarity index 100%
rename from conf/airframes/examples/quadrotor_px4fmu.xml
rename to conf/airframes/untested/quadrotor_px4fmu.xml
diff --git a/conf/airframes/examples/stm32f4_discovery_test.xml b/conf/airframes/untested/stm32f4_discovery_test.xml
similarity index 100%
rename from conf/airframes/examples/stm32f4_discovery_test.xml
rename to conf/airframes/untested/stm32f4_discovery_test.xml
diff --git a/conf/airframes/turntable.xml b/conf/airframes/untested/turntable.xml
similarity index 100%
rename from conf/airframes/turntable.xml
rename to conf/airframes/untested/turntable.xml
diff --git a/conf/airframes/turntable_usb.xml b/conf/airframes/untested/turntable_usb.xml
similarity index 100%
rename from conf/airframes/turntable_usb.xml
rename to conf/airframes/untested/turntable_usb.xml
diff --git a/conf/airframes/twinjet_overo.xml b/conf/airframes/untested/twinjet_overo.xml
similarity index 99%
rename from conf/airframes/twinjet_overo.xml
rename to conf/airframes/untested/twinjet_overo.xml
index b9012da23f..121bf1acae 100644
--- a/conf/airframes/twinjet_overo.xml
+++ b/conf/airframes/untested/twinjet_overo.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "airframe.dtd">
+<!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- Twinjet Multiplex (http://www.multiplex-rc.de/)
      Twog v1 board (http://wiki.paparazziuav.org/wiki/Twog_v1)
diff --git a/conf/airframes/examples/twinstar.xml b/conf/airframes/untested/twinstar.xml
similarity index 100%
rename from conf/airframes/examples/twinstar.xml
rename to conf/airframes/untested/twinstar.xml
diff --git a/conf/airframes/wind_tunnel.xml b/conf/airframes/untested/wind_tunnel.xml
similarity index 100%
rename from conf/airframes/wind_tunnel.xml
rename to conf/airframes/untested/wind_tunnel.xml
diff --git a/conf/conf_example.xml b/conf/conf_example.xml
index a736907821..a1e6b57766 100644
--- a/conf/conf_example.xml
+++ b/conf/conf_example.xml
@@ -222,7 +222,7 @@
   <aircraft
    name="krooz_quad"
    ac_id="23"
-   airframe="airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml"
+   airframe="airframes/examples/krooz_sd_quad_mkk.xml"
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
diff --git a/conf/conf_tests.xml b/conf/conf_tests.xml
index 20a404c6b8..74ef142a09 100644
--- a/conf/conf_tests.xml
+++ b/conf/conf_tests.xml
@@ -354,7 +354,7 @@
   <aircraft
    name="krooz_quad"
    ac_id="23"
-   airframe="airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml"
+   airframe="airframes/examples/krooz_sd_quad_mkk.xml"
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"