diff --git a/conf/airframes/bl_mc.xml b/conf/airframes/Poine/bl_mc.xml
similarity index 100%
rename from conf/airframes/bl_mc.xml
rename to conf/airframes/Poine/bl_mc.xml
diff --git a/conf/airframes/motor_bench.xml b/conf/airframes/Poine/motor_bench.xml
similarity index 100%
rename from conf/airframes/motor_bench.xml
rename to conf/airframes/Poine/motor_bench.xml
diff --git a/conf/airframes/pt_ant.xml b/conf/airframes/Poine/pt_ant.xml
similarity index 100%
rename from conf/airframes/pt_ant.xml
rename to conf/airframes/Poine/pt_ant.xml
diff --git a/conf/airframes/bipbip.xml b/conf/airframes/bipbip.xml
deleted file mode 100644
index 384021a3f7..0000000000
--- a/conf/airframes/bipbip.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
- This file is part of paparazzi.
-
- paparazzi is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- paparazzi is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with paparazzi; see the file COPYING.  If not, write to
- the Free Software Foundation, 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. 
--->
-
-<!-- high speed funjet -->
-
-<airframe name="bipbip">
-
-  <makefile>
-ARCHI=avr
-
-BIPBIP_PRIV=bipbip_priv
-
-srv.ARCHDIR=$(ARCHI)
-srv.ARCH = atmega8
-srv.TARGET = srv
-srv.TARGETDIR = srv
-
-srv.srcs = $(BIPBIP_PRIV)/main_srv.c
-#srv.srcs = main_srv.c
-
-  </makefile>
-
-</airframe>