diff --git a/conf/airframes/BR/DreamCacher_bart.xml b/conf/airframes/BR/DreamCacher_bart.xml
index 8d6fb4d08e..198c320874 100644
--- a/conf/airframes/BR/DreamCacher_bart.xml
+++ b/conf/airframes/BR/DreamCacher_bart.xml
@@ -67,7 +67,7 @@
     <define name="THRUST_COEF" value="{ 256,  256,  256,  256 }"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/ladybird1.xml" />
+  <include href="conf/airframes/tudelft/calibrations/ladybird1.xml" />
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI"   value="0." unit="deg"/>
diff --git a/conf/airframes/BR/bebop_default.xml b/conf/airframes/BR/bebop_default.xml
index a78b49bb13..7615069699 100644
--- a/conf/airframes/BR/bebop_default.xml
+++ b/conf/airframes/BR/bebop_default.xml
@@ -90,7 +90,7 @@
     <define name="CALC_AMSL_BARO" value="TRUE"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/bebop_bart.xml" />
+  <include href="conf/airframes/tudelft/calibrations/bebop_bart.xml" />
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI" value="0." unit="deg"/>
diff --git a/conf/airframes/BR/bebop_indi.xml b/conf/airframes/BR/bebop_indi.xml
index be45be5866..75999569c5 100644
--- a/conf/airframes/BR/bebop_indi.xml
+++ b/conf/airframes/BR/bebop_indi.xml
@@ -99,7 +99,7 @@
     <define name="CALC_AMSL_BARO" value="TRUE"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/bebop8.xml" />
+  <include href="conf/airframes/tudelft/calibrations/bebop8.xml" />
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI" value="0." unit="deg"/>
diff --git a/conf/airframes/BR/bebop_indi_frog.xml b/conf/airframes/BR/bebop_indi_frog.xml
index 388b1c8a75..3fe7a79818 100644
--- a/conf/airframes/BR/bebop_indi_frog.xml
+++ b/conf/airframes/BR/bebop_indi_frog.xml
@@ -101,7 +101,7 @@
     <define name="CALC_AMSL_BARO" value="TRUE"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/bebop8.xml"/>
+  <include href="conf/airframes/tudelft/calibrations/bebop8.xml"/>
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI" value="0." unit="deg"/>
diff --git a/conf/airframes/BR/bebop_indi_frog_flip.xml b/conf/airframes/BR/bebop_indi_frog_flip.xml
index 8dd0345a57..049528aa16 100644
--- a/conf/airframes/BR/bebop_indi_frog_flip.xml
+++ b/conf/airframes/BR/bebop_indi_frog_flip.xml
@@ -93,7 +93,7 @@
     <define name="CALC_AMSL_BARO" value="TRUE"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/bebop8.xml"/>
+  <include href="conf/airframes/tudelft/calibrations/bebop8.xml"/>
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI" value="0." unit="deg"/>
diff --git a/conf/airframes/BR/conf.xml b/conf/airframes/BR/conf.xml
index c5a84c15ad..4e8c7e5d50 100644
--- a/conf/airframes/BR/conf.xml
+++ b/conf/airframes/BR/conf.xml
@@ -27,7 +27,7 @@
    airframe="airframes/BR/bebop_indi_frog.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_rotorcraft_survey_delft.xml"
+   flight_plan="flight_plans/tudelft/rotorcraft_survey_delft.xml"
    settings="settings/rotorcraft_basic.xml settings/estimation/ahrs_secondary.xml"
    settings_modules="modules/digital_cam_video.xml modules/video_capture.xml modules/nav_survey_poly_rotorcraft.xml modules/nav_survey_rectangle_rotorcraft.xml modules/video_rtp_stream.xml modules/cv_blob_locator.xml modules/air_data.xml modules/geo_mag.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/ahrs_float_mlkf.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#ffff0689b7a1"
diff --git a/conf/airframes/BR/ladybird_kit_bart.xml b/conf/airframes/BR/ladybird_kit_bart.xml
index 74faa52812..4727f251bb 100644
--- a/conf/airframes/BR/ladybird_kit_bart.xml
+++ b/conf/airframes/BR/ladybird_kit_bart.xml
@@ -67,7 +67,7 @@
     <define name="THRUST_COEF" value="{ 256,  256,  256,  256 }"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/ladybird18.xml" />
+  <include href="conf/airframes/tudelft/calibrations/ladybird18.xml" />
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI"   value="0." unit="deg"/>
diff --git a/conf/airframes/BR/ladybird_kit_bart_bluegiga.xml b/conf/airframes/BR/ladybird_kit_bart_bluegiga.xml
index 86d1626775..f00116eab0 100644
--- a/conf/airframes/BR/ladybird_kit_bart_bluegiga.xml
+++ b/conf/airframes/BR/ladybird_kit_bart_bluegiga.xml
@@ -67,7 +67,7 @@
     <define name="THRUST_COEF" value="{ 256,  256,  256,  256 }"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/ladybird18.xml" />
+  <include href="conf/airframes/tudelft/calibrations/ladybird18.xml" />
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI"   value="0." unit="deg"/>
diff --git a/conf/airframes/BR/ladybird_kit_bart_bluegiga_optitrack.xml b/conf/airframes/BR/ladybird_kit_bart_bluegiga_optitrack.xml
index acd5059bb1..c01bd0ae86 100644
--- a/conf/airframes/BR/ladybird_kit_bart_bluegiga_optitrack.xml
+++ b/conf/airframes/BR/ladybird_kit_bart_bluegiga_optitrack.xml
@@ -67,7 +67,7 @@
     <define name="THRUST_COEF" value="{ 256,  256,  256,  256 }"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/ladybird18.xml"/>
+  <include href="conf/airframes/tudelft/calibrations/ladybird18.xml"/>
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI" value="0." unit="deg"/>
diff --git a/conf/airframes/BR/ladybird_kit_indi_bart.xml b/conf/airframes/BR/ladybird_kit_indi_bart.xml
index d30febc17c..12471c368f 100644
--- a/conf/airframes/BR/ladybird_kit_indi_bart.xml
+++ b/conf/airframes/BR/ladybird_kit_indi_bart.xml
@@ -67,7 +67,7 @@
     <define name="THRUST_COEF" value="{ 256,  256,  256,  256 }"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/ladybird18.xml" />
+  <include href="conf/airframes/tudelft/calibrations/ladybird18.xml" />
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI"   value="0." unit="deg"/>
diff --git a/conf/airframes/CDW/cdw_bebop.xml b/conf/airframes/CDW/cdw_bebop.xml
index 442c8cc061..20e53fd61f 100644
--- a/conf/airframes/CDW/cdw_bebop.xml
+++ b/conf/airframes/CDW/cdw_bebop.xml
@@ -99,7 +99,7 @@
     <define name="CALC_AMSL_BARO" value="TRUE"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/bebop5.xml" />
+  <include href="conf/airframes/tudelft/calibrations/bebop5.xml" />
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI" value="0." unit="deg"/>
diff --git a/conf/airframes/CDW/cdw_conf.xml b/conf/airframes/CDW/cdw_conf.xml
index 49a745e1f0..c6b9efb650 100644
--- a/conf/airframes/CDW/cdw_conf.xml
+++ b/conf/airframes/CDW/cdw_conf.xml
@@ -16,7 +16,7 @@
    airframe="airframes/CDW/cdw_bebop.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_rotorcraft_survey_delft.xml"
+   flight_plan="flight_plans/tudelft/rotorcraft_survey_delft.xml"
    settings="settings/rotorcraft_basic.xml settings/estimation/ahrs_secondary.xml settings/control/rotorcraft_speed.xml"
    settings_modules="modules/digital_cam_video.xml modules/video_capture.xml modules/nav_survey_poly_rotorcraft.xml [modules/nav_survey_rectangle_rotorcraft.xml] modules/video_rtp_stream.xml modules/cv_blob_locator.xml modules/air_data.xml modules/geo_mag.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#ffff0689b7a1"
@@ -27,7 +27,7 @@
    airframe="airframes/CDW/cdw_mavtec.xml"
    radio="radios/R6107SP_7ch.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_rotorcraft_survey_imav2015_competition.xml"
+   flight_plan="flight_plans/tudelft/rotorcraft_survey_imav2015_competition.xml"
    settings="settings/rotorcraft_basic.xml settings/modules/config_asctec_v2.xml"
    settings_modules="modules/geo_mag.xml modules/nav_survey_poly_rotorcraft.xml modules/nav_survey_rectangle_rotorcraft.xml modules/gps_ubx_ucenter.xml modules/switch_servo.xml modules/ahrs_float_mlkf.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="blue"
