diff --git a/conf/airframes/ENAC/fixed-wing/drops.xml b/conf/airframes/ENAC/fixed-wing/drops.xml
index 879338ac51..ddb2e42609 100644
--- a/conf/airframes/ENAC/fixed-wing/drops.xml
+++ b/conf/airframes/ENAC/fixed-wing/drops.xml
@@ -261,7 +261,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl_a.c fw_v_ctl.c
 ap.srcs += subsystems/navigation/nav_line.c
 ap.srcs += subsystems/navigation/nav_survey_rectangle.c
 
-ap.srcs += bomb.c
+ap.srcs += subsystems/navigation/bomb.c
 
 ap.srcs += subsystems/navigation/snav.c
 
@@ -274,7 +274,7 @@ sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c inf
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
 sim.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c
 
-sim.srcs += bomb.c
+sim.srcs += subsystems/navigation/bomb.c
 
   </makefile>
 </airframe>
diff --git a/conf/airframes/ENAC/fixed-wing/slayer2.xml b/conf/airframes/ENAC/fixed-wing/slayer2.xml
index 14de4d77a1..a93ce46e81 100644
--- a/conf/airframes/ENAC/fixed-wing/slayer2.xml
+++ b/conf/airframes/ENAC/fixed-wing/slayer2.xml
@@ -247,7 +247,7 @@ ap.CFLAGS += -DLED_3_BANK=0 -DLED_3_PIN=10 -DPOWER_SWITCH_LED=3
 ap.CFLAGS += -DGYRO -DADXRS150
 # -DIDG300
 ap.srcs += gyro.c
-# ap.srcs += bomb.c
+# ap.srcs += subsystems/navigation/bomb.c
 
 # Hack to use the same tuning file than slayer1
 ap.CFLAGS += -DUSE_GPIO
diff --git a/conf/airframes/TUDelft/Trip50B.xml b/conf/airframes/TUDelft/Trip50B.xml
index e9671bef83..a49154fe6a 100644
--- a/conf/airframes/TUDelft/Trip50B.xml
+++ b/conf/airframes/TUDelft/Trip50B.xml
@@ -311,7 +311,7 @@ sim.CFLAGS += -DUSE_JOYSTICK
 sim.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH_ROLL
 # -DTEST_CAM
 sim.srcs += cam.c point.c
-sim.srcs += bomb.c
+sim.srcs += subsystems/navigation/bomb.c
 
 
 
diff --git a/conf/airframes/TUDelft/holiday50.xml b/conf/airframes/TUDelft/holiday50.xml
index 84ba5d6a45..90e51a9582 100644
--- a/conf/airframes/TUDelft/holiday50.xml
+++ b/conf/airframes/TUDelft/holiday50.xml
@@ -301,7 +301,7 @@ ap.srcs += cam.c point.c
 # traffic_info.c
 
 ap.CFLAGS += -DWIND_INFO -DSTRONG_WIND
-ap.srcs += bomb.c
+ap.srcs += subsystems/navigation/bomb.c
 
 # Config for SITL simulation
 include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
@@ -314,7 +314,7 @@ sim.CFLAGS += -DUSE_MODULES
 sim.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH_ROLL
 # -DTEST_CAM
 sim.srcs += cam.c point.c
-sim.srcs += bomb.c
+sim.srcs += subsystems/navigation/bomb.c
 
   </makefile>
 </airframe>
diff --git a/conf/airframes/mm/extra/press_t.xml b/conf/airframes/mm/extra/press_t.xml
index 670ff3f929..989089a3e3 100755
--- a/conf/airframes/mm/extra/press_t.xml
+++ b/conf/airframes/mm/extra/press_t.xml
@@ -280,7 +280,7 @@ ap.CFLAGS += -DUSE_BARO_SCP
 ap.srcs += joystick.c
 ap.CFLAGS += -DUSE_JOYSTICK
 
-ap.srcs += bomb.c
+ap.srcs += subsystems/navigation/bomb.c
 
 ap.srcs += subsystems/navigation/snav.c
 
diff --git a/conf/airframes/mm/fixed-wing/drops.xml b/conf/airframes/mm/fixed-wing/drops.xml
index a03978b4b9..9286295c6b 100644
--- a/conf/airframes/mm/fixed-wing/drops.xml
+++ b/conf/airframes/mm/fixed-wing/drops.xml
@@ -283,7 +283,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl_a.c fw_v_ctl.c
 ap.srcs += subsystems/navigation/nav_line.c
 ap.srcs += subsystems/navigation/nav_survey_rectangle.c
 
