diff --git a/conf/autopilot/rotorcraft.makefile b/conf/autopilot/rotorcraft.makefile
index 359bbbc5b2..48773cdf70 100644
--- a/conf/autopilot/rotorcraft.makefile
+++ b/conf/autopilot/rotorcraft.makefile
@@ -35,6 +35,7 @@ SRC_BOOZ=booz
 SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCH)
 SRC_BOOZ_TEST=$(SRC_BOOZ)/test
 SRC_BOARD=boards/$(BOARD)
+SRC_FIRMAWRE=firmwares/rotorcraft
 
 SRC_BOOZ_PRIV=booz_priv
 
@@ -52,7 +53,7 @@ ap.TARGETDIR = ap
 
 ap.CFLAGS += $(BOOZ_INC)
 ap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -DPERIPHERALS_AUTO_INIT
-ap.srcs    = $(SRC_BOOZ)/booz2_main.c
+ap.srcs    = $(SRC_FIRMAWRE)/main.c
 
 ifeq ($(ARCHI), stm32) 
 ap.srcs += lisa/plug_sys.c
diff --git a/conf/boards/booz_1.0.makefile b/conf/boards/booz_1.0.makefile
index 3dd9372413..ade65652ad 100644
--- a/conf/boards/booz_1.0.makefile
+++ b/conf/boards/booz_1.0.makefile
@@ -19,7 +19,7 @@ endif
 #
 #
 
-#SYS_TIME_LED = 1 # not used
+SYS_TIME_LED = 1 # not used on rotorcraft, only for tests
 
 RADIO_CONTROL_LED  = 1
 RADIO_CONTROL_LINK = UART0
diff --git a/sw/airborne/boards/booz/baro_board.c b/sw/airborne/boards/booz/baro_board.c
index 5e067e3cdb..133353dfef 100644
--- a/sw/airborne/boards/booz/baro_board.c
+++ b/sw/airborne/boards/booz/baro_board.c
@@ -21,7 +21,7 @@
  */
 
 
-#include "rotorcraft/baro.h"
+#include "firmwares/rotorcraft/baro.h"
 
 #include "airframe.h"
 #include "led.h"
diff --git a/sw/airborne/boards/booz/baro_board.h b/sw/airborne/boards/booz/baro_board.h
index 1eb465d744..135bebbdac 100644
--- a/sw/airborne/boards/booz/baro_board.h
+++ b/sw/airborne/boards/booz/baro_board.h
@@ -3,7 +3,7 @@
 
 #include "std.h"
 
-#include "rotorcraft/baro.h"
+#include "firmwares/rotorcraft/baro.h"
 #include "booz/booz2_analog.h"
 
 /* we don't need that on this board */
diff --git a/sw/airborne/boards/booz/test_baro.c b/sw/airborne/boards/booz/test_baro.c
index b9e3d9c7d3..53148e2cbf 100644
--- a/sw/airborne/boards/booz/test_baro.c
+++ b/sw/airborne/boards/booz/test_baro.c
@@ -34,7 +34,7 @@
 
 #include "sys_time.h"
 #include "downlink.h"
-#include "rotorcraft/baro.h"
+#include "firmwares/rotorcraft/baro.h"
 
 static inline void main_init( void );
 static inline void main_periodic_task( void );
diff --git a/sw/airborne/boards/lisa_l/baro_board.c b/sw/airborne/boards/lisa_l/baro_board.c
index ac7dca0bb8..643e241fe4 100644
--- a/sw/airborne/boards/lisa_l/baro_board.c
+++ b/sw/airborne/boards/lisa_l/baro_board.c
@@ -1,5 +1,5 @@
 
-#include "rotorcraft/baro.h"
+#include "firmwares/rotorcraft/baro.h"
 
 struct Baro baro;
 struct BaroBoard baro_board;
diff --git a/sw/airborne/boards/lisa_l/test_baro.c b/sw/airborne/boards/lisa_l/test_baro.c
index fa2bf931e1..21162f1724 100644
--- a/sw/airborne/boards/lisa_l/test_baro.c
+++ b/sw/airborne/boards/lisa_l/test_baro.c
@@ -34,7 +34,7 @@
 
 #include "downlink.h"
 
-#include "rotorcraft/baro.h"
+#include "firmwares/rotorcraft/baro.h"
 //#include "my_debug_servo.h"
 
 static inline void main_init( void );
diff --git a/sw/airborne/booz/arch/lpc21/booz2_analog_hw.c b/sw/airborne/booz/arch/lpc21/booz2_analog_hw.c
index c51479e7ee..53babdc88c 100644
--- a/sw/airborne/booz/arch/lpc21/booz2_analog_hw.c
+++ b/sw/airborne/booz/arch/lpc21/booz2_analog_hw.c
@@ -24,7 +24,7 @@
 #include "booz2_analog.h"
 
 /* analog_arch includes baro ??? naaaa we don't want double references */
-#include "rotorcraft/baro.h"
+#include "firmwares/rotorcraft/baro.h"
 #include "booz2_battery.h"
 
 #ifndef USE_EXTRA_ADC
diff --git a/sw/airborne/booz/booz2_ins.c b/sw/airborne/booz/booz2_ins.c
index 25fcb8df02..7edcf9655b 100644
--- a/sw/airborne/booz/booz2_ins.c
+++ b/sw/airborne/booz/booz2_ins.c
@@ -25,7 +25,7 @@
 #include "booz2_ins.h"
 
 #include "booz_imu.h"
-#include "rotorcraft/baro.h"
+#include "firmwares/rotorcraft/baro.h"
 #include "booz_gps.h"
 
 #include "airframe.h"
diff --git a/sw/airborne/booz/booz2_main.c b/sw/airborne/firmwares/rotorcraft/main.c
similarity index 98%
rename from sw/airborne/booz/booz2_main.c
rename to sw/airborne/firmwares/rotorcraft/main.c
index 934e5fbeee..e710124084 100644
--- a/sw/airborne/booz/booz2_main.c
+++ b/sw/airborne/firmwares/rotorcraft/main.c
@@ -42,7 +42,7 @@
 #include "booz_gps.h"
 
 #include "booz/booz2_analog.h"
-#include "rotorcraft/baro.h"
+#include "firmwares/rotorcraft/baro.h"
 
 #include "booz2_battery.h"
 
@@ -59,7 +59,7 @@
 #include "booz2_pwm_hw.h"
 #endif
 
-#include "booz2_main.h"
+#include "firmwares/rotorcraft/main.h"
 
 #ifdef SITL
 #include "nps_autopilot_booz.h"
diff --git a/sw/airborne/booz/booz2_main.h b/sw/airborne/firmwares/rotorcraft/main.h
similarity index 100%
rename from sw/airborne/booz/booz2_main.h
rename to sw/airborne/firmwares/rotorcraft/main.h