diff --git a/conf/airframes/examples/ardrone2_px4flow_hover.xml b/conf/airframes/examples/ardrone2_px4flow_hover.xml
deleted file mode 100644
index b2ba9218da..0000000000
--- a/conf/airframes/examples/ardrone2_px4flow_hover.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<!DOCTYPE airframe SYSTEM "../airframe.dtd">
-<!-- RM airframe with INDI and video logging-->
-<airframe name="ardrone2_indi">
-  <firmware name="rotorcraft">
-    <target name="ap" board="ardrone2">
-      <define name="FAILSAFE_DESCENT_SPEED" value="0.5"/>
-      <configure name="USE_MAGNETOMETER" value="1"/>
-      <define name="AUTOPILOT_DISABLE_AHRS_KILL"/>
-    </target>
-
-    <target name="nps" board="pc">
-      <module name="fdm" type="jsbsim"/>
-    </target>
-
-    <define name="USE_SONAR" value="TRUE"/>
-
-	<!-- Subsystem section -->
-    <module name="telemetry" type="transparent_udp"/>
-    <module name="radio_control" type="datalink"/>
-    <module name="motor_mixing"/>
-    <module name="actuators" type="ardrone2"/>
-    <module name="imu" type="ardrone2"/>
-    <!-- gps: "ublox" or change to "sirf" for usage with parrot flight recorder -->
-    <module name="gps" type="datalink"/>
-    <module name="stabilization" type="indi_simple"/>
-    <module name="ahrs" type="int_cmpl_quat">
-      <configure name="USE_MAGNETOMETER" value="TRUE"/>
-      <define name="AHRS_USE_GPS_HEADING" value="FALSE"/>
-    </module>
-    <module name="ins" type="extended"/>
-  </firmware>
-
-  <modules main_freq="512">
-    <module name="bat_voltage_ardrone2"/>
-	<module name="opticflow_hover"/>
-	<module name="mavlink_decoder">
-		<configure name="MAVLINK_PORT" value="UART1"/>
-		<configure name="MAVLINK_BAUD" value="B115200"/>
-	</module>
-	<module name="px4flow"/>
-  </modules>
-
-  <commands>
-    <axis name="PITCH" failsafe_value="0"/>
-    <axis name="ROLL" failsafe_value="0"/>
-    <axis name="YAW" failsafe_value="0"/>
-    <axis name="THRUST" failsafe_value="3000"/>
-  </commands>
-
-  <servos driver="Default">
-    <servo name="TOP_LEFT" no="0" min="0" neutral="1" max="500"/>
-    <servo name="TOP_RIGHT" no="1" min="0" neutral="1" max="500"/>
-    <servo name="BOTTOM_RIGHT" no="2" min="0" neutral="1" max="500"/>
-    <servo name="BOTTOM_LEFT" no="3" min="0" neutral="1" max="500"/>
-  </servos>
-
-  <section name="MIXING" prefix="MOTOR_MIXING_">
-    <define name="TRIM_ROLL" value="0"/>
-    <define name="TRIM_PITCH" value="0"/>
-    <define name="TRIM_YAW" value="0"/>
-
-    <!-- Time cross layout (X), with order NW (CW), NE (CCW), SE (CW), SW (CCW) -->
-    <define name="TYPE" value="QUAD_X"/>
-  </section>
-
-  <command_laws>
-    <call fun="motor_mixing_run(autopilot_get_motors_on(),FALSE,values)"/>
-    <set servo="TOP_LEFT" value="motor_mixing.commands[MOTOR_FRONT_LEFT]"/>
-    <set servo="TOP_RIGHT" value="motor_mixing.commands[MOTOR_FRONT_RIGHT]"/>
-    <set servo="BOTTOM_RIGHT" value="motor_mixing.commands[MOTOR_BACK_RIGHT]"/>
-    <set servo="BOTTOM_LEFT" value="motor_mixing.commands[MOTOR_BACK_LEFT]"/>
-  </command_laws>
-
-  <section name="IMU" prefix="IMU_">
-    <!-- Accelero -->
-    <define name="ACCEL_X_NEUTRAL" value="2048"/>
-    <define name="ACCEL_Y_NEUTRAL" value="2048"/>
-    <define name="ACCEL_Z_NEUTRAL" value="2048"/>
-
-    <!-- Magneto calibration -->
-    <define name="MAG_X_NEUTRAL" value="0"/>
-    <define name="MAG_Y_NEUTRAL" value="0"/>
-    <define name="MAG_Z_NEUTRAL" value="-180"/>
-    <define name="MAG_X_SENS" value="16." integer="16"/>
-    <define name="MAG_Y_SENS" value="16." integer="16"/>
-    <define name="MAG_Z_SENS" value="16." integer="16"/>
-
-    <!-- Magneto current calibration -->
-    <define name="MAG_X_CURRENT_COEF" value="0.0"/>
-    <define name="MAG_Y_CURRENT_COEF" value="0.0"/>
-    <define name="MAG_Z_CURRENT_COEF" value="0.0"/>
-
-    <define name="BODY_TO_IMU_PHI" value="0." unit="deg"/>
-    <define name="BODY_TO_IMU_THETA" value="0." unit="deg"/>
-    <define name="BODY_TO_IMU_PSI" value="0." unit="deg"/>
-  </section>
-
-  <!-- local magnetic field -->
-  <!-- http://wiki.paparazziuav.org/wiki/Subsystem/ahrs#Local_Magnetic_Field -->
-  <section name="AHRS" prefix="AHRS_">
-    <!-- values used if no GPS fix, on 3D fix is update by geo_mag module -->
-
-    <!-- Delft -->
-    <define name="H_X" value="0.3892503"/>
-    <define name="H_Y" value="0.0017972"/>
-    <define name="H_Z" value="0.9211303"/>
-  </section>
-
-  <section name="INS" prefix="INS_">
-    <define name="SONAR_MAX_RANGE" value="3.2"/>
-    <define name="SONAR_UPDATE_ON_AGL" value="TRUE"/>
-   <!-- Use GPS altitude measurments and set the R gain -->
-    <!--<define name="USE_GPS_ALT" value="1"/>-->
-    <!--<define name="VFF_R_GPS" value="0.01"/>-->
-  </section>
-
-
-  <section name="RC_SETPOINT" prefix="STABILIZATION_ATTITUDE_">
-    <!-- setpoint limits for attitude stabilization rc flight -->
-    <define name="SP_MAX_PHI" value="45" unit="deg"/>
-    <define name="SP_MAX_THETA" value="45" unit="deg"/>
-    <define name="SP_MAX_R" value="180" unit="deg/s"/>
-    <define name="DEADBAND_A" value="0"/>
-    <define name="DEADBAND_E" value="0"/>
-    <define name="DEADBAND_R" value="250"/>
-  </section>
-
-  <section name="ATTITUDE_REFERENCE" prefix="STABILIZATION_ATTITUDE_">
-    <!-- attitude reference generation model -->
-    <define name="REF_OMEGA_P" value="450" unit="deg/s"/>
-    <define name="REF_ZETA_P" value="0.9"/>
-    <define name="REF_MAX_P" value="600." unit="deg/s"/>
-    <define name="REF_MAX_PDOT" value="RadOfDeg(8000.)"/>
-
-    <define name="REF_OMEGA_Q" value="450" unit="deg/s"/>
-    <define name="REF_ZETA_Q" value="0.9"/>
-    <define name="REF_MAX_Q" value="600." unit="deg/s"/>
-    <define name="REF_MAX_QDOT" value="RadOfDeg(8000.)"/>
-
-    <define name="REF_OMEGA_R" value="450" unit="deg/s"/>
-    <define name="REF_ZETA_R" value="0.9"/>
-    <define name="REF_MAX_R" value="600." unit="deg/s"/>
-    <define name="REF_MAX_RDOT" value="RadOfDeg(8000.)"/>
-  </section>
-
-  <section name="STABILIZATION_ATTITUDE_INDI" prefix="STABILIZATION_INDI_">
-    <!-- control effectiveness -->
-    <define name="G1_P" value="0.032"/>
-    <define name="G1_Q" value="0.025"/>
-    <define name="G1_R" value="0.0032"/>
-    <define name="G2_R" value="0.16"/>
-
-    <!-- reference acceleration for attitude control -->
-    <define name="REF_ERR_P" value="380.0"/>
-    <define name="REF_ERR_Q" value="380.0"/>
-    <define name="REF_ERR_R" value="250.0"/>
-    <define name="REF_RATE_P" value="21.6"/>
-    <define name="REF_RATE_Q" value="21.6"/>
-    <define name="REF_RATE_R" value="21.0"/>
-
-    <!-- second order filter parameters -->
-    <define name="FILT_CUTOFF" value="3.2"/>
-    <define name="FILT_CUTOFF_R" value="3.2"/>
-
-    <!-- first order actuator dynamics -->
-    <define name="ACT_DYN_P" value="0.06"/>
-    <define name="ACT_DYN_Q" value="0.06"/>
-    <define name="ACT_DYN_R" value="0.06"/>
-
-    <!-- Adaptive Learning Rate -->
-    <define name="USE_ADAPTIVE" value="FALSE"/>
-    <define name="ADAPTIVE_MU" value="0.0001"/>
-  </section>
-
-  <section name="GUIDANCE_V" prefix="GUIDANCE_V_">
-    <define name="HOVER_KP" value="283"/>
-    <define name="HOVER_KD" value="82"/>
-    <define name="HOVER_KI" value="13"/>
-    <define name="NOMINAL_HOVER_THROTTLE" value="0.655"/>
-    <define name="ADAPT_THROTTLE_ENABLED" value="FALSE"/>
-  </section>
-
-  <section name="GUIDANCE_H" prefix="GUIDANCE_H_">
-    <!-- Good weather -->
-    <define name="MAX_BANK" value="20" unit="deg"/>
-    <!-- Bad weather -->
-    <!-- define name="MAX_BANK" value="32" unit="deg"/ -->
-    <define name="PGAIN" value="79"/>
-    <define name="DGAIN" value="100"/>
-    <define name="IGAIN" value="30"/>
-  </section>
-
-  <section name="SIMULATOR" prefix="NPS_">
-    <define name="ACTUATOR_NAMES" value="nw_motor, ne_motor, se_motor, sw_motor" type="string[]"/>
-    <define name="JSBSIM_MODEL" value="simple_ardrone2" type="string"/>
-    <define name="JSBSIM_INIT" value="reset00" type="string"/>
-    <define name="SENSORS_PARAMS" value="nps_sensors_params_ardrone2.h" type="string"/>
-  </section>
-
-  <section name="AUTOPILOT">
-    <define name="MODE_STARTUP" value="AP_MODE_NAV"/>
-    <define name="MODE_MANUAL" value="AP_MODE_ATTITUDE_DIRECT"/>
-    <define name="MODE_AUTO1" value="AP_MODE_ATTITUDE_Z_HOLD"/>
-    <define name="MODE_AUTO2" value="AP_MODE_MODULE"/>
-    <define name="NO_RC_THRUST_LIMIT" value="TRUE"/>
-  </section>
-
-  <section name="BAT">
-    <define name="MILLIAMP_AT_FULL_THROTTLE" value="8700"/>
-    <define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/>
-    <define name="CRITIC_BAT_LEVEL" value="9.8" unit="V"/>
-    <define name="LOW_BAT_LEVEL" value="10.2" unit="V"/>
-    <define name="MAX_BAT_LEVEL" value="12.6" unit="V"/>
-  </section>
-</airframe>
diff --git a/conf/airframes/tudelft/.conf.xml.swo b/conf/airframes/tudelft/.conf.xml.swo
new file mode 100644
index 0000000000..fbc6a01727
Binary files /dev/null and b/conf/airframes/tudelft/.conf.xml.swo differ
diff --git a/conf/airframes/TUDELFT/IMAV2013/tudelft_ardrone2.xml b/conf/airframes/tudelft/IMAV2013/ardrone2.xml
similarity index 98%
rename from conf/airframes/TUDELFT/IMAV2013/tudelft_ardrone2.xml
rename to conf/airframes/tudelft/IMAV2013/ardrone2.xml
index 75355970aa..50dac0d778 100644
--- a/conf/airframes/TUDELFT/IMAV2013/tudelft_ardrone2.xml
+++ b/conf/airframes/tudelft/IMAV2013/ardrone2.xml
@@ -71,7 +71,7 @@
     <set servo="BOTTOM_RIGHT" value="motor_mixing.commands[3]"/>
   </command_laws>
 
-  <include href="conf/airframes/TUDELFT/IMAV2013/calibrations/$AC_ID_calib.xml"/>
+  <include href="conf/airframes/tudelft/IMAV2013/calibrations/$AC_ID_calib.xml"/>
   <section name="IMU" prefix="IMU_">
     <!-- Body to IMU is no difference -->
     <define name="BODY_TO_IMU_PHI" value="0." unit="deg"/>
diff --git a/conf/airframes/TUDELFT/IMAV2013/calibrations/182_calib.xml b/conf/airframes/tudelft/IMAV2013/calibrations/182_calib.xml
similarity index 100%
rename from conf/airframes/TUDELFT/IMAV2013/calibrations/182_calib.xml
rename to conf/airframes/tudelft/IMAV2013/calibrations/182_calib.xml
diff --git a/conf/airframes/TUDELFT/IMAV2013/tudelft_chouchou_lisa_s.xml b/conf/airframes/tudelft/IMAV2013/chouchou_lisa_s.xml
similarity index 100%
rename from conf/airframes/TUDELFT/IMAV2013/tudelft_chouchou_lisa_s.xml
rename to conf/airframes/tudelft/IMAV2013/chouchou_lisa_s.xml
diff --git a/conf/airframes/TUDELFT/IMAV2013/tudelft_mavrick_lisa_s.xml b/conf/airframes/tudelft/IMAV2013/mavrick_lisa_s.xml
similarity index 99%
rename from conf/airframes/TUDELFT/IMAV2013/tudelft_mavrick_lisa_s.xml
rename to conf/airframes/tudelft/IMAV2013/mavrick_lisa_s.xml
index b735253b61..d74a59bd1e 100644
--- a/conf/airframes/TUDELFT/IMAV2013/tudelft_mavrick_lisa_s.xml
+++ b/conf/airframes/tudelft/IMAV2013/mavrick_lisa_s.xml
@@ -3,7 +3,7 @@
 
 <!--
      Applicable configuration:
-     airframe="airframes/TUDELFT/IMAV2013/tudelft_mavrick_lisa_s.xml"
+     airframe="airframes/tudelft/IMAV2013/mavrick_lisa_s.xml"
      radio="radios/cockpitSX.xml"
      telemetry="telemetry/default_fixedwing.xml"
      flight_plan="flight_plans/fixedwing_basic.xml"