-ap.srcs += bomb.c
+ap.srcs += subsystems/navigation/bomb.c
 
 ap.srcs += subsystems/navigation/snav.c
 
@@ -299,7 +299,7 @@ sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c inf
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
 sim.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c
 
-sim.srcs += bomb.c
+sim.srcs += subsystems/navigation/bomb.c
 
 </makefile-->
 
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi3.xml b/conf/airframes/mm/fixed-wing/funjetgfi3.xml
index ab9fecce57..4803c21e11 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi3.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi3.xml
@@ -235,7 +235,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c latlong.c subsystems/navigatio
 #ap.CFLAGS += -DGYRO -DADXRS150
 #ap.srcs += gyro.c
 
-#ap.srcs += bomb.c
+#ap.srcs += subsystems/navigation/bomb.c
 #ap.srcs += traffic_info.c
 
 ap.srcs += i2c.c arm7/i2c_hw.c dpicco.c
diff --git a/conf/airframes/mm/fixed-wing/funjetmm2.xml b/conf/airframes/mm/fixed-wing/funjetmm2.xml
index a1db3a6ac1..90b63fb2e4 100644
--- a/conf/airframes/mm/fixed-wing/funjetmm2.xml
+++ b/conf/airframes/mm/fixed-wing/funjetmm2.xml
@@ -254,7 +254,7 @@ ap.srcs += subsystems/navigation/nav_survey_rectangle.c
 ap.srcs += humid_sht.c
 ap.CFLAGS += -DUSE_HUMID_SHT -DDAT_PIN=30  -DSCK_PIN=4
 
-ap.srcs += bomb.c
+ap.srcs += subsystems/navigation/bomb.c
 
 ap.srcs += subsystems/navigation/snav.c
 
@@ -267,7 +267,7 @@ include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
 sim.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c
 
-sim.srcs += bomb.c
+sim.srcs += subsystems/navigation/bomb.c
 
 
   </makefile>
diff --git a/conf/airframes/mm/fixed-wing/twinstarmm.xml b/conf/airframes/mm/fixed-wing/twinstarmm.xml
index e04353556d..73e30a3384 100644
--- a/conf/airframes/mm/fixed-wing/twinstarmm.xml
+++ b/conf/airframes/mm/fixed-wing/twinstarmm.xml
@@ -240,7 +240,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
 ap.srcs += subsystems/navigation/nav_line.c
 ap.srcs += subsystems/navigation/nav_survey_rectangle.c
 
-ap.srcs += bomb.c
+ap.srcs += subsystems/navigation/bomb.c
 
 ap.srcs += subsystems/navigation/snav.c
 
@@ -253,7 +253,7 @@ sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c inf
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
 sim.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c
 
-sim.srcs += bomb.c
+sim.srcs += subsystems/navigation/bomb.c
 
   </makefile>
 </airframe>
diff --git a/conf/airframes/mm/hangar/black_one.xml b/conf/airframes/mm/hangar/black_one.xml
index 9115bb102e..6aff5e8899 100644
--- a/conf/airframes/mm/hangar/black_one.xml
+++ b/conf/airframes/mm/hangar/black_one.xml
@@ -252,7 +252,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
 ap.CFLAGS += -DGYRO -DADXRS150
 ap.srcs += gyro.c
 
-ap.srcs += bomb.c
+ap.srcs += subsystems/navigation/bomb.c
 
 #Cap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM
 #Cap.srcs += traffic_info.c point.c cam.c
@@ -271,7 +271,7 @@ ap.srcs += $(SRC_ARCH)/gpio.c
 # Config for SITL simulation
 include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM -DIR_360
-sim.srcs += bomb.c
+sim.srcs += subsystems/navigation/bomb.c
 
 #Csim.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM
 #Csim.srcs += traffic_info.c point.c
diff --git a/conf/airframes/mm/hangar/glass_one1.xml b/conf/airframes/mm/hangar/glass_one1.xml
index c0157f119d..27949d1f4b 100644
--- a/conf/airframes/mm/hangar/glass_one1.xml
+++ b/conf/airframes/mm/hangar/glass_one1.xml
@@ -261,7 +261,7 @@ ap.srcs += $(SRC_ARCH)/gpio.c
 # Config for SITL simulation
 include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM
