diff --git a/sw/airborne/booz/peripherals/booz_adxl345.h b/sw/airborne/peripherals/adxl345.h
similarity index 100%
rename from sw/airborne/booz/peripherals/booz_adxl345.h
rename to sw/airborne/peripherals/adxl345.h
diff --git a/sw/airborne/booz/peripherals/booz_ami601.c b/sw/airborne/peripherals/ami601.c
similarity index 100%
rename from sw/airborne/booz/peripherals/booz_ami601.c
rename to sw/airborne/peripherals/ami601.c
diff --git a/sw/airborne/booz/peripherals/booz_ami601.h b/sw/airborne/peripherals/ami601.h
similarity index 100%
rename from sw/airborne/booz/peripherals/booz_ami601.h
rename to sw/airborne/peripherals/ami601.h
diff --git a/sw/airborne/booz/peripherals/booz_hmc5843.c b/sw/airborne/peripherals/hmc5843.c
similarity index 99%
rename from sw/airborne/booz/peripherals/booz_hmc5843.c
rename to sw/airborne/peripherals/hmc5843.c
index 505fe1eecc..d4907ec2b2 100644
--- a/sw/airborne/booz/peripherals/booz_hmc5843.c
+++ b/sw/airborne/peripherals/hmc5843.c
@@ -25,7 +25,7 @@ static void send_config(void)
   hmc5843.i2c_trans.len_w = 2;
   i2c_submit(&i2c2,&hmc5843.i2c_trans);
 	while(hmc5843.i2c_trans.status == I2CTransPending);
-    
+
   hmc5843.i2c_trans.type = I2CTransTx;
   hmc5843.i2c_trans.buf[0] = HMC5843_REG_CFGB;  // set to gain to 1 Gauss
   hmc5843.i2c_trans.buf[1] = 0x01<<5;
diff --git a/sw/airborne/booz/peripherals/booz_hmc5843.h b/sw/airborne/peripherals/hmc5843.h
similarity index 98%
rename from sw/airborne/booz/peripherals/booz_hmc5843.h
rename to sw/airborne/peripherals/hmc5843.h
index a9dbb122c7..013a017ef6 100644
--- a/sw/airborne/booz/peripherals/booz_hmc5843.h
+++ b/sw/airborne/peripherals/hmc5843.h
@@ -1,6 +1,6 @@
 /*
  * $Id$
- *  
+ *
  * Copyright (C) 2008-2009 Antoine Drouin <poinix@gmail.com>
  *
  * This file is part of paparazzi.
@@ -18,7 +18,7 @@
  * 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. 
+ * Boston, MA 02111-1307, USA.
  */
 
 #ifndef BOOZ_HMC5843_H
diff --git a/sw/airborne/booz/peripherals/booz_itg3200.h b/sw/airborne/peripherals/itg3200.h
similarity index 100%
rename from sw/airborne/booz/peripherals/booz_itg3200.h
rename to sw/airborne/peripherals/itg3200.h
diff --git a/sw/airborne/booz/peripherals/booz_max1168.c b/sw/airborne/peripherals/max1168.c
similarity index 96%
rename from sw/airborne/booz/peripherals/booz_max1168.c
rename to sw/airborne/peripherals/max1168.c
index 48428a491d..5ee677db2d 100644
--- a/sw/airborne/booz/peripherals/booz_max1168.c
+++ b/sw/airborne/peripherals/max1168.c
@@ -1,6 +1,6 @@
 /*
  * $Id$
- *  
+ *
  * Copyright (C) 2008-2009 Antoine Drouin <poinix@gmail.com>
  *
  * This file is part of paparazzi.
@@ -18,7 +18,7 @@
  * 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. 
+ * Boston, MA 02111-1307, USA.
  *
  */
 
diff --git a/sw/airborne/booz/peripherals/booz_max1168.h b/sw/airborne/peripherals/max1168.h
similarity index 94%
rename from sw/airborne/booz/peripherals/booz_max1168.h
rename to sw/airborne/peripherals/max1168.h
index 99d87eb17e..44c2471181 100644
--- a/sw/airborne/booz/peripherals/booz_max1168.h
+++ b/sw/airborne/peripherals/max1168.h
@@ -1,6 +1,6 @@
 /*
  * $Id$
- *  
+ *
  * Copyright (C) 2008-2009 Antoine Drouin <poinix@gmail.com>
  *
  * This file is part of paparazzi.
@@ -18,7 +18,7 @@
  * 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. 
+ * Boston, MA 02111-1307, USA.
  */
 
 #ifndef BOOZ_MAX1168_H