diff --git a/conf/airframes/TUDELFT/IMAV2013/tudelft_quadrotor_lisa_s.xml b/conf/airframes/tudelft/IMAV2013/quadrotor_lisa_s.xml
similarity index 100%
rename from conf/airframes/TUDELFT/IMAV2013/tudelft_quadrotor_lisa_s.xml
rename to conf/airframes/tudelft/IMAV2013/quadrotor_lisa_s.xml
diff --git a/conf/airframes/TUDELFT/IMAV2013/tudelft_walkera_V120D02S.xml b/conf/airframes/tudelft/IMAV2013/walkera_V120D02S.xml
similarity index 98%
rename from conf/airframes/TUDELFT/IMAV2013/tudelft_walkera_V120D02S.xml
rename to conf/airframes/tudelft/IMAV2013/walkera_V120D02S.xml
index d8a7008fb0..9623233f62 100644
--- a/conf/airframes/TUDELFT/IMAV2013/tudelft_walkera_V120D02S.xml
+++ b/conf/airframes/tudelft/IMAV2013/walkera_V120D02S.xml
@@ -3,7 +3,7 @@
 
 <!--
      Applicable configuration:
-     airframe="airframes/TUDELFT/IMAV2013/tudelft_walkera_V120D02S.xml"
+     airframe="airframes/tudelft/IMAV2013/walkera_V120D02S.xml"
      radio="radios/cockpitSX.xml"
      telemetry="telemetry/default_rotorcraft.xml"
      flight_plan="flight_plans/rotorcraft_basic.xml"
diff --git a/conf/airframes/TUDELFT/IMAV2013/tudelft_walkera_genius_v1.xml b/conf/airframes/tudelft/IMAV2013/walkera_genius_v1.xml
similarity index 98%
rename from conf/airframes/TUDELFT/IMAV2013/tudelft_walkera_genius_v1.xml
rename to conf/airframes/tudelft/IMAV2013/walkera_genius_v1.xml
index 7cc48b2b74..c8cdef913b 100644
--- a/conf/airframes/TUDELFT/IMAV2013/tudelft_walkera_genius_v1.xml
+++ b/conf/airframes/tudelft/IMAV2013/walkera_genius_v1.xml
@@ -3,7 +3,7 @@
 
 <!--
      Applicable configuration:
-     airframe="airframes/TUDELFT/IMAV2013/tudelft_walkera_genius_v1.xml"
+     airframe="airframes/tudelft/IMAV2013/walkera_genius_v1.xml"
      radio="radios/cockpitSX.xml"
      telemetry="telemetry/default_rotorcraft.xml"
      flight_plan="flight_plans/rotorcraft_basic.xml"
diff --git a/conf/airframes/TUDELFT/tudelft_aa_quadplane.xml b/conf/airframes/tudelft/aa_quadplane.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_aa_quadplane.xml
rename to conf/airframes/tudelft/aa_quadplane.xml
diff --git a/conf/airframes/TUDELFT/tudelft_ardrone2_flip.xml b/conf/airframes/tudelft/ardrone2_flip.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_ardrone2_flip.xml
rename to conf/airframes/tudelft/ardrone2_flip.xml
diff --git a/conf/airframes/TUDELFT/tudelft_ardrone2_indi.xml b/conf/airframes/tudelft/ardrone2_indi.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_ardrone2_indi.xml
rename to conf/airframes/tudelft/ardrone2_indi.xml
diff --git a/conf/airframes/TUDELFT/tudelft_ardrone2_oa_clint_roland.xml b/conf/airframes/tudelft/ardrone2_oa_clint_roland.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_ardrone2_oa_clint_roland.xml
rename to conf/airframes/tudelft/ardrone2_oa_clint_roland.xml
diff --git a/conf/airframes/TUDELFT/tudelft_ardrone2_opticflow.xml b/conf/airframes/tudelft/ardrone2_opticflow.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_ardrone2_opticflow.xml
rename to conf/airframes/tudelft/ardrone2_opticflow.xml
diff --git a/conf/airframes/TUDELFT/tudelft_ardrone2_opticflow_indi.xml b/conf/airframes/tudelft/ardrone2_opticflow_indi.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_ardrone2_opticflow_indi.xml
rename to conf/airframes/tudelft/ardrone2_opticflow_indi.xml
diff --git a/conf/airframes/TUDELFT/tudelft_ardrone2_opticflow_stereo.xml b/conf/airframes/tudelft/ardrone2_opticflow_stereo.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_ardrone2_opticflow_stereo.xml
rename to conf/airframes/tudelft/ardrone2_opticflow_stereo.xml
diff --git a/conf/airframes/TUDELFT/tudelft_ardrone2_optitrack.xml b/conf/airframes/tudelft/ardrone2_optitrack.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_ardrone2_optitrack.xml
rename to conf/airframes/tudelft/ardrone2_optitrack.xml
diff --git a/conf/airframes/TUDELFT/tudelft_asctec_freek.xml b/conf/airframes/tudelft/asctec_freek.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_asctec_freek.xml
rename to conf/airframes/tudelft/asctec_freek.xml
diff --git a/conf/airframes/TUDELFT/tudelft_bebop2_indi.xml b/conf/airframes/tudelft/bebop2_indi.xml
similarity index 99%
rename from conf/airframes/TUDELFT/tudelft_bebop2_indi.xml
rename to conf/airframes/tudelft/bebop2_indi.xml
index 5941d4044c..678f0bae54 100644
--- a/conf/airframes/TUDELFT/tudelft_bebop2_indi.xml
+++ b/conf/airframes/tudelft/bebop2_indi.xml
@@ -73,7 +73,7 @@
     <define name="CALC_AMSL_BARO" value="TRUE"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/bebop2_$AC_ID.xml" />
+  <include href="conf/airframes/tudelft/calibrations/bebop2_$AC_ID.xml" />
 
   <!-- local magnetic field -->
   <!-- http://wiki.paparazziuav.org/wiki/Subsystem/ahrs#Local_Magnetic_Field -->
diff --git a/conf/airframes/TUDELFT/tudelft_bebop2_indi_MAVlink.xml b/conf/airframes/tudelft/bebop2_indi_MAVlink.xml
similarity index 99%
rename from conf/airframes/TUDELFT/tudelft_bebop2_indi_MAVlink.xml
rename to conf/airframes/tudelft/bebop2_indi_MAVlink.xml
index 21885c72fa..c0cf43f10a 100644
--- a/conf/airframes/TUDELFT/tudelft_bebop2_indi_MAVlink.xml
+++ b/conf/airframes/tudelft/bebop2_indi_MAVlink.xml
@@ -81,7 +81,7 @@
     <define name="CALC_AMSL_BARO" value="TRUE"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/bebop2_$AC_ID.xml" />
+  <include href="conf/airframes/tudelft/calibrations/bebop2_$AC_ID.xml" />
 
   <!-- local magnetic field -->
   <!-- http://wiki.paparazziuav.org/wiki/Subsystem/ahrs#Local_Magnetic_Field -->
diff --git a/conf/airframes/TUDELFT/tudelft_bebop2_no_damping.xml b/conf/airframes/tudelft/bebop2_no_damping.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_bebop2_no_damping.xml
rename to conf/airframes/tudelft/bebop2_no_damping.xml
diff --git a/conf/airframes/TUDELFT/tudelft_bebop2_opticflow.xml b/conf/airframes/tudelft/bebop2_opticflow.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_bebop2_opticflow.xml
rename to conf/airframes/tudelft/bebop2_opticflow.xml
diff --git a/conf/airframes/TUDELFT/tudelft_bebop2_vision.xml b/conf/airframes/tudelft/bebop2_vision.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_bebop2_vision.xml
rename to conf/airframes/tudelft/bebop2_vision.xml
diff --git a/conf/airframes/TUDELFT/tudelft_bebop_autonomous_race.xml b/conf/airframes/tudelft/bebop_autonomous_race.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_bebop_autonomous_race.xml
rename to conf/airframes/tudelft/bebop_autonomous_race.xml
diff --git a/conf/airframes/TUDELFT/tudelft_bebop_flip.xml b/conf/airframes/tudelft/bebop_flip.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_bebop_flip.xml
rename to conf/airframes/tudelft/bebop_flip.xml
diff --git a/conf/airframes/TUDELFT/tudelft_bebop_frontcam.xml b/conf/airframes/tudelft/bebop_frontcam.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_bebop_frontcam.xml
rename to conf/airframes/tudelft/bebop_frontcam.xml
diff --git a/conf/airframes/TUDELFT/tudelft_bebop_indi.xml b/conf/airframes/tudelft/bebop_indi.xml
similarity index 99%
rename from conf/airframes/TUDELFT/tudelft_bebop_indi.xml
rename to conf/airframes/tudelft/bebop_indi.xml
index d47a79ba62..8776a54ba6 100644
--- a/conf/airframes/TUDELFT/tudelft_bebop_indi.xml
+++ b/conf/airframes/tudelft/bebop_indi.xml
@@ -77,7 +77,7 @@
     <define name="CALC_AMSL_BARO" value="TRUE"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/bebop7.xml" />
+  <include href="conf/airframes/tudelft/calibrations/bebop7.xml" />
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI" value="0." unit="deg"/>
diff --git a/conf/airframes/TUDELFT/tudelft_bebop_indi_actuators.xml b/conf/airframes/tudelft/bebop_indi_actuators.xml
similarity index 99%
rename from conf/airframes/TUDELFT/tudelft_bebop_indi_actuators.xml
rename to conf/airframes/tudelft/bebop_indi_actuators.xml
index ae9ef4af09..998a492f1f 100644
--- a/conf/airframes/TUDELFT/tudelft_bebop_indi_actuators.xml
+++ b/conf/airframes/tudelft/bebop_indi_actuators.xml
@@ -72,7 +72,7 @@
     <define name="CALC_AMSL_BARO" value="TRUE"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/bebop7.xml" />
+  <include href="conf/airframes/tudelft/calibrations/bebop7.xml" />
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI" value="0." unit="deg"/>
diff --git a/conf/airframes/TUDELFT/tudelft_bebop_mavlink.xml b/conf/airframes/tudelft/bebop_mavlink.xml
similarity index 99%
rename from conf/airframes/TUDELFT/tudelft_bebop_mavlink.xml
rename to conf/airframes/tudelft/bebop_mavlink.xml
index 5d4660a796..e2be795659 100644
--- a/conf/airframes/TUDELFT/tudelft_bebop_mavlink.xml
+++ b/conf/airframes/tudelft/bebop_mavlink.xml
@@ -109,7 +109,7 @@
     <define name="CALC_AMSL_BARO" value="TRUE"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/bebop5.xml" />
+  <include href="conf/airframes/tudelft/calibrations/bebop5.xml" />
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI" value="0." unit="deg"/>
diff --git a/conf/airframes/TUDELFT/tudelft_bebop_opticflow.xml b/conf/airframes/tudelft/bebop_opticflow.xml
similarity index 99%
rename from conf/airframes/TUDELFT/tudelft_bebop_opticflow.xml
rename to conf/airframes/tudelft/bebop_opticflow.xml
index e132ccecd2..0ea59192dc 100644
--- a/conf/airframes/TUDELFT/tudelft_bebop_opticflow.xml
+++ b/conf/airframes/tudelft/bebop_opticflow.xml
@@ -90,7 +90,7 @@
     <define name="CALC_AMSL_BARO" value="TRUE"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/bebopTUBB17.xml"/>