-sim.srcs += bomb.c subsystems/navigation/nav_survey_rectangle.c
+sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c
 
 sim.srcs += traffic_info.c subsystems/navigation/nav_line.c
 
diff --git a/conf/airframes/mm/hangar/glass_one2.xml b/conf/airframes/mm/hangar/glass_one2.xml
index 34f85667d0..0c8470b6b3 100644
--- a/conf/airframes/mm/hangar/glass_one2.xml
+++ b/conf/airframes/mm/hangar/glass_one2.xml
@@ -232,7 +232,7 @@ ap.srcs += $(SRC_ARCH)/gpio.c
 # Config for SITL simulation
 include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM
-sim.srcs += bomb.c subsystems/navigation/nav_survey_rectangle.c
+sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c
 
 sim.srcs += traffic_info.c subsystems/navigation/nav_line.c
 
diff --git a/conf/airframes/mm/hangar/glass_one3.xml b/conf/airframes/mm/hangar/glass_one3.xml
index 0ba4ff27ef..429a3124e7 100644
--- a/conf/airframes/mm/hangar/glass_one3.xml
+++ b/conf/airframes/mm/hangar/glass_one3.xml
@@ -259,7 +259,7 @@ ap.srcs += $(SRC_ARCH)/gpio.c
 # Config for SITL simulation
 include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM
-sim.srcs += bomb.c subsystems/navigation/nav_survey_rectangle.c
+sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c
 
 sim.srcs += traffic_info.c subsystems/navigation/nav_line.c
 
diff --git a/conf/airframes/mm/hangar/mac06a.xml b/conf/airframes/mm/hangar/mac06a.xml
index 5ac08279c1..6b8481861b 100644
--- a/conf/airframes/mm/hangar/mac06a.xml
+++ b/conf/airframes/mm/hangar/mac06a.xml
@@ -238,7 +238,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
 ap.CFLAGS += -DGYRO -DADXRS150
 ap.srcs += gyro.c
 
-ap.srcs += bomb.c
+ap.srcs += subsystems/navigation/bomb.c
 
 
 
@@ -250,7 +250,7 @@ ap.srcs += bomb.c
 # Config for SITL simulation
 include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM -DALT_KALMAN -DIR_360
-sim.srcs += bomb.c
+sim.srcs += subsystems/navigation/bomb.c
 
   </makefile>
 </airframe>
diff --git a/conf/airframes/mm/hangar/red_one.xml b/conf/airframes/mm/hangar/red_one.xml
index 79d668420f..0f394722f1 100644
--- a/conf/airframes/mm/hangar/red_one.xml
+++ b/conf/airframes/mm/hangar/red_one.xml
@@ -265,7 +265,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c latlong.c subsystems/navigatio
 ap.CFLAGS += -DGYRO -DADXRS150
 ap.srcs += gyro.c
 
-ap.srcs += bomb.c
+ap.srcs += subsystems/navigation/bomb.c
 
 ap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH
 ap.srcs += traffic_info.c point.c cam.c subsystems/navigation/nav_line.c
@@ -288,7 +288,7 @@ ap.CFLAGS += -DUSE_CURRENT
 # Config for SITL simulation
 include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM
-sim.srcs += bomb.c subsystems/navigation/nav_survey_rectangle.c
+sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c
 
 sim.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH
 sim.srcs += traffic_info.c point.c cam.c subsystems/navigation/nav_line.c
diff --git a/conf/airframes/obsolete/microjet6.xml b/conf/airframes/obsolete/microjet6.xml
index 60db707236..49da53b858 100644
--- a/conf/airframes/obsolete/microjet6.xml
+++ b/conf/airframes/obsolete/microjet6.xml
@@ -254,7 +254,7 @@ ap.srcs += subsystems/navigation/nav_line.c
 # Config for SITL simulation
 include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DUSE_BARO_MS5534A
-sim.srcs += subsystems/navigation/nav_survey_rectangle.c $(SRC_ARCH)/sim_baro.c bomb.c subsystems/navigation/nav_line.c
+sim.srcs += subsystems/navigation/nav_survey_rectangle.c $(SRC_ARCH)/sim_baro.c subsystems/navigation/bomb.c subsystems/navigation/nav_line.c
 
   </makefile>
 </airframe>
