diff --git a/libs/numeric/odeint/test/Jamfile.v2 b/test/Jamfile.v2
similarity index 100%
rename from libs/numeric/odeint/test/Jamfile.v2
rename to test/Jamfile.v2
diff --git a/libs/numeric/odeint/test/adams_bashforth.cpp b/test/adams_bashforth.cpp
similarity index 100%
rename from libs/numeric/odeint/test/adams_bashforth.cpp
rename to test/adams_bashforth.cpp
diff --git a/libs/numeric/odeint/test/adams_bashforth_moulton.cpp b/test/adams_bashforth_moulton.cpp
similarity index 100%
rename from libs/numeric/odeint/test/adams_bashforth_moulton.cpp
rename to test/adams_bashforth_moulton.cpp
diff --git a/libs/numeric/odeint/test/adams_moulton.cpp b/test/adams_moulton.cpp
similarity index 100%
rename from libs/numeric/odeint/test/adams_moulton.cpp
rename to test/adams_moulton.cpp
diff --git a/libs/numeric/odeint/test/adaptive_iterator.cpp b/test/adaptive_iterator.cpp
similarity index 100%
rename from libs/numeric/odeint/test/adaptive_iterator.cpp
rename to test/adaptive_iterator.cpp
diff --git a/libs/numeric/odeint/test/adaptive_time_iterator.cpp b/test/adaptive_time_iterator.cpp
similarity index 100%
rename from libs/numeric/odeint/test/adaptive_time_iterator.cpp
rename to test/adaptive_time_iterator.cpp
diff --git a/libs/numeric/odeint/test/algebra_dispatcher.cpp b/test/algebra_dispatcher.cpp
similarity index 100%
rename from libs/numeric/odeint/test/algebra_dispatcher.cpp
rename to test/algebra_dispatcher.cpp
diff --git a/libs/numeric/odeint/test/boost_units_helpers.hpp b/test/boost_units_helpers.hpp
similarity index 100%
rename from libs/numeric/odeint/test/boost_units_helpers.hpp
rename to test/boost_units_helpers.hpp
diff --git a/libs/numeric/odeint/test/bulirsch_stoer.cpp b/test/bulirsch_stoer.cpp
similarity index 100%
rename from libs/numeric/odeint/test/bulirsch_stoer.cpp
rename to test/bulirsch_stoer.cpp
diff --git a/libs/numeric/odeint/test/const_range.hpp b/test/const_range.hpp
similarity index 100%
rename from libs/numeric/odeint/test/const_range.hpp
rename to test/const_range.hpp
diff --git a/libs/numeric/odeint/test/const_step_iterator.cpp b/test/const_step_iterator.cpp
similarity index 100%
rename from libs/numeric/odeint/test/const_step_iterator.cpp
rename to test/const_step_iterator.cpp
diff --git a/libs/numeric/odeint/test/const_step_time_iterator.cpp b/test/const_step_time_iterator.cpp
similarity index 100%
rename from libs/numeric/odeint/test/const_step_time_iterator.cpp
rename to test/const_step_time_iterator.cpp
diff --git a/libs/numeric/odeint/test/default_operations.cpp b/test/default_operations.cpp
similarity index 100%
rename from libs/numeric/odeint/test/default_operations.cpp
rename to test/default_operations.cpp
diff --git a/libs/numeric/odeint/test/diagnostic_state_type.hpp b/test/diagnostic_state_type.hpp
similarity index 100%
rename from libs/numeric/odeint/test/diagnostic_state_type.hpp
rename to test/diagnostic_state_type.hpp
diff --git a/libs/numeric/odeint/test/dummy_observers.hpp b/test/dummy_observers.hpp
similarity index 100%
rename from libs/numeric/odeint/test/dummy_observers.hpp
rename to test/dummy_observers.hpp
diff --git a/libs/numeric/odeint/test/dummy_odes.hpp b/test/dummy_odes.hpp
similarity index 100%
rename from libs/numeric/odeint/test/dummy_odes.hpp
rename to test/dummy_odes.hpp
diff --git a/libs/numeric/odeint/test/dummy_steppers.hpp b/test/dummy_steppers.hpp
similarity index 100%
rename from libs/numeric/odeint/test/dummy_steppers.hpp
rename to test/dummy_steppers.hpp
diff --git a/libs/numeric/odeint/test/euler_stepper.cpp b/test/euler_stepper.cpp
similarity index 100%
rename from libs/numeric/odeint/test/euler_stepper.cpp
rename to test/euler_stepper.cpp
diff --git a/libs/numeric/odeint/test/fusion_algebra.cpp b/test/fusion_algebra.cpp
similarity index 100%
rename from libs/numeric/odeint/test/fusion_algebra.cpp
rename to test/fusion_algebra.cpp
diff --git a/libs/numeric/odeint/test/generation.cpp b/test/generation.cpp
similarity index 100%
rename from libs/numeric/odeint/test/generation.cpp
rename to test/generation.cpp
diff --git a/libs/numeric/odeint/test/generic_error_stepper.cpp b/test/generic_error_stepper.cpp
similarity index 100%
rename from libs/numeric/odeint/test/generic_error_stepper.cpp
rename to test/generic_error_stepper.cpp
diff --git a/libs/numeric/odeint/test/generic_stepper.cpp b/test/generic_stepper.cpp
similarity index 100%
rename from libs/numeric/odeint/test/generic_stepper.cpp
rename to test/generic_stepper.cpp
diff --git a/libs/numeric/odeint/test/implicit_euler.cpp b/test/implicit_euler.cpp
similarity index 100%
rename from libs/numeric/odeint/test/implicit_euler.cpp
rename to test/implicit_euler.cpp
diff --git a/libs/numeric/odeint/test/integrate.cpp b/test/integrate.cpp
similarity index 100%
rename from libs/numeric/odeint/test/integrate.cpp
rename to test/integrate.cpp
diff --git a/libs/numeric/odeint/test/integrate_implicit.cpp b/test/integrate_implicit.cpp
similarity index 100%
rename from libs/numeric/odeint/test/integrate_implicit.cpp
rename to test/integrate_implicit.cpp
diff --git a/libs/numeric/odeint/test/integrate_stepper_refs.cpp b/test/integrate_stepper_refs.cpp
similarity index 100%
rename from libs/numeric/odeint/test/integrate_stepper_refs.cpp
rename to test/integrate_stepper_refs.cpp
diff --git a/libs/numeric/odeint/test/integrate_times.cpp b/test/integrate_times.cpp
similarity index 100%
rename from libs/numeric/odeint/test/integrate_times.cpp
rename to test/integrate_times.cpp
diff --git a/libs/numeric/odeint/test/integrators_symplectic.cpp b/test/integrators_symplectic.cpp
similarity index 100%
rename from libs/numeric/odeint/test/integrators_symplectic.cpp
rename to test/integrators_symplectic.cpp
diff --git a/libs/numeric/odeint/test/is_pair.cpp b/test/is_pair.cpp
similarity index 100%
rename from libs/numeric/odeint/test/is_pair.cpp
rename to test/is_pair.cpp
diff --git a/libs/numeric/odeint/test/is_resizeable.cpp b/test/is_resizeable.cpp
similarity index 100%
rename from libs/numeric/odeint/test/is_resizeable.cpp
rename to test/is_resizeable.cpp
diff --git a/libs/numeric/odeint/test/multi_array.cpp b/test/multi_array.cpp
similarity index 100%
rename from libs/numeric/odeint/test/multi_array.cpp
rename to test/multi_array.cpp
diff --git a/libs/numeric/odeint/test/n_step_iterator.cpp b/test/n_step_iterator.cpp
similarity index 100%
rename from libs/numeric/odeint/test/n_step_iterator.cpp
rename to test/n_step_iterator.cpp
diff --git a/libs/numeric/odeint/test/n_step_time_iterator.cpp b/test/n_step_time_iterator.cpp
similarity index 100%
rename from libs/numeric/odeint/test/n_step_time_iterator.cpp
rename to test/n_step_time_iterator.cpp
diff --git a/libs/numeric/odeint/test/numeric/Jamfile.v2 b/test/numeric/Jamfile.v2
similarity index 100%
rename from libs/numeric/odeint/test/numeric/Jamfile.v2
rename to test/numeric/Jamfile.v2
diff --git a/libs/numeric/odeint/test/numeric/adams_bashforth.cpp b/test/numeric/adams_bashforth.cpp
similarity index 100%
rename from libs/numeric/odeint/test/numeric/adams_bashforth.cpp
rename to test/numeric/adams_bashforth.cpp
diff --git a/libs/numeric/odeint/test/numeric/adams_bashforth_moulton.cpp b/test/numeric/adams_bashforth_moulton.cpp
similarity index 100%
rename from libs/numeric/odeint/test/numeric/adams_bashforth_moulton.cpp
rename to test/numeric/adams_bashforth_moulton.cpp
diff --git a/libs/numeric/odeint/test/numeric/rosenbrock.cpp b/test/numeric/rosenbrock.cpp
similarity index 100%
rename from libs/numeric/odeint/test/numeric/rosenbrock.cpp
rename to test/numeric/rosenbrock.cpp
diff --git a/libs/numeric/odeint/test/numeric/runge_kutta.cpp b/test/numeric/runge_kutta.cpp
similarity index 100%
rename from libs/numeric/odeint/test/numeric/runge_kutta.cpp
rename to test/numeric/runge_kutta.cpp
diff --git a/libs/numeric/odeint/test/numeric/symplectic.cpp b/test/numeric/symplectic.cpp
similarity index 100%
rename from libs/numeric/odeint/test/numeric/symplectic.cpp
rename to test/numeric/symplectic.cpp
diff --git a/libs/numeric/odeint/test/prepare_stepper_testing.hpp b/test/prepare_stepper_testing.hpp
similarity index 100%
rename from libs/numeric/odeint/test/prepare_stepper_testing.hpp
rename to test/prepare_stepper_testing.hpp
diff --git a/libs/numeric/odeint/test/range_algebra.cpp b/test/range_algebra.cpp
similarity index 100%
rename from libs/numeric/odeint/test/range_algebra.cpp
rename to test/range_algebra.cpp
diff --git a/libs/numeric/odeint/test/resize.cpp b/test/resize.cpp
similarity index 100%
rename from libs/numeric/odeint/test/resize.cpp
rename to test/resize.cpp
diff --git a/libs/numeric/odeint/test/resizing.cpp b/test/resizing.cpp
similarity index 100%
rename from libs/numeric/odeint/test/resizing.cpp
rename to test/resizing.cpp
diff --git a/libs/numeric/odeint/test/resizing_test_state_type.hpp b/test/resizing_test_state_type.hpp
similarity index 100%
rename from libs/numeric/odeint/test/resizing_test_state_type.hpp
rename to test/resizing_test_state_type.hpp
diff --git a/libs/numeric/odeint/test/rosenbrock4.cpp b/test/rosenbrock4.cpp
similarity index 100%
rename from libs/numeric/odeint/test/rosenbrock4.cpp
rename to test/rosenbrock4.cpp
diff --git a/libs/numeric/odeint/test/rosenbrock4_mp.cpp b/test/rosenbrock4_mp.cpp
similarity index 100%
rename from libs/numeric/odeint/test/rosenbrock4_mp.cpp
rename to test/rosenbrock4_mp.cpp
diff --git a/libs/numeric/odeint/test/runge_kutta_concepts.cpp b/test/runge_kutta_concepts.cpp
similarity index 100%
rename from libs/numeric/odeint/test/runge_kutta_concepts.cpp
rename to test/runge_kutta_concepts.cpp
diff --git a/libs/numeric/odeint/test/runge_kutta_controlled_concepts.cpp b/test/runge_kutta_controlled_concepts.cpp
similarity index 100%
rename from libs/numeric/odeint/test/runge_kutta_controlled_concepts.cpp
rename to test/runge_kutta_controlled_concepts.cpp
diff --git a/libs/numeric/odeint/test/runge_kutta_error_concepts.cpp b/test/runge_kutta_error_concepts.cpp
similarity index 100%
rename from libs/numeric/odeint/test/runge_kutta_error_concepts.cpp
rename to test/runge_kutta_error_concepts.cpp
diff --git a/libs/numeric/odeint/test/same_size.cpp b/test/same_size.cpp
similarity index 100%
rename from libs/numeric/odeint/test/same_size.cpp
rename to test/same_size.cpp
diff --git a/libs/numeric/odeint/test/split.cpp b/test/split.cpp
similarity index 100%
rename from libs/numeric/odeint/test/split.cpp
rename to test/split.cpp
diff --git a/libs/numeric/odeint/test/stepper_copying.cpp b/test/stepper_copying.cpp
similarity index 100%
rename from libs/numeric/odeint/test/stepper_copying.cpp
rename to test/stepper_copying.cpp
diff --git a/libs/numeric/odeint/test/stepper_with_ranges.cpp b/test/stepper_with_ranges.cpp
similarity index 100%
rename from libs/numeric/odeint/test/stepper_with_ranges.cpp
rename to test/stepper_with_ranges.cpp
diff --git a/libs/numeric/odeint/test/stepper_with_units.cpp b/test/stepper_with_units.cpp
similarity index 100%
rename from libs/numeric/odeint/test/stepper_with_units.cpp
rename to test/stepper_with_units.cpp
diff --git a/libs/numeric/odeint/test/symplectic_steppers.cpp b/test/symplectic_steppers.cpp
similarity index 100%
rename from libs/numeric/odeint/test/symplectic_steppers.cpp
rename to test/symplectic_steppers.cpp
diff --git a/libs/numeric/odeint/test/times_iterator.cpp b/test/times_iterator.cpp
similarity index 100%
rename from libs/numeric/odeint/test/times_iterator.cpp
rename to test/times_iterator.cpp
diff --git a/libs/numeric/odeint/test/times_time_iterator.cpp b/test/times_time_iterator.cpp
similarity index 100%
rename from libs/numeric/odeint/test/times_time_iterator.cpp
rename to test/times_time_iterator.cpp
diff --git a/libs/numeric/odeint/test/trivial_state.cpp b/test/trivial_state.cpp
similarity index 100%
rename from libs/numeric/odeint/test/trivial_state.cpp
rename to test/trivial_state.cpp
diff --git a/libs/numeric/odeint/test/unwrap_boost_reference.cpp b/test/unwrap_boost_reference.cpp
similarity index 100%
rename from libs/numeric/odeint/test/unwrap_boost_reference.cpp
rename to test/unwrap_boost_reference.cpp
diff --git a/libs/numeric/odeint/test/unwrap_reference.cpp b/test/unwrap_reference.cpp
similarity index 100%
rename from libs/numeric/odeint/test/unwrap_reference.cpp
rename to test/unwrap_reference.cpp
diff --git a/libs/numeric/odeint/test/velocity_verlet.cpp b/test/velocity_verlet.cpp
similarity index 100%
rename from libs/numeric/odeint/test/velocity_verlet.cpp
rename to test/velocity_verlet.cpp