+  <include href="conf/airframes/tudelft/calibrations/bebopTUBB17.xml"/>
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI" value="0." unit="deg"/>
diff --git a/conf/airframes/TUDELFT/tudelft_bebop_optitrack.xml b/conf/airframes/tudelft/bebop_optitrack.xml
similarity index 99%
rename from conf/airframes/TUDELFT/tudelft_bebop_optitrack.xml
rename to conf/airframes/tudelft/bebop_optitrack.xml
index a973e67c81..1b291487f7 100644
--- a/conf/airframes/TUDELFT/tudelft_bebop_optitrack.xml
+++ b/conf/airframes/tudelft/bebop_optitrack.xml
@@ -74,7 +74,7 @@
     <define name="CALC_AMSL_BARO" value="TRUE"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/bebop7.xml" />
+  <include href="conf/airframes/tudelft/calibrations/bebop7.xml" />
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI" value="0." unit="deg"/>
diff --git a/conf/airframes/TUDELFT/tudelft_bs_helidd_indi.xml b/conf/airframes/tudelft/bs_helidd_indi.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_bs_helidd_indi.xml
rename to conf/airframes/tudelft/bs_helidd_indi.xml
diff --git a/conf/airframes/TUDELFT/tudelft_bs_helidd_pid.xml b/conf/airframes/tudelft/bs_helidd_pid.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_bs_helidd_pid.xml
rename to conf/airframes/tudelft/bs_helidd_pid.xml
diff --git a/conf/airframes/TUDELFT/calibrations/bebop2_22.xml b/conf/airframes/tudelft/calibrations/bebop2_22.xml
similarity index 100%
rename from conf/airframes/TUDELFT/calibrations/bebop2_22.xml
rename to conf/airframes/tudelft/calibrations/bebop2_22.xml
diff --git a/conf/airframes/TUDELFT/calibrations/bebop2_23.xml b/conf/airframes/tudelft/calibrations/bebop2_23.xml
similarity index 100%
rename from conf/airframes/TUDELFT/calibrations/bebop2_23.xml
rename to conf/airframes/tudelft/calibrations/bebop2_23.xml
diff --git a/conf/airframes/TUDELFT/calibrations/bebop5.xml b/conf/airframes/tudelft/calibrations/bebop5.xml
similarity index 100%
rename from conf/airframes/TUDELFT/calibrations/bebop5.xml
rename to conf/airframes/tudelft/calibrations/bebop5.xml
diff --git a/conf/airframes/TUDELFT/calibrations/bebop7.xml b/conf/airframes/tudelft/calibrations/bebop7.xml
similarity index 100%
rename from conf/airframes/TUDELFT/calibrations/bebop7.xml
rename to conf/airframes/tudelft/calibrations/bebop7.xml
diff --git a/conf/airframes/TUDELFT/calibrations/bebop8.xml b/conf/airframes/tudelft/calibrations/bebop8.xml
similarity index 100%
rename from conf/airframes/TUDELFT/calibrations/bebop8.xml
rename to conf/airframes/tudelft/calibrations/bebop8.xml
diff --git a/conf/airframes/TUDELFT/calibrations/bebopTUBB17.xml b/conf/airframes/tudelft/calibrations/bebopTUBB17.xml
similarity index 100%
rename from conf/airframes/TUDELFT/calibrations/bebopTUBB17.xml
rename to conf/airframes/tudelft/calibrations/bebopTUBB17.xml
diff --git a/conf/airframes/TUDELFT/calibrations/bebop_bart.xml b/conf/airframes/tudelft/calibrations/bebop_bart.xml
similarity index 100%
rename from conf/airframes/TUDELFT/calibrations/bebop_bart.xml
rename to conf/airframes/tudelft/calibrations/bebop_bart.xml
diff --git a/conf/airframes/TUDELFT/calibrations/ladybird1.xml b/conf/airframes/tudelft/calibrations/ladybird1.xml
similarity index 100%
rename from conf/airframes/TUDELFT/calibrations/ladybird1.xml
rename to conf/airframes/tudelft/calibrations/ladybird1.xml
diff --git a/conf/airframes/TUDELFT/calibrations/ladybird18.xml b/conf/airframes/tudelft/calibrations/ladybird18.xml
similarity index 100%
rename from conf/airframes/TUDELFT/calibrations/ladybird18.xml
rename to conf/airframes/tudelft/calibrations/ladybird18.xml
diff --git a/conf/airframes/TUDELFT/tudelft_control_panel.xml b/conf/airframes/tudelft/control_panel.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_control_panel.xml
rename to conf/airframes/tudelft/control_panel.xml
diff --git a/conf/airframes/TUDELFT/tudelft_cx10.xml b/conf/airframes/tudelft/cx10.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_cx10.xml
rename to conf/airframes/tudelft/cx10.xml
diff --git a/conf/airframes/TUDELFT/tudelft_delfly.xml b/conf/airframes/tudelft/delfly.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_delfly.xml
rename to conf/airframes/tudelft/delfly.xml
diff --git a/conf/airframes/TUDELFT/tudelft_fan_demo.xml b/conf/airframes/tudelft/fan_demo.xml
similarity index 99%
rename from conf/airframes/TUDELFT/tudelft_fan_demo.xml
rename to conf/airframes/tudelft/fan_demo.xml
index e2e7956d07..fa1f151b67 100644
--- a/conf/airframes/TUDELFT/tudelft_fan_demo.xml
+++ b/conf/airframes/tudelft/fan_demo.xml
@@ -63,7 +63,7 @@
     <define name="CALC_AMSL_BARO" value="TRUE"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/bebop7.xml" />
+  <include href="conf/airframes/tudelft/calibrations/bebop7.xml" />
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI" value="0." unit="deg"/>
diff --git a/conf/airframes/TUDELFT/tudelft_guido_ardrone2_optitrack.xml b/conf/airframes/tudelft/guido_ardrone2_optitrack.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_guido_ardrone2_optitrack.xml
rename to conf/airframes/tudelft/guido_ardrone2_optitrack.xml
diff --git a/conf/airframes/TUDELFT/tudelft_guido_conf.xml b/conf/airframes/tudelft/guido_conf.xml
similarity index 91%
rename from conf/airframes/TUDELFT/tudelft_guido_conf.xml
rename to conf/airframes/tudelft/guido_conf.xml
index da4454f733..d7212033e7 100644
--- a/conf/airframes/TUDELFT/tudelft_guido_conf.xml
+++ b/conf/airframes/tudelft/guido_conf.xml
@@ -2,7 +2,7 @@
   <aircraft
    name="ARDrone2_Guido_optitrack"
    ac_id="29"
-   airframe="airframes/TUDELFT/tudelft_guido_ardrone2_optitrack.xml"
+   airframe="airframes/tudelft/guido_ardrone2_optitrack.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_guido_optitrack.xml"
@@ -13,7 +13,7 @@
   <aircraft
    name="Bebop2_opticflow"
    ac_id="4"
-   airframe="airframes/TUDELFT/tudelft_bebop2_opticflow.xml"
+   airframe="airframes/tudelft/bebop2_opticflow.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_guido_optitrack.xml"
@@ -24,7 +24,7 @@
   <aircraft
    name="Bebop_opticflow"
    ac_id="14"
-   airframe="airframes/TUDELFT/tudelft_bebop_opticflow.xml"
+   airframe="airframes/tudelft/bebop_opticflow.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
diff --git a/conf/airframes/TUDELFT/tudelft_guido_control_panel.xml b/conf/airframes/tudelft/guido_control_panel.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_guido_control_panel.xml
rename to conf/airframes/tudelft/guido_control_panel.xml
diff --git a/conf/airframes/TUDELFT/tudelft_heli450.xml b/conf/airframes/tudelft/heli450.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_heli450.xml
rename to conf/airframes/tudelft/heli450.xml
diff --git a/conf/airframes/TUDELFT/tudelft_heliGeniusDD.xml b/conf/airframes/tudelft/heliGeniusDD.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_heliGeniusDD.xml
rename to conf/airframes/tudelft/heliGeniusDD.xml
diff --git a/conf/airframes/TUDELFT/tudelft_iris_indi.xml b/conf/airframes/tudelft/iris_indi.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_iris_indi.xml
rename to conf/airframes/tudelft/iris_indi.xml
diff --git a/conf/airframes/TUDELFT/tudelft_ladybird_lisa_mxs.xml b/conf/airframes/tudelft/ladybird_lisa_mxs.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_ladybird_lisa_mxs.xml
rename to conf/airframes/tudelft/ladybird_lisa_mxs.xml
diff --git a/conf/airframes/TUDELFT/tudelft_ladybird_lisamxs_wifi_indi_stereoboard.xml b/conf/airframes/tudelft/ladybird_lisamxs_wifi_indi_stereoboard.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_ladybird_lisamxs_wifi_indi_stereoboard.xml
rename to conf/airframes/tudelft/ladybird_lisamxs_wifi_indi_stereoboard.xml
diff --git a/conf/airframes/TUDELFT/tudelft_ladylisa_bluegiga_stereoboard.xml b/conf/airframes/tudelft/ladylisa_bluegiga_stereoboard.xml
similarity index 99%
rename from conf/airframes/TUDELFT/tudelft_ladylisa_bluegiga_stereoboard.xml
rename to conf/airframes/tudelft/ladylisa_bluegiga_stereoboard.xml
index 63e0e5221b..06b1b19411 100644
--- a/conf/airframes/TUDELFT/tudelft_ladylisa_bluegiga_stereoboard.xml
+++ b/conf/airframes/tudelft/ladylisa_bluegiga_stereoboard.xml
@@ -67,7 +67,7 @@
     <define name="THRUST_COEF" value="{ 256,  256,  256,  256 }"/>
   </section>
 
-  <include href="conf/airframes/TUDELFT/calibrations/ladybird18.xml"/>
+  <include href="conf/airframes/tudelft/calibrations/ladybird18.xml"/>
 
   <section name="IMU" prefix="IMU_">
     <define name="BODY_TO_IMU_PHI" value="0." unit="deg"/>
diff --git a/conf/airframes/TUDELFT/tudelft_logo600.xml b/conf/airframes/tudelft/logo600.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_logo600.xml
rename to conf/airframes/tudelft/logo600.xml
diff --git a/conf/airframes/TUDELFT/tudelft_mavshot.xml b/conf/airframes/tudelft/mavshot.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_mavshot.xml
rename to conf/airframes/tudelft/mavshot.xml
diff --git a/conf/airframes/TUDELFT/tudelft_mavtec1.xml b/conf/airframes/tudelft/mavtec1.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_mavtec1.xml
rename to conf/airframes/tudelft/mavtec1.xml
diff --git a/conf/airframes/TUDELFT/tudelft_mavtec4.xml b/conf/airframes/tudelft/mavtec4.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_mavtec4.xml
rename to conf/airframes/tudelft/mavtec4.xml
diff --git a/conf/airframes/TUDELFT/tudelft_mavtec5.xml b/conf/airframes/tudelft/mavtec5.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_mavtec5.xml
rename to conf/airframes/tudelft/mavtec5.xml
diff --git a/conf/airframes/TUDELFT/tudelft_outback.xml b/conf/airframes/tudelft/outback.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_outback.xml
rename to conf/airframes/tudelft/outback.xml
diff --git a/conf/airframes/TUDELFT/tudelft_quadshot_pylons.xml b/conf/airframes/tudelft/quadshot_pylons.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_quadshot_pylons.xml
rename to conf/airframes/tudelft/quadshot_pylons.xml
diff --git a/conf/airframes/TUDELFT/tudelft_quadthopter.xml b/conf/airframes/tudelft/quadthopter.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_quadthopter.xml
rename to conf/airframes/tudelft/quadthopter.xml
diff --git a/conf/airframes/TUDELFT/tudelft_robird.xml b/conf/airframes/tudelft/robird.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_robird.xml
rename to conf/airframes/tudelft/robird.xml
diff --git a/conf/airframes/TUDELFT/tudelft_selfie.xml b/conf/airframes/tudelft/selfie.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_selfie.xml
rename to conf/airframes/tudelft/selfie.xml
diff --git a/conf/airframes/TUDELFT/tudelft_silverlit_lisas.xml b/conf/airframes/tudelft/silverlit_lisas.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_silverlit_lisas.xml
rename to conf/airframes/tudelft/silverlit_lisas.xml
diff --git a/conf/airframes/TUDELFT/tudelft_splash.xml b/conf/airframes/tudelft/splash.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_splash.xml
rename to conf/airframes/tudelft/splash.xml
diff --git a/conf/airframes/TUDELFT/tudelft_twoseastwenty.xml b/conf/airframes/tudelft/twoseastwenty.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_twoseastwenty.xml
rename to conf/airframes/tudelft/twoseastwenty.xml
diff --git a/conf/airframes/TUDELFT/tudelft_walkera_genius_v2.xml b/conf/airframes/tudelft/walkera_genius_v2.xml
similarity index 99%
rename from conf/airframes/TUDELFT/tudelft_walkera_genius_v2.xml
rename to conf/airframes/tudelft/walkera_genius_v2.xml
index 78ad8c10a0..c28d7c220e 100644
--- a/conf/airframes/TUDELFT/tudelft_walkera_genius_v2.xml
+++ b/conf/airframes/tudelft/walkera_genius_v2.xml
@@ -130,7 +130,7 @@ Using Lisa/S V1.0 board file as it is software compatible.
   </section>
 
   <!-- magneto calibration -->
