diff --git a/sw/simulator/booz2_sim_main.c b/sw/simulator/old_booz/booz2_sim_main.c
similarity index 100%
rename from sw/simulator/booz2_sim_main.c
rename to sw/simulator/old_booz/booz2_sim_main.c
diff --git a/sw/simulator/booz_flight_model.c b/sw/simulator/old_booz/booz_flight_model.c
similarity index 100%
rename from sw/simulator/booz_flight_model.c
rename to sw/simulator/old_booz/booz_flight_model.c
diff --git a/sw/simulator/booz_flight_model.h b/sw/simulator/old_booz/booz_flight_model.h
similarity index 100%
rename from sw/simulator/booz_flight_model.h
rename to sw/simulator/old_booz/booz_flight_model.h
diff --git a/sw/simulator/booz_flight_model_params.h b/sw/simulator/old_booz/booz_flight_model_params.h
similarity index 100%
rename from sw/simulator/booz_flight_model_params.h
rename to sw/simulator/old_booz/booz_flight_model_params.h
diff --git a/sw/simulator/booz_flight_model_utils.c b/sw/simulator/old_booz/booz_flight_model_utils.c
similarity index 100%
rename from sw/simulator/booz_flight_model_utils.c
rename to sw/simulator/old_booz/booz_flight_model_utils.c
diff --git a/sw/simulator/booz_flight_model_utils.h b/sw/simulator/old_booz/booz_flight_model_utils.h
similarity index 100%
rename from sw/simulator/booz_flight_model_utils.h
rename to sw/simulator/old_booz/booz_flight_model_utils.h
diff --git a/sw/simulator/booz_flightgear.c b/sw/simulator/old_booz/booz_flightgear.c
similarity index 100%
rename from sw/simulator/booz_flightgear.c
rename to sw/simulator/old_booz/booz_flightgear.c
diff --git a/sw/simulator/booz_flightgear.h b/sw/simulator/old_booz/booz_flightgear.h
similarity index 100%
rename from sw/simulator/booz_flightgear.h
rename to sw/simulator/old_booz/booz_flightgear.h
diff --git a/sw/simulator/booz_joystick.c b/sw/simulator/old_booz/booz_joystick.c
similarity index 100%
rename from sw/simulator/booz_joystick.c
rename to sw/simulator/old_booz/booz_joystick.c
diff --git a/sw/simulator/booz_joystick.h b/sw/simulator/old_booz/booz_joystick.h
similarity index 100%
rename from sw/simulator/booz_joystick.h
rename to sw/simulator/old_booz/booz_joystick.h
diff --git a/sw/simulator/booz_joystick_fake.h b/sw/simulator/old_booz/booz_joystick_fake.h
similarity index 100%
rename from sw/simulator/booz_joystick_fake.h
rename to sw/simulator/old_booz/booz_joystick_fake.h
diff --git a/sw/simulator/booz_r250.c b/sw/simulator/old_booz/booz_r250.c
similarity index 100%
rename from sw/simulator/booz_r250.c
rename to sw/simulator/old_booz/booz_r250.c
diff --git a/sw/simulator/booz_r250.h b/sw/simulator/old_booz/booz_r250.h
similarity index 100%
rename from sw/simulator/booz_r250.h
rename to sw/simulator/old_booz/booz_r250.h
diff --git a/sw/simulator/booz_randlcg.c b/sw/simulator/old_booz/booz_randlcg.c
similarity index 100%
rename from sw/simulator/booz_randlcg.c
rename to sw/simulator/old_booz/booz_randlcg.c
diff --git a/sw/simulator/booz_randlcg.h b/sw/simulator/old_booz/booz_randlcg.h
similarity index 100%
rename from sw/simulator/booz_randlcg.h
rename to sw/simulator/old_booz/booz_randlcg.h
diff --git a/sw/simulator/booz_rc_sim.h b/sw/simulator/old_booz/booz_rc_sim.h
similarity index 100%
rename from sw/simulator/booz_rc_sim.h
rename to sw/simulator/old_booz/booz_rc_sim.h
diff --git a/sw/simulator/booz_sensors_model.c b/sw/simulator/old_booz/booz_sensors_model.c
similarity index 100%
rename from sw/simulator/booz_sensors_model.c
rename to sw/simulator/old_booz/booz_sensors_model.c
diff --git a/sw/simulator/booz_sensors_model.h b/sw/simulator/old_booz/booz_sensors_model.h
similarity index 100%
rename from sw/simulator/booz_sensors_model.h
rename to sw/simulator/old_booz/booz_sensors_model.h
diff --git a/sw/simulator/booz_sensors_model_accel.c b/sw/simulator/old_booz/booz_sensors_model_accel.c
similarity index 100%
rename from sw/simulator/booz_sensors_model_accel.c
rename to sw/simulator/old_booz/booz_sensors_model_accel.c
diff --git a/sw/simulator/booz_sensors_model_baro.c b/sw/simulator/old_booz/booz_sensors_model_baro.c
similarity index 100%
rename from sw/simulator/booz_sensors_model_baro.c
rename to sw/simulator/old_booz/booz_sensors_model_baro.c
diff --git a/sw/simulator/booz_sensors_model_gps.c b/sw/simulator/old_booz/booz_sensors_model_gps.c
similarity index 100%
rename from sw/simulator/booz_sensors_model_gps.c
rename to sw/simulator/old_booz/booz_sensors_model_gps.c
diff --git a/sw/simulator/booz_sensors_model_gyro.c b/sw/simulator/old_booz/booz_sensors_model_gyro.c
similarity index 100%
rename from sw/simulator/booz_sensors_model_gyro.c
rename to sw/simulator/old_booz/booz_sensors_model_gyro.c
diff --git a/sw/simulator/booz_sensors_model_mag.c b/sw/simulator/old_booz/booz_sensors_model_mag.c
similarity index 100%
rename from sw/simulator/booz_sensors_model_mag.c
rename to sw/simulator/old_booz/booz_sensors_model_mag.c
diff --git a/sw/simulator/booz_sensors_model_params_booz2.h b/sw/simulator/old_booz/booz_sensors_model_params_booz2.h
similarity index 100%
rename from sw/simulator/booz_sensors_model_params_booz2.h
rename to sw/simulator/old_booz/booz_sensors_model_params_booz2.h
diff --git a/sw/simulator/booz_sensors_model_params_booz2_a1.h b/sw/simulator/old_booz/booz_sensors_model_params_booz2_a1.h
similarity index 100%
rename from sw/simulator/booz_sensors_model_params_booz2_a1.h
rename to sw/simulator/old_booz/booz_sensors_model_params_booz2_a1.h
diff --git a/sw/simulator/booz_sensors_model_rangemeter.c b/sw/simulator/old_booz/booz_sensors_model_rangemeter.c
similarity index 100%
rename from sw/simulator/booz_sensors_model_rangemeter.c
rename to sw/simulator/old_booz/booz_sensors_model_rangemeter.c
diff --git a/sw/simulator/booz_sensors_model_utils.c b/sw/simulator/old_booz/booz_sensors_model_utils.c
similarity index 100%
rename from sw/simulator/booz_sensors_model_utils.c
rename to sw/simulator/old_booz/booz_sensors_model_utils.c
diff --git a/sw/simulator/booz_sensors_model_utils.h b/sw/simulator/old_booz/booz_sensors_model_utils.h
similarity index 100%
rename from sw/simulator/booz_sensors_model_utils.h
rename to sw/simulator/old_booz/booz_sensors_model_utils.h
diff --git a/sw/simulator/booz_wind_model.c b/sw/simulator/old_booz/booz_wind_model.c
similarity index 100%
rename from sw/simulator/booz_wind_model.c
rename to sw/simulator/old_booz/booz_wind_model.c
diff --git a/sw/simulator/booz_wind_model.h b/sw/simulator/old_booz/booz_wind_model.h
similarity index 100%
rename from sw/simulator/booz_wind_model.h
rename to sw/simulator/old_booz/booz_wind_model.h