diff --git a/sw/airborne/nav.c b/sw/airborne/subsystems/nav.c
similarity index 100%
rename from sw/airborne/nav.c
rename to sw/airborne/subsystems/nav.c
diff --git a/sw/airborne/nav.h b/sw/airborne/subsystems/nav.h
similarity index 100%
rename from sw/airborne/nav.h
rename to sw/airborne/subsystems/nav.h
diff --git a/sw/airborne/OSAMNav.c b/sw/airborne/subsystems/navigation/OSAMNav.c
similarity index 100%
rename from sw/airborne/OSAMNav.c
rename to sw/airborne/subsystems/navigation/OSAMNav.c
diff --git a/sw/airborne/OSAMNav.h b/sw/airborne/subsystems/navigation/OSAMNav.h
similarity index 100%
rename from sw/airborne/OSAMNav.h
rename to sw/airborne/subsystems/navigation/OSAMNav.h
diff --git a/sw/airborne/common_nav.c b/sw/airborne/subsystems/navigation/common_nav.c
similarity index 100%
rename from sw/airborne/common_nav.c
rename to sw/airborne/subsystems/navigation/common_nav.c
diff --git a/sw/airborne/common_nav.h b/sw/airborne/subsystems/navigation/common_nav.h
similarity index 100%
rename from sw/airborne/common_nav.h
rename to sw/airborne/subsystems/navigation/common_nav.h
diff --git a/sw/airborne/discsurvey.c b/sw/airborne/subsystems/navigation/discsurvey.c
similarity index 100%
rename from sw/airborne/discsurvey.c
rename to sw/airborne/subsystems/navigation/discsurvey.c
diff --git a/sw/airborne/discsurvey.h b/sw/airborne/subsystems/navigation/discsurvey.h
similarity index 100%
rename from sw/airborne/discsurvey.h
rename to sw/airborne/subsystems/navigation/discsurvey.h
diff --git a/sw/airborne/flightzone.c b/sw/airborne/subsystems/navigation/flightzone.c
similarity index 100%
rename from sw/airborne/flightzone.c
rename to sw/airborne/subsystems/navigation/flightzone.c
diff --git a/sw/airborne/flightzone.h b/sw/airborne/subsystems/navigation/flightzone.h
similarity index 100%
rename from sw/airborne/flightzone.h
rename to sw/airborne/subsystems/navigation/flightzone.h
diff --git a/sw/airborne/nav_cube.c b/sw/airborne/subsystems/navigation/nav_cube.c
similarity index 100%
rename from sw/airborne/nav_cube.c
rename to sw/airborne/subsystems/navigation/nav_cube.c
diff --git a/sw/airborne/nav_cube.h b/sw/airborne/subsystems/navigation/nav_cube.h
similarity index 100%
rename from sw/airborne/nav_cube.h
rename to sw/airborne/subsystems/navigation/nav_cube.h
diff --git a/sw/airborne/nav_line.c b/sw/airborne/subsystems/navigation/nav_line.c
similarity index 100%
rename from sw/airborne/nav_line.c
rename to sw/airborne/subsystems/navigation/nav_line.c
diff --git a/sw/airborne/nav_line.h b/sw/airborne/subsystems/navigation/nav_line.h
similarity index 100%
rename from sw/airborne/nav_line.h
rename to sw/airborne/subsystems/navigation/nav_line.h
diff --git a/sw/airborne/nav_survey_rectangle.c b/sw/airborne/subsystems/navigation/nav_survey_rectangle.c
similarity index 100%
rename from sw/airborne/nav_survey_rectangle.c
rename to sw/airborne/subsystems/navigation/nav_survey_rectangle.c
diff --git a/sw/airborne/nav_survey_rectangle.h b/sw/airborne/subsystems/navigation/nav_survey_rectangle.h
similarity index 100%
rename from sw/airborne/nav_survey_rectangle.h
rename to sw/airborne/subsystems/navigation/nav_survey_rectangle.h