-  <!--include href="conf/airframes/TUDELFT/calibrations/walkera_2016_03_16.xml"/-->
+  <!--include href="conf/airframes/tudelft/calibrations/walkera_2016_03_16.xml"/-->
 
   <heli_curves>
     <curve throttle="0,4800,7200,8400,9600" collective="-1500,-1500,0,3000,3000"/>
diff --git a/conf/airframes/TUDELFT/tudelft_xvert.xml b/conf/airframes/tudelft/xvert.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_xvert.xml
rename to conf/airframes/tudelft/xvert.xml
diff --git a/conf/airframes/TUDELFT/tudelft_yapa_xsens.xml b/conf/airframes/tudelft/yapa_xsens.xml
similarity index 100%
rename from conf/airframes/TUDELFT/tudelft_yapa_xsens.xml
rename to conf/airframes/tudelft/yapa_xsens.xml
diff --git a/conf/conf_tests.xml b/conf/conf_tests.xml
index 53dd9fc0ce..a2194f64a4 100644
--- a/conf/conf_tests.xml
+++ b/conf/conf_tests.xml
@@ -68,10 +68,10 @@
   <aircraft
    name="Iris"
    ac_id="44"
-   airframe="airframes/TUDELFT/tudelft_iris_indi.xml"
+   airframe="airframes/tudelft/iris_indi.xml"
    radio="radios/FrSky3dr.xml"
    telemetry="telemetry/default_rotorcraft_slow.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_delft_basic.xml"
+   flight_plan="flight_plans/tudelft/delft_basic.xml"
    settings="settings/rotorcraft_basic.xml"
    settings_modules="[modules/air_data.xml] modules/geo_mag.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps_ubx_ucenter.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#ffffcccaccca"
@@ -376,7 +376,7 @@
   <aircraft
    name="Yapa2_XSens"
    ac_id="29"
-   airframe="airframes/TUDELFT/tudelft_yapa_xsens.xml"
+   airframe="airframes/tudelft/yapa_xsens.xml"
    radio="radios/R6107SP_7ch.xml"
    telemetry="telemetry/default_fixedwing_imu_9k6.xml"
    flight_plan="flight_plans/versatile.xml"
diff --git a/conf/conf_tests_coverity.xml b/conf/conf_tests_coverity.xml
index 8738d4ffc4..ddb306f9bb 100644
--- a/conf/conf_tests_coverity.xml
+++ b/conf/conf_tests_coverity.xml
@@ -343,7 +343,7 @@
   <aircraft
    name="Yapa2_XSens"
    ac_id="29"
-   airframe="airframes/TUDELFT/tudelft_yapa_xsens.xml"
+   airframe="airframes/tudelft/yapa_xsens.xml"
    radio="radios/R6107SP_7ch.xml"
    telemetry="telemetry/default_fixedwing_imu_9k6.xml"
    flight_plan="flight_plans/versatile.xml"
diff --git a/conf/flight_plans/TUDELFT/tudelft_course2016_avoid_orange_cyberzoo.xml b/conf/flight_plans/tudelft/course2016_avoid_orange_cyberzoo.xml
similarity index 100%
rename from conf/flight_plans/TUDELFT/tudelft_course2016_avoid_orange_cyberzoo.xml
rename to conf/flight_plans/tudelft/course2016_avoid_orange_cyberzoo.xml
diff --git a/conf/flight_plans/TUDELFT/tudelft_delft_basic.xml b/conf/flight_plans/tudelft/delft_basic.xml
similarity index 100%
rename from conf/flight_plans/TUDELFT/tudelft_delft_basic.xml
rename to conf/flight_plans/tudelft/delft_basic.xml
diff --git a/conf/flight_plans/TUDELFT/fan_demo.xml b/conf/flight_plans/tudelft/fan_demo.xml
similarity index 100%
rename from conf/flight_plans/TUDELFT/fan_demo.xml
rename to conf/flight_plans/tudelft/fan_demo.xml
diff --git a/conf/flight_plans/TUDELFT/tudelft_mavtec_outdoor_demo.xml b/conf/flight_plans/tudelft/mavtec_outdoor_demo.xml
similarity index 100%
rename from conf/flight_plans/TUDELFT/tudelft_mavtec_outdoor_demo.xml
rename to conf/flight_plans/tudelft/mavtec_outdoor_demo.xml
diff --git a/conf/flight_plans/TUDELFT/obc2016/include_obc2016_mission.xml b/conf/flight_plans/tudelft/obc2016/include_obc2016_mission.xml
similarity index 100%
rename from conf/flight_plans/TUDELFT/obc2016/include_obc2016_mission.xml
rename to conf/flight_plans/tudelft/obc2016/include_obc2016_mission.xml
diff --git a/conf/flight_plans/TUDELFT/obc2016/include_obc2016_safety.xml b/conf/flight_plans/tudelft/obc2016/include_obc2016_safety.xml
similarity index 100%
rename from conf/flight_plans/TUDELFT/obc2016/include_obc2016_safety.xml
rename to conf/flight_plans/tudelft/obc2016/include_obc2016_safety.xml
diff --git a/conf/flight_plans/TUDELFT/obc2016/obc2016.xml b/conf/flight_plans/tudelft/obc2016/obc2016.xml
similarity index 100%
rename from conf/flight_plans/TUDELFT/obc2016/obc2016.xml
rename to conf/flight_plans/tudelft/obc2016/obc2016.xml
diff --git a/conf/flight_plans/TUDELFT/rotorcraft_selfie.xml b/conf/flight_plans/tudelft/rotorcraft_selfie.xml
similarity index 100%
rename from conf/flight_plans/TUDELFT/rotorcraft_selfie.xml
rename to conf/flight_plans/tudelft/rotorcraft_selfie.xml
diff --git a/conf/flight_plans/TUDELFT/tudelft_rotorcraft_survey_antwerpen.xml b/conf/flight_plans/tudelft/rotorcraft_survey_antwerpen.xml
similarity index 92%
rename from conf/flight_plans/TUDELFT/tudelft_rotorcraft_survey_antwerpen.xml
rename to conf/flight_plans/tudelft/rotorcraft_survey_antwerpen.xml
index 977175c509..40d37907fb 100644
--- a/conf/flight_plans/TUDELFT/tudelft_rotorcraft_survey_antwerpen.xml
+++ b/conf/flight_plans/tudelft/rotorcraft_survey_antwerpen.xml
@@ -21,7 +21,7 @@
   </waypoints>
 
   <includes>
-    <include name="Mission" procedure="tudelft_rotorcraft_survey_mission.xml"/>
+    <include name="Mission" procedure="rotorcraft_survey_mission.xml"/>
   </includes>
 
   <blocks>
diff --git a/conf/flight_plans/TUDELFT/tudelft_rotorcraft_survey_aubel.xml b/conf/flight_plans/tudelft/rotorcraft_survey_aubel.xml
similarity index 97%
rename from conf/flight_plans/TUDELFT/tudelft_rotorcraft_survey_aubel.xml
rename to conf/flight_plans/tudelft/rotorcraft_survey_aubel.xml
index 82b5836a90..26376ad1fe 100644
--- a/conf/flight_plans/TUDELFT/tudelft_rotorcraft_survey_aubel.xml
+++ b/conf/flight_plans/tudelft/rotorcraft_survey_aubel.xml
@@ -60,7 +60,7 @@
     </sector>
   </sectors>
   <includes>
-    <include name="Mission" procedure="tudelft_rotorcraft_survey_mission.xml"/>
+    <include name="Mission" procedure="rotorcraft_survey_mission.xml"/>
   </includes>
   <blocks>
     <block name="Dummy"/>
diff --git a/conf/flight_plans/TUDELFT/tudelft_rotorcraft_survey_delft.xml b/conf/flight_plans/tudelft/rotorcraft_survey_delft.xml
similarity index 97%
rename from conf/flight_plans/TUDELFT/tudelft_rotorcraft_survey_delft.xml
rename to conf/flight_plans/tudelft/rotorcraft_survey_delft.xml
index e3e8ca95dd..abb7820299 100644
--- a/conf/flight_plans/TUDELFT/tudelft_rotorcraft_survey_delft.xml
+++ b/conf/flight_plans/tudelft/rotorcraft_survey_delft.xml
@@ -72,7 +72,7 @@
     </sector>
   </sectors>
   <includes>
-    <include name="Mission" procedure="tudelft_rotorcraft_survey_mission.xml"/>
+    <include name="Mission" procedure="rotorcraft_survey_mission.xml"/>
   </includes>
   <blocks>
     <block name="Dummy"/>
diff --git a/conf/flight_plans/TUDELFT/tudelft_rotorcraft_survey_imav2015_competition.xml b/conf/flight_plans/tudelft/rotorcraft_survey_imav2015_competition.xml
similarity index 98%
rename from conf/flight_plans/TUDELFT/tudelft_rotorcraft_survey_imav2015_competition.xml
rename to conf/flight_plans/tudelft/rotorcraft_survey_imav2015_competition.xml
index 17f0b39891..84b4d02c15 100644
--- a/conf/flight_plans/TUDELFT/tudelft_rotorcraft_survey_imav2015_competition.xml
+++ b/conf/flight_plans/tudelft/rotorcraft_survey_imav2015_competition.xml
@@ -95,7 +95,7 @@
     </sector>
   </sectors>
   <includes>
-    <include name="Mission" procedure="tudelft_rotorcraft_survey_mission.xml"/>
+    <include name="Mission" procedure="rotorcraft_survey_mission.xml"/>
   </includes>
   <blocks>
     <block name="Dummy"/>
diff --git a/conf/flight_plans/TUDELFT/tudelft_rotorcraft_survey_mission.xml b/conf/flight_plans/tudelft/rotorcraft_survey_mission.xml
similarity index 100%
rename from conf/flight_plans/TUDELFT/tudelft_rotorcraft_survey_mission.xml
rename to conf/flight_plans/tudelft/rotorcraft_survey_mission.xml
diff --git a/conf/modules/orange_avoider.xml b/conf/modules/orange_avoider.xml
index ee78f63aed..1da1a70016 100644
--- a/conf/modules/orange_avoider.xml
+++ b/conf/modules/orange_avoider.xml
@@ -5,7 +5,7 @@
     <description>
 	Avoid all objects that are orange!
 	This example module shows how you can use the camera stream and colorfilter to detect orange objects.