diff --git a/conf/airframes/obsolete/slayer1.xml b/conf/airframes/obsolete/slayer1.xml
index 156ba7cca8..c502088175 100644
--- a/conf/airframes/obsolete/slayer1.xml
+++ b/conf/airframes/obsolete/slayer1.xml
@@ -229,7 +229,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
 ap.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c
 
 ap.CFLAGS += -DGYRO -DIDG300
-ap.srcs += gyro.c bomb.c
+ap.srcs += gyro.c subsystems/navigation/bomb.c
 
 # Video switch
 ap.CFLAGS += -DLIGHT_PIN_1=3 -DUSE_GPIO
@@ -244,7 +244,7 @@ ap.srcs += $(SRC_ARCH)/gpio.c
 # Config for SITL simulation
 include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM -DALT_KALMAN
-sim.srcs += bomb.c subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c
+sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c
 
   </makefile>
 </airframe>
diff --git a/conf/airframes/obsolete/storm1.xml b/conf/airframes/obsolete/storm1.xml
index f6e254b685..c7596092df 100644
--- a/conf/airframes/obsolete/storm1.xml
+++ b/conf/airframes/obsolete/storm1.xml
@@ -275,7 +275,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
 # ap.srcs += gyro.c
 
 ap.srcs += traffic_info.c subsystems/navigation/nav_survey_rectangle.c
-ap.srcs += bomb.c
+ap.srcs += subsystems/navigation/bomb.c
 
 # Hack to use the same tuning file than slayer1
 ap.CFLAGS += -DUSE_GPIO
@@ -291,7 +291,7 @@ ap.srcs += $(SRC_ARCH)/gpio.c
 include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM -DALT_KALMAN -DIR_360
 sim.srcs += traffic_info.c
-sim.srcs += bomb.c  subsystems/navigation/nav_survey_rectangle.c
+sim.srcs += subsystems/navigation/bomb.c  subsystems/navigation/nav_survey_rectangle.c
 
   </makefile>
 </airframe>
diff --git a/conf/airframes/obsolete/twinjet1.xml b/conf/airframes/obsolete/twinjet1.xml
index 0f0c7a1692..436ed22651 100644
--- a/conf/airframes/obsolete/twinjet1.xml
+++ b/conf/airframes/obsolete/twinjet1.xml
@@ -244,7 +244,7 @@ test.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c pprz_tran
 include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.CFLAGS += -DBOARD_CONFIG=\"classix.h\" -DAGR_CLIMB -DLOITER_TRIM
 #sim.srcs += traffic_info.c
-#sim.srcs += subsystems/navigation/nav_line.c chemotaxis.c anemotaxis.c subsystems/navigation/discsurvey.c bomb.c subsystems/navigation/nav_survey_rectangle.c
+#sim.srcs += subsystems/navigation/nav_line.c chemotaxis.c anemotaxis.c subsystems/navigation/discsurvey.c subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c
 
 sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c light.c subsystems/navigation/snav.c
 sim.CFLAGS += -DUSE_LIGHT
diff --git a/conf/airframes/obsolete/twinstar6.xml b/conf/airframes/obsolete/twinstar6.xml
index 9b47d6674b..3b63a0ca00 100644
--- a/conf/airframes/obsolete/twinstar6.xml
+++ b/conf/airframes/obsolete/twinstar6.xml
@@ -245,7 +245,7 @@ include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.CFLAGS += -DBOARD_CONFIG=\"classix.h\" -DAGR_CLIMB -DLOITER_TRIM
 #sim.srcs += traffic_info.c
 sim.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c dc.c
-# chemotaxis.c anemotaxis.c subsystems/navigation/discsurvey.c bomb.c subsystems/navigation/nav_survey_rectangle.c
+# chemotaxis.c anemotaxis.c subsystems/navigation/discsurvey.c subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c
 
 
   </makefile>
diff --git a/conf/autopilot/subsystems/fixedwing/navigation_bomb.makefile b/conf/autopilot/subsystems/fixedwing/navigation_bomb.makefile
index 758ef836d0..5f2a0f5be8 100644
--- a/conf/autopilot/subsystems/fixedwing/navigation_bomb.makefile
+++ b/conf/autopilot/subsystems/fixedwing/navigation_bomb.makefile
@@ -3,5 +3,5 @@
 
 #add these to all targets
 