@@ -32,7 +32,7 @@ extern void booz_max1168_init( void );
 
 #define STA_MAX1168_IDLE           0
 #define STA_MAX1168_SENDING_REQ    1
-#define STA_MAX1168_READING_RES    2 
+#define STA_MAX1168_READING_RES    2
 #define STA_MAX1168_DATA_AVAILABLE 3
 extern volatile uint8_t booz_max1168_status;
 
diff --git a/sw/airborne/booz/peripherals/booz_ms2001.c b/sw/airborne/peripherals/ms2001.c
similarity index 96%
rename from sw/airborne/booz/peripherals/booz_ms2001.c
rename to sw/airborne/peripherals/ms2001.c
index 4c6b87e8fe..f19e4bb575 100644
--- a/sw/airborne/booz/peripherals/booz_ms2001.c
+++ b/sw/airborne/peripherals/ms2001.c
@@ -1,6 +1,6 @@
 /*
  * $Id$
- *  
+ *
  * Copyright (C) 2008-2009 Antoine Drouin <poinix@gmail.com>
  *
  * This file is part of paparazzi.
@@ -18,7 +18,7 @@
  * 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. 
+ * Boston, MA 02111-1307, USA.
  */
 
 #include "booz_ms2001.h"
@@ -27,9 +27,9 @@ volatile uint8_t ms2001_status;
 volatile int16_t ms2001_values[MS2001_NB_AXIS];
 
 void ms2001_init( void ) {
-  
+
   ms2001_arch_init();
-  
+
   uint8_t i;
   for (i=0; i<MS2001_NB_AXIS; i++)
     ms2001_values[i] = 0;
diff --git a/sw/airborne/booz/peripherals/booz_ms2001.h b/sw/airborne/peripherals/ms2001.h
similarity index 97%
rename from sw/airborne/booz/peripherals/booz_ms2001.h
rename to sw/airborne/peripherals/ms2001.h
index 9d07aaa4bd..aedd1f0e82 100644
--- a/sw/airborne/booz/peripherals/booz_ms2001.h
+++ b/sw/airborne/peripherals/ms2001.h
@@ -1,6 +1,6 @@
 /*
  * $Id$
- *  
+ *
  * Copyright (C) 2008-2009 Antoine Drouin <poinix@gmail.com>
  *
  * This file is part of paparazzi.
@@ -18,7 +18,7 @@
  * 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. 
+ * Boston, MA 02111-1307, USA.
  */
 
 #ifndef BOOZ_MS2001_H
diff --git a/sw/airborne/booz/peripherals/booz_sc18is600.c b/sw/airborne/peripherals/sc18i600.c
similarity index 99%
rename from sw/airborne/booz/peripherals/booz_sc18is600.c
rename to sw/airborne/peripherals/sc18i600.c
index 46131f4288..25e10e7f5e 100644
--- a/sw/airborne/booz/peripherals/booz_sc18is600.c
+++ b/sw/airborne/peripherals/sc18i600.c
@@ -8,4 +8,3 @@ void sc18is600_init(void) {
   sc18is600_arch_init();
 
 }
-
diff --git a/sw/airborne/booz/peripherals/booz_sc18is600.h b/sw/airborne/peripherals/sc18i600.h
similarity index 99%
rename from sw/airborne/booz/peripherals/booz_sc18is600.h
rename to sw/airborne/peripherals/sc18i600.h
index 26b2478613..ee4d20a463 100644
--- a/sw/airborne/booz/peripherals/booz_sc18is600.h
+++ b/sw/airborne/peripherals/sc18i600.h
@@ -52,4 +52,3 @@ extern void sc18is600_read_from_register(uint8_t addr);
 extern void sc18is600_arch_init(void);
 
 #endif /* SC18IS600_H */
-