-	By adding this module to your flightplan and flying in the cyberzoo with the flightplan TUDELFT/tudelft_course2016_avoid_orange_cyberzoo.xml you will avoid every obstacle that is orange.
+	By adding this module to your flightplan and flying in the cyberzoo with the flightplan tudelft/course2016_avoid_orange_cyberzoo.xml you will avoid every obstacle that is orange.
     </description>
   </doc>
   <depends>cv_colorfilter.xml</depends>
diff --git a/conf/telemetry/TUDELFT/tudelft_outback.xml b/conf/telemetry/tudelft/outback.xml
similarity index 100%
rename from conf/telemetry/TUDELFT/tudelft_outback.xml
rename to conf/telemetry/tudelft/outback.xml
diff --git a/conf/telemetry/TUDELFT/tudelft_xbee868.xml b/conf/telemetry/tudelft/xbee868.xml
similarity index 100%
rename from conf/telemetry/TUDELFT/tudelft_xbee868.xml
rename to conf/telemetry/tudelft/xbee868.xml
diff --git a/conf/userconf/TUDELFT/tudelft_rm_control_panel.xml b/conf/userconf/TUDELFT/tudelft_rm_control_panel.xml
deleted file mode 100644
index e03999edb1..0000000000
--- a/conf/userconf/TUDELFT/tudelft_rm_control_panel.xml
+++ /dev/null
@@ -1,251 +0,0 @@
-<control_panel name="paparazzi control panel">
-  <section name="programs">
-    <program name="Server" command="sw/ground_segment/tmtc/server"/>
-    <program name="Data Link" command="sw/ground_segment/tmtc/link">
-      <arg flag="-d" constant="/dev/ttyUSB0"/>
-    </program>
-    <program name="Link Combiner" command="sw/ground_segment/python/redundant_link/link_combiner.py"/>
-    <program name="GCS" command="sw/ground_segment/cockpit/gcs"/>
-    <program name="Flight Plan Editor" command="sw/ground_segment/cockpit/gcs">
-      <arg flag="-edit"/>
-    </program>
-    <program name="Messages" command="sw/ground_segment/tmtc/messages"/>
-    <program name="Messages (Python)" command="sw/ground_segment/python/messages_app/messagesapp.py"/>
-    <program name="Settings" command="sw/ground_segment/tmtc/settings">
-      <arg flag="-ac" constant="@AIRCRAFT"/>
-    </program>
-    <program name="Settings (Python)" command="sw/ground_segment/python/settings_app/settingsapp.py"/>
-    <program name="GPSd position display" command="sw/ground_segment/tmtc/gpsd2ivy"/>
-    <program name="Log Plotter" command="sw/logalizer/logplotter"/>
-    <program name="Real-time Plotter" command="sw/logalizer/plotter"/>
-    <program name="Real-time Plotter (Python)" command="sw/ground_segment/python/real_time_plot/messagepicker.py"/>
-    <program name="Log File Player" command="sw/logalizer/play"/>
-    <program name="Simulator" command="sw/simulator/pprzsim-launch"/>
-    <program name="Video Synchronizer" command="sw/ground_segment/misc/video_synchronizer"/>
-    <program name="Joystick" command="sw/ground_segment/joystick/input2ivy">
-      <arg flag="-ac" constant="@AIRCRAFT"/>
-      <arg flag="xbox_gamepad.xml"/>
-    </program>
-    <program name="Hardware in the Loop" command="sw/simulator/simhitl"/>
-    <program name="Environment Simulator" command="sw/simulator/gaia"/>
-    <program name="Http Server" command="$python">
-      <arg flag="-m" constant="SimpleHTTPServer"/>
-      <arg flag="8889"/>
-    </program>
-    <program name="Plot Meteo Profile" command="sw/logalizer/plotprofile"/>
-    <program name="Weather Station" command="sw/ground_segment/misc/davis2ivy">
-      <arg flag="-d" constant="/dev/ttyUSB1"/>
-    </program>
-    <program name="Attitude Visualizer" command="sw/tools/attitude_viz.py"/>
-    <program name="App Server" command="sw/ground_segment/tmtc/app_server"/>
-    <program name="NatNet" command="sw/ground_segment/misc/natnet2ivy"/>
-    <program name="Ivy2Nmea" command="sw/ground_segment/tmtc/ivy2nmea">
-      <arg flag="--port" constant="/dev/ttyUSB1"/>
-      <arg flag="--id" constant="1"/>
-    </program>
-    <program name="BluegigaUsbDongleScanner" command="sw/tools/bluegiga_usb_dongle/bluegiga_usb_driver">
-      <arg flag="/dev/ttyACM2"/>
-      <arg flag="scan"/>
-    </program>
-    <program name="BluegigaUsbDongle" command="sw/tools/bluegiga_usb_dongle/bluegiga_usb_driver">
-      <arg flag="/dev/ttyACM2"/>
-      <arg flag="00:07:00:2d:d6:bb"/>
-      <arg flag="4242"/>
-      <arg flag="4252"/>
-    </program>
-  </section>
-  <section name="sessions">
-    <session name="Flight ACM0 @57600">
-      <program name="Data Link">
-        <arg flag="-d" constant="/dev/ttyACM0"/>
-        <arg flag="-s" constant="57600"/>
-      </program>
-      <program name="Server"/>
-      <program name="GCS">
-        <arg flag="-speech"/>
-      </program>
-    </session>
-    <session name="Bluegiga">
-      <program name="Data Link">
-        <arg flag="-udp"/>
-        <arg flag="-udp_port" constant="4242"/>
-        <arg flag="-udp_uplink_port" constant="4252"/>
-      </program>
-      <program name="Server"/>
-      <program name="Messages"/>
-      <program name="GCS">
-        <arg flag="-speech"/>
-      </program>
-      <program name="NatNet">
-        <arg flag="-ac" constant="1"/>
-        <arg flag="12"/>
-        <arg flag="-small"/>
-        <arg flag="-tf" constant="5"/>
-      </program>
-      <program name="Joystick">
-        <arg flag="-d" constant="2"/>
-        <arg flag="-ac" constant="@AIRCRAFT"/>
-        <arg flag="hobbyking.xml"/>
-      </program>
-    </session>
-    <session name="Scaled Sensors">
-      <program name="Real-time Plotter">
-        <arg flag="-g" constant="1000x250-0+0"/>
-        <arg flag="-t" constant="ACC"/>
-        <arg flag="-u" constant="0.05"/>
-        <arg flag="-c" constant="9.81"/>
-        <arg flag="-c" constant="0.00"/>
-        <arg flag="-c" constant="-9.81"/>
-        <arg flag="-c" constant="*:telemetry:IMU_ACCEL_SCALED:ax:0.0009766"/>
-        <arg flag="-c" constant="*:telemetry:IMU_ACCEL_SCALED:ay:0.0009766"/>
-        <arg flag="-c" constant="*:telemetry:IMU_ACCEL_SCALED:az:0.0009766"/>
-        <arg flag="-n"/>
-        <arg flag="-g" constant="1000x250-0+250"/>
-        <arg flag="-t" constant="GYRO"/>
-        <arg flag="-u" constant="0.05"/>
-        <arg flag="-c" constant="0.00"/>
-        <arg flag="-c" constant="*:telemetry:IMU_GYRO_SCALED:gp:0.0139882"/>
-        <arg flag="-c" constant="*:telemetry:IMU_GYRO_SCALED:gq:0.0139882"/>
-        <arg flag="-c" constant="*:telemetry:IMU_GYRO_SCALED:gr:0.0139882"/>
-        <arg flag="-n"/>
-        <arg flag="-g" constant="1000x250-0+500"/>
-        <arg flag="-t" constant="MAG"/>
-        <arg flag="-u" constant="0.05"/>
-        <arg flag="-c" constant="0.00"/>
-        <arg flag="-c" constant="*:telemetry:IMU_MAG_SCALED:mx:0.0004883"/>
-        <arg flag="-c" constant="*:telemetry:IMU_MAG_SCALED:my:0.0004883"/>
-        <arg flag="-c" constant="*:telemetry:IMU_MAG_SCALED:mz:0.0004883"/>
-      </program>
-    </session>
-    <session name="Joystick Hobbyking">
-      <program name="Joystick">
-        <arg flag="-ac" constant="@AIRCRAFT"/>
-        <arg flag="hobbyking.xml"/>
-      </program>
-    </session>
-    <session name="A pocket drone demo">
-      <program name="BluegigaUsbDongle" command="sw/tools/bluegiga_usb_dongle/bluegiga_usb_driver">
-      <arg flag="/dev/ttyACM2"/>
-      <arg flag="00:07:80:2d:d6:d7"/>
-      <arg flag="4242"/>
-      <arg flag="4252"/>
-    </program>
-      <program name="Data Link">
-        <arg flag="-udp"/>
-        <arg flag="-udp_port" constant="4242"/>
-        <arg flag="-udp_uplink_port" constant="4252"/>
-      </program>
-      <program name="Server"/>
-      <program name="Messages"/>
-      <program name="GCS"/>
-      <program name="NatNet">
-        <arg flag="-ac" constant="1"/>
-        <arg flag="12"/>
-        <arg flag="-small"/>
-        <arg flag="-tf" constant="5"/>
-      </program>
-      <program name="Joystick">
-        <arg flag="-ac" constant="@AIRCRAFT"/>
-        <arg flag="hobbyking.xml"/>
-      </program>
-    </session>
-    <session name="Messages and Settings">
-      <program name="Messages"/>
-      <program name="Settings">
-        <arg flag="-ac" constant="@AIRCRAFT"/>
-      </program>
-    </session>
-    <session name="Ardrone">
-      <program name="Data Link">
-        <arg flag="-udp"/>
-      </program>
-      <program name="Server"/>
-      <program name="GCS"/>
-      <program name="Joystick" command="sw/ground_segment/joystick/input2ivy">
-        <arg flag="-ac" constant="@AIRCRAFT"/>
-        <arg flag="hobbyking.xml"/>
-      </program>
-
-    </session>
-
-    <session name="Flight XBee @57600">
-      <program name="Data Link">
-        <arg flag="-d" constant="/dev/paparazzi/xbee"/>
-        <arg flag="-transport" constant="xbee"/>
-        <arg flag="-s" constant="57600"/>
-      </program>
-      <program name="Server"/>
-      <program name="GCS">
-        <arg flag="-speech"/>
-      </program>
-    </session>
-    <session name="Flight UDP">
-      <program name="Data Link">
-        <arg flag="-udp"/>
-      </program>
-      <program name="Server"/>
-      <program name="GCS">
-        <arg flag="-speech"/>
-      </program>
-    </session>
-    <session name="Flight USB0 @57600">
-      <program name="Data Link">
-        <arg flag="-d" constant="/dev/ttyUSB0"/>
-        <arg flag="-s" constant="57600"/>
-      </program>
-      <program name="Server"/>
-      <program name="GCS">
-        <arg flag="-speech"/>
-      </program>
-    </session>
-    <session name="Raw Sensors">
-      <program name="Real-time Plotter">
-        <arg flag="-g" constant="1000x250-0+0"/>
-        <arg flag="-t" constant="ACC"/>
-        <arg flag="-u" constant="0.05"/>
-        <arg flag="-c" constant="0.00"/>
-        <arg flag="-c" constant="*:telemetry:IMU_ACCEL_RAW:ax"/>
-        <arg flag="-c" constant="*:telemetry:IMU_ACCEL_RAW:ay"/>
-        <arg flag="-c" constant="*:telemetry:IMU_ACCEL_RAW:az"/>
-        <arg flag="-n"/>
-        <arg flag="-g" constant="1000x250-0+250"/>
-        <arg flag="-t" constant="GYRO"/>
-        <arg flag="-u" constant="0.05"/>
-        <arg flag="-c" constant="0.00"/>
-        <arg flag="-c" constant="*:telemetry:IMU_GYRO_RAW:gp"/>
-        <arg flag="-c" constant="*:telemetry:IMU_GYRO_RAW:gq"/>
-        <arg flag="-c" constant="*:telemetry:IMU_GYRO_RAW:gr"/>
-        <arg flag="-n"/>
-        <arg flag="-g" constant="1000x250-0+500"/>
-        <arg flag="-t" constant="MAG"/>
-        <arg flag="-u" constant="0.05"/>
-        <arg flag="-c" constant="0.00"/>
-        <arg flag="-c" constant="*:telemetry:IMU_MAG_RAW:mx"/>
-        <arg flag="-c" constant="*:telemetry:IMU_MAG_RAW:my"/>
-        <arg flag="-c" constant="*:telemetry:IMU_MAG_RAW:mz"/>
-        <arg flag="-n"/>
-        <arg flag="-g" constant="1000x250-0+750"/>
-        <arg flag="-t" constant="BARO"/>
-        <arg flag="-u" constant="0.05"/>
-        <arg flag="-c" constant="101325.0"/>
-        <arg flag="-c" constant="*:telemetry:BARO_RAW:abs"/>
-      </program>
-    </session>
-    <session name="Flight ACM1 @57600">
-      <program name="Data Link">
-        <arg flag="-d" constant="/dev/ttyACM1"/>
-        <arg flag="-s" constant="57600"/>
-      </program>
-      <program name="Server"/>
-      <program name="GCS">
-        <arg flag="-speech"/>
-      </program>
-    </session>
-    <session name="Joystick X3D Pro">
-      <program name="Joystick">
-        <arg flag="-ac" constant="@AIRCRAFT"/>
-        <arg flag="extreme_3d_pro.xml"/>
-      </program>
-    </session>
-  </section>
-</control_panel>
diff --git a/conf/airframes/TUDELFT/tudelft_conf.xml b/conf/userconf/tudelft/conf.xml
similarity index 88%
rename from conf/airframes/TUDELFT/tudelft_conf.xml
rename to conf/userconf/tudelft/conf.xml
index 711cc5b0a5..e64d761cbc 100644
--- a/conf/airframes/TUDELFT/tudelft_conf.xml
+++ b/conf/userconf/tudelft/conf.xml
@@ -13,7 +13,7 @@
   <aircraft
    name="ARDrone2_flip"
    ac_id="14"
