diff --git a/tests/integration/environment/__init__.py b/tests/integration/environment/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/integration/test_environment.py b/tests/integration/environment/test_environment.py
similarity index 100%
rename from tests/integration/test_environment.py
rename to tests/integration/environment/test_environment.py
diff --git a/tests/integration/test_environment_analysis.py b/tests/integration/environment/test_environment_analysis.py
similarity index 100%
rename from tests/integration/test_environment_analysis.py
rename to tests/integration/environment/test_environment_analysis.py
diff --git a/tests/integration/motors/__init__.py b/tests/integration/motors/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/integration/test_empty_motor.py b/tests/integration/motors/test_empty_motor.py
similarity index 100%
rename from tests/integration/test_empty_motor.py
rename to tests/integration/motors/test_empty_motor.py
diff --git a/tests/integration/test_genericmotor.py b/tests/integration/motors/test_genericmotor.py
similarity index 100%
rename from tests/integration/test_genericmotor.py
rename to tests/integration/motors/test_genericmotor.py
diff --git a/tests/integration/test_hybridmotor.py b/tests/integration/motors/test_hybridmotor.py
similarity index 100%
rename from tests/integration/test_hybridmotor.py
rename to tests/integration/motors/test_hybridmotor.py
diff --git a/tests/integration/test_liquidmotor.py b/tests/integration/motors/test_liquidmotor.py
similarity index 100%
rename from tests/integration/test_liquidmotor.py
rename to tests/integration/motors/test_liquidmotor.py
diff --git a/tests/integration/test_tank.py b/tests/integration/motors/test_tank.py
similarity index 100%
rename from tests/integration/test_tank.py
rename to tests/integration/motors/test_tank.py
diff --git a/tests/integration/simulation/__init__.py b/tests/integration/simulation/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/integration/test_flight.py b/tests/integration/simulation/test_flight.py
similarity index 100%
rename from tests/integration/test_flight.py
rename to tests/integration/simulation/test_flight.py
diff --git a/tests/integration/test_flight_data_importer.py b/tests/integration/simulation/test_flight_data_importer.py
similarity index 100%
rename from tests/integration/test_flight_data_importer.py
rename to tests/integration/simulation/test_flight_data_importer.py
diff --git a/tests/integration/test_monte_carlo.py b/tests/integration/simulation/test_monte_carlo.py
similarity index 100%
rename from tests/integration/test_monte_carlo.py
rename to tests/integration/simulation/test_monte_carlo.py
diff --git a/tests/integration/test_multivariate_rejection_sampler.py b/tests/integration/simulation/test_multivariate_rejection_sampler.py
similarity index 100%
rename from tests/integration/test_multivariate_rejection_sampler.py
rename to tests/integration/simulation/test_multivariate_rejection_sampler.py
diff --git a/tests/unit/environment/__init__.py b/tests/unit/environment/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/unit/test_environment.py b/tests/unit/environment/test_environment.py
similarity index 100%
rename from tests/unit/test_environment.py
rename to tests/unit/environment/test_environment.py
diff --git a/tests/unit/test_environment_analysis.py b/tests/unit/environment/test_environment_analysis.py
similarity index 100%
rename from tests/unit/test_environment_analysis.py
rename to tests/unit/environment/test_environment_analysis.py
diff --git a/tests/unit/mathutils/__init__.py b/tests/unit/mathutils/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/unit/test_function.py b/tests/unit/mathutils/test_function.py
similarity index 100%
rename from tests/unit/test_function.py
rename to tests/unit/mathutils/test_function.py
diff --git a/tests/unit/test_piecewise_function.py b/tests/unit/mathutils/test_piecewise_function.py
similarity index 100%
rename from tests/unit/test_piecewise_function.py
rename to tests/unit/mathutils/test_piecewise_function.py
diff --git a/tests/unit/test_tools_matrix.py b/tests/unit/mathutils/test_tools_matrix.py
similarity index 100%
rename from tests/unit/test_tools_matrix.py
rename to tests/unit/mathutils/test_tools_matrix.py
diff --git a/tests/unit/test_tools_vector.py b/tests/unit/mathutils/test_tools_vector.py
similarity index 100%
rename from tests/unit/test_tools_vector.py
rename to tests/unit/mathutils/test_tools_vector.py
diff --git a/tests/unit/motors/__init__.py b/tests/unit/motors/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/unit/test_fluid.py b/tests/unit/motors/test_fluid.py
similarity index 100%
rename from tests/unit/test_fluid.py
rename to tests/unit/motors/test_fluid.py
diff --git a/tests/unit/test_genericmotor.py b/tests/unit/motors/test_genericmotor.py
similarity index 100%
rename from tests/unit/test_genericmotor.py
rename to tests/unit/motors/test_genericmotor.py
diff --git a/tests/unit/test_hybridmotor.py b/tests/unit/motors/test_hybridmotor.py
similarity index 100%
rename from tests/unit/test_hybridmotor.py
rename to tests/unit/motors/test_hybridmotor.py
diff --git a/tests/unit/test_liquidmotor.py b/tests/unit/motors/test_liquidmotor.py
similarity index 100%
rename from tests/unit/test_liquidmotor.py
rename to tests/unit/motors/test_liquidmotor.py
diff --git a/tests/unit/test_solidmotor.py b/tests/unit/motors/test_solidmotor.py
similarity index 100%
rename from tests/unit/test_solidmotor.py
rename to tests/unit/motors/test_solidmotor.py
diff --git a/tests/unit/test_tank.py b/tests/unit/motors/test_tank.py
similarity index 100%
rename from tests/unit/test_tank.py
rename to tests/unit/motors/test_tank.py
diff --git a/tests/unit/test_tank_geometry.py b/tests/unit/motors/test_tank_geometry.py
similarity index 100%
rename from tests/unit/test_tank_geometry.py
rename to tests/unit/motors/test_tank_geometry.py
diff --git a/tests/unit/rocket/__init__.py b/tests/unit/rocket/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/unit/rocket/aero_surface/__init__.py b/tests/unit/rocket/aero_surface/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/unit/test_aero_surfaces.py b/tests/unit/rocket/aero_surface/test_aero_surfaces.py
similarity index 100%
rename from tests/unit/test_aero_surfaces.py
rename to tests/unit/rocket/aero_surface/test_aero_surfaces.py
diff --git a/tests/unit/test_generic_surfaces.py b/tests/unit/rocket/aero_surface/test_generic_surfaces.py
similarity index 100%
rename from tests/unit/test_generic_surfaces.py
rename to tests/unit/rocket/aero_surface/test_generic_surfaces.py
diff --git a/tests/unit/test_linear_generic_surfaces.py b/tests/unit/rocket/aero_surface/test_linear_generic_surfaces.py
similarity index 100%
rename from tests/unit/test_linear_generic_surfaces.py
rename to tests/unit/rocket/aero_surface/test_linear_generic_surfaces.py
diff --git a/tests/unit/test_rocket.py b/tests/unit/rocket/test_rocket.py
similarity index 100%
rename from tests/unit/test_rocket.py
rename to tests/unit/rocket/test_rocket.py
diff --git a/tests/unit/sensors/__init__.py b/tests/unit/sensors/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/unit/test_sensor.py b/tests/unit/sensors/test_sensor.py
similarity index 100%
rename from tests/unit/test_sensor.py
rename to tests/unit/sensors/test_sensor.py
diff --git a/tests/unit/simulation/__init__.py b/tests/unit/simulation/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/unit/test_flight.py b/tests/unit/simulation/test_flight.py
similarity index 100%
rename from tests/unit/test_flight.py
rename to tests/unit/simulation/test_flight.py
diff --git a/tests/unit/test_flight_time_nodes.py b/tests/unit/simulation/test_flight_time_nodes.py
similarity index 100%
rename from tests/unit/test_flight_time_nodes.py
rename to tests/unit/simulation/test_flight_time_nodes.py
diff --git a/tests/unit/test_monte_carlo.py b/tests/unit/simulation/test_monte_carlo.py
similarity index 100%
rename from tests/unit/test_monte_carlo.py
rename to tests/unit/simulation/test_monte_carlo.py
diff --git a/tests/unit/test_multivariate_rejection_sampler.py b/tests/unit/simulation/test_multivariate_rejection_sampler.py
similarity index 100%
rename from tests/unit/test_multivariate_rejection_sampler.py
rename to tests/unit/simulation/test_multivariate_rejection_sampler.py
diff --git a/tests/unit/test_stochastic_model.py b/tests/unit/stochastic/test_stochastic_model.py
similarity index 100%
rename from tests/unit/test_stochastic_model.py
rename to tests/unit/stochastic/test_stochastic_model.py