diff --git a/conf/airframes/antenna.xml b/conf/airframes/Poine/antenna.xml
similarity index 100%
rename from conf/airframes/antenna.xml
rename to conf/airframes/Poine/antenna.xml
diff --git a/conf/airframes/Poine/autoplato.xml b/conf/airframes/Poine/autoplato.xml
new file mode 100644
index 0000000000..ced78bd3a3
--- /dev/null
+++ b/conf/airframes/Poine/autoplato.xml
@@ -0,0 +1,46 @@
+<airframe name="autoplato">
+
+  <makefile>
+
+
+
+ARCH=lpc21
+BOARD_CFG = \"boards/olimex_lpc_h2148.h\"
+ARCHI=arm7
+FLASH_MODE = IAP
+
+include $(PAPARAZZI_SRC)/conf/autopilot/booz2_common.makefile
+
+test_usb.ARCHDIR = $(ARCHI)
+test_usb.ARCH = arm7tdmi
+test_usb.TARGET = test_usb
+test_usb.TARGETDIR = test_usb
+
+test_usb.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
+test_usb.srcs += $(SRC_BOOZ_TEST)/atpt_main.c
+test_usb.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))'
+# -DTIME_LED=1
+test_usb.CFLAGS += -DLED
+test_usb.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
+
+#test_usb.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
+#test_usb.srcs += $(SRC_ARCH)/uart_hw.c
+#test_usb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 
+#test_usb.srcs += downlink.c pprz_transport.c
+
+test_usb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DUSE_USB_SERIAL
+test_usb.CFLAGS += -DDOWNLINK_DEVICE=UsbS -DPPRZ_UART=UsbS -DDATALINK=PPRZ
+test_usb.srcs += downlink.c $(SRC_ARCH)/uart_hw.c $(SRC_ARCH)/usb_ser_hw.c pprz_transport.c
+# datalink.c
+test_usb.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbcontrol.c
+test_usb.srcs += $(SRC_ARCH)/lpcusb/usbstdreq.c $(SRC_ARCH)/lpcusb/usbinit.c
+
+test_usb.CFLAGS += -DACTUATORS=\"servos_direct_hw.h\" -DSERVOS_NB=6 -DPWM_SERVO_0 -DPWM_SERVO_5
+test_usb.CFLAGS += -DSERVOS_PERIOD='SERVOS_TICS_OF_USEC(12500)'
+test_usb.srcs += $(SRC_ARCH)/servos_direct_hw.c
+
+
+
+ </makefile>
+
+</airframe>
\ No newline at end of file
diff --git a/conf/airframes/Poine/beth.xml b/conf/airframes/Poine/beth.xml
new file mode 100644
index 0000000000..bc331c01cd
--- /dev/null
+++ b/conf/airframes/Poine/beth.xml
@@ -0,0 +1,111 @@
+<airframe name="BETH">
+
+
+  <section name="IMU" prefix="IMU_">
+
+    <define name="GYRO_P_NEUTRAL" value="31489"/>
+    <define name="GYRO_Q_NEUTRAL" value="31814"/>
+    <define name="GYRO_R_NEUTRAL" value="32752"/>
+
+    <define name="GYRO_P_SENS" value=" 1.01" integer="16"/>
+    <define name="GYRO_Q_SENS" value="-1.01" integer="16"/>
+    <define name="GYRO_R_SENS" value="-1.01" integer="16"/>
+
+
+    <define name="ACCEL_X_SENS" value="-2.58273701242" integer="16"/>
+    <define name="ACCEL_Y_SENS" value="-2.54076215332" integer="16"/>
+    <define name="ACCEL_Z_SENS" value="-2.57633620646" integer="16"/>
+
+    <define name="ACCEL_X_NEUTRAL" value="32857"/>
+    <define name="ACCEL_Y_NEUTRAL" value="32429"/>
+    <define name="ACCEL_Z_NEUTRAL" value="32593"/>
+
+    <define name="MAG_X_SENS" value=" 5.32718104135" integer="16"/>
+    <define name="MAG_Y_SENS" value="-4.87857821202" integer="16"/>
+    <define name="MAG_Z_SENS" value="-3.11986612709" integer="16"/>
+
+    <define name="MAG_X_NEUTRAL" value="-43"/>
+    <define name="MAG_Y_NEUTRAL" value=" 49"/>
+    <define name="MAG_Z_NEUTRAL" value="-66"/>
+
+    <define name="BODY_TO_IMU_PHI"   value="RadOfDeg(  0.)"/>
+    <define name="BODY_TO_IMU_THETA" value="RadOfDeg(  0.)"/>
+    <define name="BODY_TO_IMU_PSI"   value="RadOfDeg( 90.)"/>
+
+  </section>
+
+
+  <makefile>
+
+
+#
+# main STM32
+#
+
+ARCH=stm32
+ARCHI=stm32
+BOARD_CFG = \"boards/lisa_0.99.h\"
+FLASH_MODE = JTAG
+
+SRC_ARCH = $(ARCH)
+SRC_BETH=beth
+SRC_BOOZ=booz
+SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCH)
+SRC_LISA=lisa
+SRC_LISA_ARCH=$(SRC_LISA)/arch/$(ARCH)
+
+main_stm32.ARCHDIR = stm32
+main_stm32.TARGET = main_stm32
+main_stm32.TARGETDIR = main_stm32
+main_stm32.CFLAGS += -I$(SRC_LISA) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
+main_stm32.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
+main_stm32.srcs = $(SRC_BETH)/main_stm32.c \
+                  $(SRC_ARCH)/stm32_exceptions.c   \
+                  $(SRC_ARCH)/stm32_vector_table.c
+main_stm32.CFLAGS += -DUSE_LED
+main_stm32.srcs += $(SRC_ARCH)/led_hw.c
+main_stm32.CFLAGS += -DUSE_SYS_TIME -DSYS_TIME_LED=1
+main_stm32.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./512.)'
+main_stm32.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
+
+main_stm32.CFLAGS += -DUSE_UART2 -DUART2_BAUD=B57600
+main_stm32.srcs += $(SRC_ARCH)/uart_hw.c
+main_stm32.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart2 
+main_stm32.srcs += downlink.c pprz_transport.c
+
+main_stm32.CFLAGS += -DUSE_OVERO_LINK -DOVERO_LINK_MSG_TYPE=AutopilotMessageBeth
+main_stm32.CFLAGS += -DOVERO_LINK_LED_OK=3 -DOVERO_LINK_LED_KO=4 -DUSE_DMA1_C2_IRQ
+main_stm32.srcs += lisa/lisa_overo_link.c lisa/arch/stm32/lisa_overo_link_arch.c
+
+main_stm32.CFLAGS += -DBOOZ_IMU_TYPE_H=\"imu/booz_imu_b2.h\"
+main_stm32.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2001
+main_stm32.srcs += $(SRC_BOOZ)/booz_imu.c
+main_stm32.CFLAGS += -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ -DUSE_SPI2_IRQ
+main_stm32.srcs += $(SRC_BOOZ)/imu/booz_imu_b2.c $(SRC_BOOZ_ARCH)/imu/booz_imu_b2_arch.c
+main_stm32.srcs += $(SRC_BOOZ)/peripherals/booz_max1168.c $(SRC_BOOZ_ARCH)/peripherals/booz_max1168_arch.c
+main_stm32.srcs += $(SRC_BOOZ)/peripherals/booz_ms2001.c  $(SRC_BOOZ_ARCH)/peripherals/booz_ms2001_arch.c
+main_stm32.srcs += math/pprz_trig_int.c
+
+
+#
+# main Overo
+#
+
+USER =
+HOST = beth
+HOST = overo
+TARGET_DIR = ~
+SRC_FMS=fms
+
+main_overo.ARCHDIR = omap
+main_overo.CFLAGS = -I. -I$(SRC_FMS)
+main_overo.srcs  = $(SRC_BETH)/main_overo.c
+main_overo.srcs += $(SRC_FMS)/fms_spi_link.c
+
+
+
+
+
+  </makefile>
+
+</airframe>
diff --git a/conf/airframes/booz2_a1.xml b/conf/airframes/Poine/booz2_a1.xml
similarity index 100%
rename from conf/airframes/booz2_a1.xml
rename to conf/airframes/Poine/booz2_a1.xml
diff --git a/conf/airframes/booz2_a1p.xml b/conf/airframes/Poine/booz2_a1p.xml
similarity index 100%
rename from conf/airframes/booz2_a1p.xml
rename to conf/airframes/Poine/booz2_a1p.xml
diff --git a/conf/airframes/booz2_a2.xml b/conf/airframes/Poine/booz2_a2.xml
similarity index 100%
rename from conf/airframes/booz2_a2.xml
rename to conf/airframes/Poine/booz2_a2.xml
diff --git a/conf/airframes/booz2_a3.xml b/conf/airframes/Poine/booz2_a3.xml
similarity index 100%
rename from conf/airframes/booz2_a3.xml
rename to conf/airframes/Poine/booz2_a3.xml
diff --git a/conf/airframes/booz2_a4.xml b/conf/airframes/Poine/booz2_a4.xml
similarity index 100%
rename from conf/airframes/booz2_a4.xml
rename to conf/airframes/Poine/booz2_a4.xml
diff --git a/conf/airframes/booz2_a5.xml b/conf/airframes/Poine/booz2_a5.xml
similarity index 100%
rename from conf/airframes/booz2_a5.xml
rename to conf/airframes/Poine/booz2_a5.xml
diff --git a/conf/airframes/booz2_a6.xml b/conf/airframes/Poine/booz2_a6.xml
similarity index 100%
rename from conf/airframes/booz2_a6.xml
rename to conf/airframes/Poine/booz2_a6.xml
diff --git a/conf/airframes/poine/beth.xml b/conf/airframes/poine/beth.xml
deleted file mode 100644
index 52db5ff032..0000000000
--- a/conf/airframes/poine/beth.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<airframe name="BETH">
-
-
-  <makefile>
-
-ARCH=lpc21
-ARCHI=arm7
-
-BOARD_CFG = \"boards/olimex_lpc_h2148.h\"
-FLASH_MODE = IAP
-
-#
-# main
-#
-main.ARCHDIR = $(ARCHI)
-main.ARCH = arm7tdmi
-main.TARGET = main
-main.TARGETDIR = main
-
-main.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
-main.CFLAGS += -DPERIPHERALS_AUTO_INIT
-main.srcs   += beth/main_beth.c
-main.CFLAGS += -DUSE_LED
-main.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))' -DTIME_LED=1
-main.srcs   += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
-main.CFLAGS += -DUSE_USB_SERIAL
-main.srcs += $(SRC_ARCH)/usb_ser_hw.c
-main.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbinit.c
-main.srcs += $(SRC_ARCH)/lpcusb/usbcontrol.c $(SRC_ARCH)/lpcusb/usbstdreq.c
-main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UsbS
-main.srcs += downlink.c pprz_transport.c
-main.srcs += beth/bench_sensors.c
-
-main.CFLAGS += -DUSE_I2C1  -DI2C1_SCLL=150 -DI2C1_SCLH=150 -DI2C1_VIC_SLOT=11 -DI2C1_BUF_LEN=16
-main.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
-
-
-
-
-
-
-  </makefile>
-
-</airframe>