-   airframe="airframes/TUDELFT/tudelft_ardrone2_flip.xml"
+   airframe="airframes/tudelft/ardrone2_flip.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -24,7 +24,7 @@
   <aircraft
    name="ARDrone2_indi"
    ac_id="13"
-   airframe="airframes/TUDELFT/tudelft_ardrone2_indi.xml"
+   airframe="airframes/tudelft/ardrone2_indi.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -35,7 +35,7 @@
   <aircraft
    name="ARDrone2_opticflow"
    ac_id="12"
-   airframe="airframes/TUDELFT/tudelft_ardrone2_opticflow.xml"
+   airframe="airframes/tudelft/ardrone2_opticflow.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -46,7 +46,7 @@
   <aircraft
    name="ARDrone2_optitrack"
    ac_id="11"
-   airframe="airframes/TUDELFT/tudelft_ardrone2_optitrack.xml"
+   airframe="airframes/tudelft/ardrone2_optitrack.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_optitrack.xml"
@@ -57,7 +57,7 @@
   <aircraft
    name="Ardrone2_182"
    ac_id="182"
-   airframe="airframes/TUDELFT/IMAV2013/tudelft_ardrone2.xml"
+   airframe="airframes/tudelft/IMAV2013/ardrone2.xml"
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -68,10 +68,10 @@
   <aircraft
    name="BebopMavlink"
    ac_id="9"
-   airframe="airframes/TUDELFT/tudelft_bebop_mavlink.xml"
+   airframe="airframes/tudelft/bebop_mavlink.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft_mavlink.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_rotorcraft_survey_delft.xml"
+   flight_plan="flight_plans/tudelft/rotorcraft_survey_delft.xml"
    settings="settings/rotorcraft_basic.xml settings/estimation/ahrs_secondary.xml settings/control/rotorcraft_speed.xml"
    settings_modules="modules/digital_cam_video.xml modules/video_capture.xml [modules/nav_survey_poly_rotorcraft.xml] [modules/nav_survey_rectangle_rotorcraft.xml] modules/cv_blob_locator.xml modules/air_data.xml modules/geo_mag.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#ffff0689b7a1"
@@ -82,7 +82,7 @@
    airframe="airframes/CDW/cdw_bebop.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_rotorcraft_survey_imav2015_competition.xml"
+   flight_plan="flight_plans/tudelft/rotorcraft_survey_imav2015_competition.xml"
    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_speed.xml"
    settings_modules="modules/digital_cam_video.xml modules/video_capture.xml modules/nav_survey_poly_rotorcraft.xml [modules/nav_survey_rectangle_rotorcraft.xml] modules/video_rtp_stream.xml modules/cv_blob_locator.xml modules/air_data.xml [modules/geo_mag.xml] modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#f84eb57ae827"
@@ -90,34 +90,23 @@
   <aircraft
    name="Bebop_Smeur"
    ac_id="21"
-   airframe="airframes/TUDELFT/tudelft_bebop_indi.xml"
+   airframe="airframes/tudelft/bebop_indi.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_delft_basic.xml"
+   flight_plan="flight_plans/tudelft/delft_basic.xml"
    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_speed.xml"
    settings_modules="modules/air_data.xml [modules/geo_mag.xml] modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#ffffcccaccca"
   />
-  <aircraft
-   name="fan_demo"
-   ac_id="28"
-   airframe="airframes/TUDELFT/tudelft_bebop_indi_actuators.xml"
-   radio="radios/dummy.xml"
-   telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/fan_demo.xml"
-   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_speed.xml"
-   settings_modules="modules/air_data.xml [modules/geo_mag.xml] modules/guidance_indi.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
-   gui_color="#ffffcccaccca"
-  />
   <aircraft
    name="Bebop_actuators"
    ac_id="24"
-   airframe="airframes/TUDELFT/tudelft_bebop_indi_actuators.xml"
+   airframe="airframes/tudelft/bebop_indi_actuators.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_delft_basic.xml"
+   flight_plan="flight_plans/tudelft/delft_basic.xml"
    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_speed.xml"
-   settings_modules="modules/air_data.xml [modules/geo_mag.xml] modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
+   settings_modules="modules/air_data.xml [modules/geo_mag.xml] modules/guidance_indi.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#ffffcccaccca"
   />
   <aircraft
@@ -134,7 +123,7 @@
   <aircraft
    name="CX10"
    ac_id="18"
-   airframe="airframes/TUDELFT/tudelft_cx10.xml"
+   airframe="airframes/tudelft/cx10.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -145,7 +134,7 @@
   <aircraft
    name="ChouChou_LisaS"
    ac_id="135"
-   airframe="airframes/TUDELFT/IMAV2013/tudelft_chouchou_lisa_s.xml"
+   airframe="airframes/tudelft/IMAV2013/chouchou_lisa_s.xml"
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -156,9 +145,9 @@
   <aircraft
    name="DelftaCopter"
    ac_id="6"
-   airframe="airframes/TUDELFT/tudelft_outback.xml"
+   airframe="airframes/tudelft/outback.xml"
    radio="radios/dummy.xml"
-   telemetry="telemetry/TUDELFT/tudelft_outback.xml"
+   telemetry="telemetry/tudelft/outback.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
    settings="settings/rotorcraft_basic.xml"
    settings_modules="modules/gps_ubx_ucenter.xml modules/logger_sd_spi_direct.xml modules/temp_adc.xml modules/air_data.xml modules/geo_mag.xml modules/opa_controller.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_rate.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
@@ -180,7 +169,7 @@
   <aircraft
    name="Flappy"
    ac_id="231"
-   airframe="airframes/TUDELFT/tudelft_quadthopter.xml"
+   airframe="airframes/tudelft/quadthopter.xml"
    radio="radios/deltang_rx31.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -192,7 +181,7 @@
   <aircraft
    name="GeniusDD"
    ac_id="129"
-   airframe="airframes/TUDELFT/tudelft_heliGeniusDD.xml"
+   airframe="airframes/tudelft/heliGeniusDD.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -203,7 +192,7 @@
   <aircraft
    name="GeniusDDBart"
    ac_id="130"
-   airframe="airframes/TUDELFT/tudelft_bs_helidd_indi.xml"
+   airframe="airframes/tudelft/bs_helidd_indi.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -214,7 +203,7 @@
   <aircraft
    name="Heli450"
    ac_id="99"
-   airframe="airframes/TUDELFT/tudelft_heli450.xml"
+   airframe="airframes/tudelft/heli450.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -225,7 +214,7 @@
   <aircraft
    name="Helisa"
    ac_id="114"
-   airframe="airframes/TUDELFT/tudelft_walkera_genius_v2.xml"
+   airframe="airframes/tudelft/walkera_genius_v2.xml"
    radio="radios/FlyElectricRx31_DX6.xml"
    telemetry="telemetry/rotorcraft_with_logger.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -236,10 +225,10 @@
   <aircraft
    name="Iris"
    ac_id="66"
-   airframe="airframes/TUDELFT/tudelft_iris_indi.xml"
+   airframe="airframes/tudelft/iris_indi.xml"
    radio="radios/FrSky3dr.xml"
    telemetry="telemetry/default_rotorcraft_slow.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_delft_basic.xml"
+   flight_plan="flight_plans/tudelft/delft_basic.xml"
    settings="settings/rotorcraft_basic.xml"
    settings_modules="[modules/air_data.xml] modules/geo_mag.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps_ubx_ucenter.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#ffffcccaccca"
@@ -248,7 +237,7 @@
   <aircraft
    name="LadybirdMXS"
    ac_id="15"
-   airframe="airframes/TUDELFT/tudelft_ladybird_lisa_mxs.xml"
+   airframe="airframes/tudelft/ladybird_lisa_mxs.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -259,7 +248,7 @@
   <aircraft
    name="Logo600"
    ac_id="111"
-   airframe="airframes/TUDELFT/tudelft_logo600.xml"
+   airframe="airframes/tudelft/logo600.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/dummy.xml"
@@ -271,10 +260,10 @@
   <aircraft
    name="MAVTec1_Kirk"
    ac_id="32"
-   airframe="airframes/TUDELFT/tudelft_mavtec1.xml"
+   airframe="airframes/tudelft/mavtec1.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_delft_basic.xml"
+   flight_plan="flight_plans/tudelft/delft_basic.xml"
    settings="settings/rotorcraft_basic.xml"
    settings_modules="modules/air_data.xml modules/geo_mag.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#ffff00000000"
@@ -286,7 +275,7 @@
    airframe="airframes/CDW/cdw_mavtec.xml"
    radio="radios/R6107SP_7ch.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_rotorcraft_survey_imav2015_competition.xml"
+   flight_plan="flight_plans/tudelft/rotorcraft_survey_imav2015_competition.xml"
    settings="settings/rotorcraft_basic.xml settings/modules/config_asctec_v2.xml"
    settings_modules="modules/geo_mag.xml modules/nav_survey_poly_rotorcraft.xml modules/nav_survey_rectangle_rotorcraft.xml modules/gps_ubx_ucenter.xml modules/switch_servo.xml modules/ahrs_float_mlkf.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="blue"
@@ -295,10 +284,10 @@
   <aircraft
    name="MAVTec4_Bart"
    ac_id="34"
