diff --git a/conf/TUDELFT/tudelft_course2016_conf.xml b/conf/airframes/TUDELFT/tudelft_course2016_conf.xml
similarity index 88%
rename from conf/TUDELFT/tudelft_course2016_conf.xml
rename to conf/airframes/TUDELFT/tudelft_course2016_conf.xml
index 40d0fc733c..c3212f407d 100644
--- a/conf/TUDELFT/tudelft_course2016_conf.xml
+++ b/conf/airframes/TUDELFT/tudelft_course2016_conf.xml
@@ -6,7 +6,7 @@
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/TUDELFT/tudelft_course2016_avoid_orange_cyberzoo.xml"
-   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_rate.xml ../conf/modules/cv_colorfilter.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml ../conf/modules/cv_colorfilter.xml"
    settings_modules="modules/geo_mag.xml modules/air_data.xml modules/video_thread.xml modules/cv_colorfilter.xml"
    gui_color="#db67fffffaeb"
   />
@@ -17,7 +17,7 @@
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/dummy.xml"
-   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml [settings/control/stabilization_att_indi.xml] settings/control/stabilization_rate.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml [settings/control/stabilization_att_indi.xml]"
    settings_modules="modules/geo_mag.xml modules/air_data.xml modules/video_thread.xml modules/cv_colorfilter.xml modules/video_rtp_stream.xml"
    gui_color="#ffffb1c0b1c0"
   />
diff --git a/conf/TUDELFT/tudelft_course2016_control_panel.xml b/conf/airframes/TUDELFT/tudelft_course2016_control_panel.xml
similarity index 100%
rename from conf/TUDELFT/tudelft_course2016_control_panel.xml
rename to conf/airframes/TUDELFT/tudelft_course2016_control_panel.xml