diff --git a/conf/settings/ahrs_int_cmpl_euler.xml b/conf/settings/estimation/ahrs_int_cmpl_euler.xml
similarity index 84%
rename from conf/settings/ahrs_int_cmpl_euler.xml
rename to conf/settings/estimation/ahrs_int_cmpl_euler.xml
index 1d28b08d80..9c6bebad52 100644
--- a/conf/settings/ahrs_int_cmpl_euler.xml
+++ b/conf/settings/estimation/ahrs_int_cmpl_euler.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE settings SYSTEM "settings.dtd">
+<!DOCTYPE settings SYSTEM "../settings.dtd">
 
 <settings>
   <dl_settings>
diff --git a/conf/settings/baro.xml b/conf/settings/estimation/baro.xml
similarity index 92%
rename from conf/settings/baro.xml
rename to conf/settings/estimation/baro.xml
index af8526d76e..bc7b223e68 100644
--- a/conf/settings/baro.xml
+++ b/conf/settings/estimation/baro.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE settings SYSTEM "settings.dtd">
+<!DOCTYPE settings SYSTEM "../settings.dtd">
 
 <settings>
     <dl_settings NAME="control">
diff --git a/conf/settings/settings_booz2_ahrs_lkf.xml b/conf/settings/estimation/booz2_ahrs_lkf.xml
similarity index 93%
rename from conf/settings/settings_booz2_ahrs_lkf.xml
rename to conf/settings/estimation/booz2_ahrs_lkf.xml
index d4e5c65604..a49a4f318b 100644
--- a/conf/settings/settings_booz2_ahrs_lkf.xml
+++ b/conf/settings/estimation/booz2_ahrs_lkf.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE settings SYSTEM "settings.dtd">
+<!DOCTYPE settings SYSTEM "../settings.dtd">
 
 <settings>
   <dl_settings>
diff --git a/conf/settings/settings_rotorcraft_booz_baro.xml b/conf/settings/estimation/booz_baro.xml
similarity index 85%
rename from conf/settings/settings_rotorcraft_booz_baro.xml
rename to conf/settings/estimation/booz_baro.xml
index e84cae01bb..5883968890 100644
--- a/conf/settings/settings_rotorcraft_booz_baro.xml
+++ b/conf/settings/estimation/booz_baro.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE settings SYSTEM "settings.dtd">
+<!DOCTYPE settings SYSTEM "../settings.dtd">
 
 <settings>
   <dl_settings>
diff --git a/conf/settings/infrared.xml b/conf/settings/estimation/infrared.xml
similarity index 96%
rename from conf/settings/infrared.xml
rename to conf/settings/estimation/infrared.xml
index 4a63671869..9ebd483cd4 100644
--- a/conf/settings/infrared.xml
+++ b/conf/settings/estimation/infrared.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE settings SYSTEM "settings.dtd">
+<!DOCTYPE settings SYSTEM "../settings.dtd">
 
 <settings>
   <dl_settings>
diff --git a/conf/settings/ins_neutrals.xml b/conf/settings/estimation/ins_neutrals.xml
similarity index 90%
rename from conf/settings/ins_neutrals.xml
rename to conf/settings/estimation/ins_neutrals.xml
index bce83b2ed8..2623234091 100644
--- a/conf/settings/ins_neutrals.xml
+++ b/conf/settings/estimation/ins_neutrals.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE settings SYSTEM "settings.dtd">
+<!DOCTYPE settings SYSTEM "../settings.dtd">
 
 <settings>
   <dl_settings>