-$(TARGET).srcs += $(SRC_FIXEDWING)/bomb.c
+$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/bomb.c
 
diff --git a/conf/flight_plans/IS.xml b/conf/flight_plans/IS.xml
index 635723191d..9c264b7f37 100644
--- a/conf/flight_plans/IS.xml
+++ b/conf/flight_plans/IS.xml
@@ -7,7 +7,7 @@
 #include "chemotaxis.h"
 #include "subsystems/navigation/discsurvey.h"
 #include "subsystems/navigation/nav_line.h"
-#include "bomb.h"
+#include "subsystems/navigation/bomb.h"
 #include "datalink.h"
 </header>
   <waypoints>
diff --git a/conf/flight_plans/grosslobke_demo.xml b/conf/flight_plans/grosslobke_demo.xml
index 242d93ec86..03e7dee1a1 100755
--- a/conf/flight_plans/grosslobke_demo.xml
+++ b/conf/flight_plans/grosslobke_demo.xml
@@ -2,7 +2,7 @@
 
 <flight_plan alt="170" ground_alt="68" lat0="52.26483" lon0="9.99394" max_dist_from_home="1500" name="Gross Lobke Demo" qfu="270" security_height="60">
   <header>
-#include "bomb.h"
+#include "subsystems/navigation/bomb.h"
 #include "subsystems/navigation/nav_line.h"
 #include "datalink.h"
 </header>
diff --git a/conf/flight_plans/mav06.xml b/conf/flight_plans/mav06.xml
index b392d24807..864c6ccd0e 100644
--- a/conf/flight_plans/mav06.xml
+++ b/conf/flight_plans/mav06.xml
@@ -1,6 +1,6 @@
 <flight_plan alt="100" ground_alt="59" lat0="30.6478" lon0="-86.3253" max_dist_from_home="1500" name="MAV06" qfu="90" security_height="25">
 <header>
-#include "bomb.h"
+#include "subsystems/navigation/bomb.h"
 #include "subsystems/navigation/nav_line.h"
 </header>
   <waypoints>
diff --git a/conf/flight_plans/mav07.xml b/conf/flight_plans/mav07.xml
index e3e106e7e5..fb2a87092a 100644
--- a/conf/flight_plans/mav07.xml
+++ b/conf/flight_plans/mav07.xml
@@ -2,7 +2,7 @@
 
 <flight_plan alt="225" ground_alt="175" lat0="43.53900" lon0="1.24500" max_dist_from_home="1500" name="MAV07" qfu="0" security_height="25">
   <header>
-#include "bomb.h"
+#include "subsystems/navigation/bomb.h"
 #include "datalink.h"
 </header>
   <waypoints>
diff --git a/conf/flight_plans/slayer_training.xml b/conf/flight_plans/slayer_training.xml
index 4f21098ea0..16773c0183 100644
--- a/conf/flight_plans/slayer_training.xml
+++ b/conf/flight_plans/slayer_training.xml
@@ -2,7 +2,7 @@
 
 <flight_plan alt="75" ground_alt="0" lat0="43.4622" lon0="1.2729" max_dist_from_home="800" name="Versatile" qfu="270" security_height="25">
   <header>
-#include "bomb.h"
+#include "subsystems/navigation/bomb.h"
 </header>
   <waypoints>
     <waypoint name="HOME" x="0" y="0"/>
diff --git a/sw/airborne/bomb.c b/sw/airborne/subsystems/navigation/bomb.c
similarity index 99%
rename from sw/airborne/bomb.c
rename to sw/airborne/subsystems/navigation/bomb.c
index 8c24217e98..82d4655406 100644
--- a/sw/airborne/bomb.c
+++ b/sw/airborne/subsystems/navigation/bomb.c
@@ -24,7 +24,7 @@
 
 #include "estimator.h"
 #include "subsystems/nav.h"
-#include "bomb.h"
+#include "subsystems/navigation/bomb.h"
 #include "flight_plan.h"
 #include "airframe.h"
 #include "inter_mcu.h"
diff --git a/sw/airborne/bomb.h b/sw/airborne/subsystems/navigation/bomb.h
similarity index 100%
rename from sw/airborne/bomb.h
rename to sw/airborne/subsystems/navigation/bomb.h