-   airframe="airframes/TUDELFT/tudelft_mavtec4.xml"
+   airframe="airframes/tudelft/mavtec4.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_delft_basic.xml"
+   flight_plan="flight_plans/tudelft/delft_basic.xml"
    settings="settings/rotorcraft_basic.xml settings/modules/config_asctec_v2.xml"
    settings_modules="modules/switch_servo.xml [modules/air_data.xml] [modules/geo_mag.xml] modules/ahrs_int_cmpl_quat.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#e66affffaa08"
@@ -306,10 +295,10 @@
   <aircraft
    name="MAVTec5_Freek"
    ac_id="35"
-   airframe="airframes/TUDELFT/tudelft_mavtec5.xml"
+   airframe="airframes/tudelft/mavtec5.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_delft_basic.xml"
+   flight_plan="flight_plans/tudelft/delft_basic.xml"
    settings="settings/rotorcraft_basic.xml settings/modules/config_asctec_v2.xml"
    settings_modules="modules/gps_ubx_ucenter.xml modules/switch_servo.xml [modules/air_data.xml] [modules/geo_mag.xml] modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#8c63ffff8e00"
@@ -317,7 +306,7 @@
   <aircraft
    name="MavRick_LisaS"
    ac_id="131"
-   airframe="airframes/TUDELFT/IMAV2013/tudelft_mavrick_lisa_s.xml"
+   airframe="airframes/tudelft/IMAV2013/mavrick_lisa_s.xml"
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_fixedwing_imu.xml"
    flight_plan="flight_plans/basic.xml"
@@ -351,7 +340,7 @@
   <aircraft
    name="Quadplane"
    ac_id="222"
-   airframe="airframes/TUDELFT/tudelft_aa_quadplane.xml"
+   airframe="airframes/tudelft/aa_quadplane.xml"
    radio="radios/spektrum.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -374,10 +363,10 @@
   <aircraft
    name="Robird"
    ac_id="68"
-   airframe="airframes/TUDELFT/tudelft_robird.xml"
+   airframe="airframes/tudelft/robird.xml"
    radio="radios/T14SG_SBUS.xml"
    telemetry="telemetry/default_rotorcraft_slow.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_delft_basic.xml"
+   flight_plan="flight_plans/tudelft/delft_basic.xml"
    settings="settings/rotorcraft_basic.xml ../conf/modules/px4_flash.xml ../conf/modules/glide_wing_lock.xml"
    settings_modules="[modules/air_data.xml] modules/geo_mag.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps_ubx_ucenter.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#ffffcccaccca"
@@ -386,7 +375,7 @@
   <aircraft
    name="SkyWalker"
    ac_id="2"
-   airframe="airframes/TUDELFT/tudelft_yapa_xsens.xml"
+   airframe="airframes/tudelft/yapa_xsens.xml"
    radio="radios/R6107SP_7ch.xml"
    telemetry="telemetry/default_fixedwing_imu_9k6.xml"
    flight_plan="flight_plans/versatile.xml"
@@ -398,10 +387,10 @@
   <aircraft
    name="Splash"
    ac_id="67"
-   airframe="airframes/TUDELFT/tudelft_splash.xml"
+   airframe="airframes/tudelft/splash.xml"
    radio="radios/spektrum.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_delft_basic.xml"
+   flight_plan="flight_plans/tudelft/delft_basic.xml"
    settings="settings/rotorcraft_basic.xml"
    settings_modules="modules/spektrum_soft_bind.xml [modules/air_data.xml] modules/geo_mag.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps_ubx_ucenter.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#fff0cccaccca"
@@ -409,7 +398,7 @@
   <aircraft
    name="TwoSeasTwenty"
    ac_id="200"
-   airframe="airframes/TUDELFT/tudelft_twoseastwenty.xml"
+   airframe="airframes/tudelft/twoseastwenty.xml"
    radio="radios/CDW/cdw_t8fg_sbus.xml"
    telemetry="telemetry/default_fixedwing.xml"
    flight_plan="flight_plans/versatile.xml"
@@ -420,7 +409,7 @@
   <aircraft
    name="Walkera_GeniusV1"
    ac_id="134"
-   airframe="airframes/TUDELFT/IMAV2013/tudelft_walkera_genius_v1.xml"
+   airframe="airframes/tudelft/IMAV2013/walkera_genius_v1.xml"
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -431,7 +420,7 @@
   <aircraft
    name="Walkera_V120D02S"
    ac_id="133"
-   airframe="airframes/TUDELFT/IMAV2013/tudelft_walkera_V120D02S.xml"
+   airframe="airframes/tudelft/IMAV2013/walkera_V120D02S.xml"
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -442,7 +431,7 @@
   <aircraft
    name="autonomous_race"
    ac_id="8"
-   airframe="airframes/TUDELFT/tudelft_bebop_autonomous_race.xml"
+   airframe="airframes/tudelft/bebop_autonomous_race.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -454,10 +443,10 @@
   <aircraft
    name="bebop2_22"
    ac_id="22"
-   airframe="airframes/TUDELFT/tudelft_bebop2_indi.xml"
+   airframe="airframes/tudelft/bebop2_indi.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_delft_basic.xml"
+   flight_plan="flight_plans/tudelft/delft_basic.xml"
    settings="settings/rotorcraft_basic.xml settings/estimation/ahrs_secondary.xml"
    settings_modules="modules/gps_ubx_ucenter.xml modules/air_data.xml modules/geo_mag.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#baa3d698b729"
@@ -465,7 +454,7 @@
   <aircraft
    name="bebop2_23"
    ac_id="23"
-   airframe="airframes/TUDELFT/tudelft_bebop2_indi_MAVlink.xml"
+   airframe="airframes/tudelft/bebop2_indi_MAVlink.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -476,10 +465,10 @@
   <aircraft
    name="bebop2_no_dampers"
    ac_id="26"
-   airframe="airframes/TUDELFT/tudelft_bebop2_no_damping.xml"
+   airframe="airframes/tudelft/bebop2_no_damping.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_delft_basic.xml"
+   flight_plan="flight_plans/tudelft/delft_basic.xml"
    settings="settings/rotorcraft_basic.xml"
    settings_modules="modules/gps_ubx_ucenter.xml modules/air_data.xml modules/geo_mag.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#baa3d698b729"
@@ -487,10 +476,10 @@
   <aircraft
    name="bebop2_vision"
    ac_id="27"
-   airframe="airframes/TUDELFT/tudelft_bebop2_vision.xml"
+   airframe="airframes/tudelft/bebop2_vision.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_delft_basic.xml"
+   flight_plan="flight_plans/tudelft/delft_basic.xml"
    settings="settings/rotorcraft_basic.xml"
    settings_modules="modules/gps_ubx_ucenter.xml modules/air_data.xml modules/geo_mag.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#ffffbf17bf17"
@@ -498,7 +487,7 @@
   <aircraft
    name="bebop_flip"
    ac_id="3"
-   airframe="airframes/TUDELFT/tudelft_bebop_flip.xml"
+   airframe="airframes/tudelft/bebop_flip.xml"
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/dummy.xml"
@@ -506,13 +495,24 @@
    settings_modules="modules/air_data.xml modules/geo_mag.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/ahrs_float_mlkf.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#7d7fd7e7ffff"
   />
+  <aircraft
+   name="fan_demo"
+   ac_id="28"
+   airframe="airframes/tudelft/bebop_indi_actuators.xml"
+   radio="radios/dummy.xml"
+   telemetry="telemetry/default_rotorcraft.xml"
+   flight_plan="flight_plans/tudelft/fan_demo.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_speed.xml"
+   settings_modules="modules/air_data.xml [modules/geo_mag.xml] modules/guidance_indi.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
+   gui_color="#ffffcccaccca"
+  />
   <aircraft
    name="frog1"
    ac_id="25"
    airframe="airframes/BR/bebop_indi_frog.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_rotorcraft_survey_imav2015_competition.xml"
+   flight_plan="flight_plans/tudelft/rotorcraft_survey_imav2015_competition.xml"
    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_speed.xml"
    settings_modules="modules/digital_cam_video.xml modules/video_capture.xml modules/nav_survey_poly_rotorcraft.xml [modules/nav_survey_rectangle_rotorcraft.xml] modules/video_rtp_stream.xml modules/cv_blob_locator.xml modules/air_data.xml [modules/geo_mag.xml] modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/ahrs_float_mlkf.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
    gui_color="#68f5eb116e0c"
@@ -531,7 +531,7 @@
   <aircraft
    name="mavshot"
    ac_id="5"
-   airframe="airframes/TUDELFT/tudelft_mavshot.xml"
+   airframe="airframes/tudelft/mavshot.xml"
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/dummy.xml"
@@ -545,7 +545,7 @@
    airframe="airframes/examples/quadshot_asp21_spektrum.xml"
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/TUDELFT/tudelft_delft_basic.xml"
+   flight_plan="flight_plans/tudelft/delft_basic.xml"
    settings="settings/rotorcraft_basic.xml"
    settings_modules="modules/ahrs_int_cmpl_quat.xml modules/guidance_hybrid.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml modules/gps_ubx_ucenter.xml"
    gui_color="blue"
@@ -554,7 +554,7 @@
   <aircraft
    name="quadshot_pylons"
    ac_id="178"
-   airframe="airframes/TUDELFT/tudelft_quadshot_pylons.xml"
+   airframe="airframes/tudelft/quadshot_pylons.xml"
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/dummy.xml"
@@ -565,7 +565,7 @@
   <aircraft
    name="xvert"
    ac_id="69"
-   airframe="airframes/TUDELFT/tudelft_xvert.xml"
+   airframe="airframes/tudelft/xvert.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft_slow.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -575,3 +575,4 @@
    release="2a6ad556f183875fa9fb8072d774beec7ba55701"
   />
 </conf>
+
diff --git a/conf/userconf/TUDELFT/tudelft_km_conf.xml b/conf/userconf/tudelft/km_conf.xml
similarity index 88%
rename from conf/userconf/TUDELFT/tudelft_km_conf.xml
rename to conf/userconf/tudelft/km_conf.xml
index 221160b9ce..83fb5fbd51 100644
--- a/conf/userconf/TUDELFT/tudelft_km_conf.xml
+++ b/conf/userconf/tudelft/km_conf.xml
@@ -2,7 +2,7 @@
   <aircraft
    name="ARDrone2_opticflow"
    ac_id="12"
-   airframe="airframes/TUDELFT/tudelft_ardrone2_opticflow.xml"
+   airframe="airframes/tudelft/ardrone2_opticflow.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -13,7 +13,7 @@
   <aircraft
    name="Bebop_opticflow"
    ac_id="14"
-   airframe="airframes/TUDELFT/tudelft_bebop_opticflow.xml"
+   airframe="airframes/tudelft/bebop_opticflow.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -24,7 +24,7 @@
   <aircraft
    name="LadyLisaBluegiga"
    ac_id="114"
-   airframe="airframes/TUDELFT/tudelft_ladylisa_bluegiga_stereoboard.xml"
+   airframe="airframes/tudelft/ladylisa_bluegiga_stereoboard.xml"
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_rotorcraft_slow.xml"
    flight_plan="flight_plans/rotorcraft_optitrack.xml"
@@ -35,7 +35,7 @@
   <aircraft
    name="LadybirdMXS_wifi_indi_stereocam"
    ac_id="15"
-   airframe="airframes/TUDELFT/tudelft_ladybird_wifi_indi_lisa_mxs.xml"
+   airframe="airframes/tudelft/ladybird_wifi_indi_lisa_mxs.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_optitrack.xml"
diff --git a/conf/userconf/TUDELFT/tudelft_km_control_panel.xml b/conf/userconf/tudelft/km_control_panel.xml
similarity index 100%
rename from conf/userconf/TUDELFT/tudelft_km_control_panel.xml
rename to conf/userconf/tudelft/km_control_panel.xml