diff --git a/conf/airframes/firestorm.xml b/conf/airframes/ENAC/fixed-wing/firestorm.xml
similarity index 99%
rename from conf/airframes/firestorm.xml
rename to conf/airframes/ENAC/fixed-wing/firestorm.xml
index 61b32ccdfd..05ae2bf6bc 100644
--- a/conf/airframes/firestorm.xml
+++ b/conf/airframes/ENAC/fixed-wing/firestorm.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "airframe.dtd">
+<!DOCTYPE airframe SYSTEM "../../airframe.dtd">
 
 <!-- Fire Storm
      Tiny 1.1
diff --git a/conf/airframes/funjet1.xml b/conf/airframes/ENAC/fixed-wing/funjet1.xml
similarity index 99%
rename from conf/airframes/funjet1.xml
rename to conf/airframes/ENAC/fixed-wing/funjet1.xml
index c654b61e8f..e46e714bd9 100644
--- a/conf/airframes/funjet1.xml
+++ b/conf/airframes/ENAC/fixed-wing/funjet1.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "airframe.dtd">
+<!DOCTYPE airframe SYSTEM "../../airframe.dtd">
 
 <!-- Funjet Multiplex (http://www.multiplex-rc.de/)
      Tiny 2.1 board (http://paparazzi.enac.fr/wiki/index.php/Tiny_v2)
diff --git a/conf/airframes/minimag1.xml b/conf/airframes/ENAC/fixed-wing/minimag1.xml
similarity index 98%
rename from conf/airframes/minimag1.xml
rename to conf/airframes/ENAC/fixed-wing/minimag1.xml
index 583ae1bcc4..8054cc80d7 100644
--- a/conf/airframes/minimag1.xml
+++ b/conf/airframes/ENAC/fixed-wing/minimag1.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "airframe.dtd">
+<!DOCTYPE airframe SYSTEM "../../airframe.dtd">
 
 <airframe name="MiniMag Tiny 0.99">
 
@@ -79,7 +79,7 @@
   </section>
 
   <section name="BAT">
-    <define name="MILLIAMP_PER_PERCENT" value="0.86"/>
+    <define name="MILLIAMP_AT_FULL_THROTTLE" value="10000"/>
 
     <define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/>
   </section>
diff --git a/conf/airframes/slayer2.xml b/conf/airframes/ENAC/fixed-wing/slayer2.xml
similarity index 100%
rename from conf/airframes/slayer2.xml
rename to conf/airframes/ENAC/fixed-wing/slayer2.xml
diff --git a/conf/airframes/solarstorm.xml b/conf/airframes/ENAC/fixed-wing/solarstorm.xml
similarity index 99%
rename from conf/airframes/solarstorm.xml
rename to conf/airframes/ENAC/fixed-wing/solarstorm.xml
index 7ea20d480e..6765dcad56 100644
--- a/conf/airframes/solarstorm.xml
+++ b/conf/airframes/ENAC/fixed-wing/solarstorm.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "airframe.dtd">
+<!DOCTYPE airframe SYSTEM "../../airframe.dtd">
 
 <!-- Solar Storm
      Tiny 1.1
diff --git a/conf/airframes/twinjet2.xml b/conf/airframes/ENAC/fixed-wing/twinjet2.xml
similarity index 99%
rename from conf/airframes/twinjet2.xml
rename to conf/airframes/ENAC/fixed-wing/twinjet2.xml
index 38e1aa39b6..80d89f49a9 100644
--- a/conf/airframes/twinjet2.xml
+++ b/conf/airframes/ENAC/fixed-wing/twinjet2.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "airframe.dtd">
+<!DOCTYPE airframe SYSTEM "../../airframe.dtd">
 
 <!-- Twinjet Multiplex (http://www.multiplex-rc.de/)
      Tiny 2.12 board (http://paparazzi.enac.fr/wiki/index.php/Tiny_v2)
diff --git a/conf/airframes/booz2_g1.xml b/conf/airframes/ENAC/quadrotor/booz2_g1.xml
similarity index 100%
rename from conf/airframes/booz2_g1.xml
rename to conf/airframes/ENAC/quadrotor/booz2_g1.xml