diff --git a/testsuite/test_cmake/BashUnitTests.sh b/testsuite/cmake/BashUnitTests.sh similarity index 100% rename from testsuite/test_cmake/BashUnitTests.sh rename to testsuite/cmake/BashUnitTests.sh diff --git a/testsuite/test_cmake/test_cmake.sh b/testsuite/cmake/test_cmake.sh similarity index 100% rename from testsuite/test_cmake/test_cmake.sh rename to testsuite/cmake/test_cmake.sh diff --git a/testsuite/CMakeLists.txt b/testsuite/python/CMakeLists.txt similarity index 100% rename from testsuite/CMakeLists.txt rename to testsuite/python/CMakeLists.txt diff --git a/testsuite/accumulator.py b/testsuite/python/accumulator.py similarity index 100% rename from testsuite/accumulator.py rename to testsuite/python/accumulator.py diff --git a/testsuite/actor.py b/testsuite/python/actor.py similarity index 100% rename from testsuite/actor.py rename to testsuite/python/actor.py diff --git a/testsuite/analyze_chains.py b/testsuite/python/analyze_chains.py similarity index 100% rename from testsuite/analyze_chains.py rename to testsuite/python/analyze_chains.py diff --git a/testsuite/analyze_distance.py b/testsuite/python/analyze_distance.py similarity index 100% rename from testsuite/analyze_distance.py rename to testsuite/python/analyze_distance.py diff --git a/testsuite/analyze_distribution.py b/testsuite/python/analyze_distribution.py similarity index 100% rename from testsuite/analyze_distribution.py rename to testsuite/python/analyze_distribution.py diff --git a/testsuite/analyze_energy.py b/testsuite/python/analyze_energy.py similarity index 100% rename from testsuite/analyze_energy.py rename to testsuite/python/analyze_energy.py diff --git a/testsuite/analyze_gyration_tensor.py b/testsuite/python/analyze_gyration_tensor.py similarity index 100% rename from testsuite/analyze_gyration_tensor.py rename to testsuite/python/analyze_gyration_tensor.py diff --git a/testsuite/analyze_itensor.py b/testsuite/python/analyze_itensor.py similarity index 100% rename from testsuite/analyze_itensor.py rename to testsuite/python/analyze_itensor.py diff --git a/testsuite/array_properties.py b/testsuite/python/array_properties.py similarity index 100% rename from testsuite/array_properties.py rename to testsuite/python/array_properties.py diff --git a/testsuite/auto_exclusions.py b/testsuite/python/auto_exclusions.py similarity index 100% rename from testsuite/auto_exclusions.py rename to testsuite/python/auto_exclusions.py diff --git a/testsuite/cellsystem.py b/testsuite/python/cellsystem.py similarity index 100% rename from testsuite/cellsystem.py rename to testsuite/python/cellsystem.py diff --git a/testsuite/cluster_analysis.py b/testsuite/python/cluster_analysis.py similarity index 100% rename from testsuite/cluster_analysis.py rename to testsuite/python/cluster_analysis.py diff --git a/testsuite/collision_detection.py b/testsuite/python/collision_detection.py similarity index 100% rename from testsuite/collision_detection.py rename to testsuite/python/collision_detection.py diff --git a/testsuite/comfixed.py b/testsuite/python/comfixed.py similarity index 100% rename from testsuite/comfixed.py rename to testsuite/python/comfixed.py diff --git a/testsuite/constant_pH.py b/testsuite/python/constant_pH.py similarity index 100% rename from testsuite/constant_pH.py rename to testsuite/python/constant_pH.py diff --git a/testsuite/constraint_homogeneous_magnetic_field.py b/testsuite/python/constraint_homogeneous_magnetic_field.py similarity index 100% rename from testsuite/constraint_homogeneous_magnetic_field.py rename to testsuite/python/constraint_homogeneous_magnetic_field.py diff --git a/testsuite/constraint_shape_based.py b/testsuite/python/constraint_shape_based.py similarity index 100% rename from testsuite/constraint_shape_based.py rename to testsuite/python/constraint_shape_based.py diff --git a/testsuite/correlation.py b/testsuite/python/correlation.py similarity index 100% rename from testsuite/correlation.py rename to testsuite/python/correlation.py diff --git a/testsuite/coulomb_cloud_wall.py b/testsuite/python/coulomb_cloud_wall.py similarity index 100% rename from testsuite/coulomb_cloud_wall.py rename to testsuite/python/coulomb_cloud_wall.py diff --git a/testsuite/coulomb_cloud_wall_duplicated.py b/testsuite/python/coulomb_cloud_wall_duplicated.py similarity index 100% rename from testsuite/coulomb_cloud_wall_duplicated.py rename to testsuite/python/coulomb_cloud_wall_duplicated.py diff --git a/testsuite/coulomb_mixed_periodicity.py b/testsuite/python/coulomb_mixed_periodicity.py similarity index 100% rename from testsuite/coulomb_mixed_periodicity.py rename to testsuite/python/coulomb_mixed_periodicity.py diff --git a/testsuite/coulomb_tuning.py b/testsuite/python/coulomb_tuning.py similarity index 100% rename from testsuite/coulomb_tuning.py rename to testsuite/python/coulomb_tuning.py diff --git a/testsuite/data/coulomb_cloud_wall_duplicated_system.data b/testsuite/python/data/coulomb_cloud_wall_duplicated_system.data similarity index 100% rename from testsuite/data/coulomb_cloud_wall_duplicated_system.data rename to testsuite/python/data/coulomb_cloud_wall_duplicated_system.data diff --git a/testsuite/data/coulomb_cloud_wall_system.data b/testsuite/python/data/coulomb_cloud_wall_system.data similarity index 100% rename from testsuite/data/coulomb_cloud_wall_system.data rename to testsuite/python/data/coulomb_cloud_wall_system.data diff --git a/testsuite/data/coulomb_mixed_periodicity_system.data b/testsuite/python/data/coulomb_mixed_periodicity_system.data similarity index 100% rename from testsuite/data/coulomb_mixed_periodicity_system.data rename to testsuite/python/data/coulomb_mixed_periodicity_system.data diff --git a/testsuite/data/coulomb_tuning_system.npz b/testsuite/python/data/coulomb_tuning_system.npz similarity index 100% rename from testsuite/data/coulomb_tuning_system.npz rename to testsuite/python/data/coulomb_tuning_system.npz diff --git a/testsuite/data/engine_lb.vtk b/testsuite/python/data/engine_lb.vtk similarity index 100% rename from testsuite/data/engine_lb.vtk rename to testsuite/python/data/engine_lb.vtk diff --git a/testsuite/data/engine_lbgpu_2pt.vtk b/testsuite/python/data/engine_lbgpu_2pt.vtk similarity index 100% rename from testsuite/data/engine_lbgpu_2pt.vtk rename to testsuite/python/data/engine_lbgpu_2pt.vtk diff --git a/testsuite/data/engine_lbgpu_3pt.vtk b/testsuite/python/data/engine_lbgpu_3pt.vtk similarity index 100% rename from testsuite/data/engine_lbgpu_3pt.vtk rename to testsuite/python/data/engine_lbgpu_3pt.vtk diff --git a/testsuite/data/gen_coulomb_2d_ref_data.py b/testsuite/python/data/gen_coulomb_2d_ref_data.py similarity index 100% rename from testsuite/data/gen_coulomb_2d_ref_data.py rename to testsuite/python/data/gen_coulomb_2d_ref_data.py diff --git a/testsuite/data/lj_system.dat b/testsuite/python/data/lj_system.dat similarity index 100% rename from testsuite/data/lj_system.dat rename to testsuite/python/data/lj_system.dat diff --git a/testsuite/data/mdlc_reference_data.dat b/testsuite/python/data/mdlc_reference_data.dat similarity index 100% rename from testsuite/data/mdlc_reference_data.dat rename to testsuite/python/data/mdlc_reference_data.dat diff --git a/testsuite/data/mdlc_reference_data_energy.dat b/testsuite/python/data/mdlc_reference_data_energy.dat similarity index 100% rename from testsuite/data/mdlc_reference_data_energy.dat rename to testsuite/python/data/mdlc_reference_data_energy.dat diff --git a/testsuite/data/mdlc_reference_data_forces_torques.dat b/testsuite/python/data/mdlc_reference_data_forces_torques.dat similarity index 100% rename from testsuite/data/mdlc_reference_data_forces_torques.dat rename to testsuite/python/data/mdlc_reference_data_forces_torques.dat diff --git a/testsuite/data/npt_lj_system.data b/testsuite/python/data/npt_lj_system.data similarity index 100% rename from testsuite/data/npt_lj_system.data rename to testsuite/python/data/npt_lj_system.data diff --git a/testsuite/data/p3m_magnetostatics_expected.data b/testsuite/python/data/p3m_magnetostatics_expected.data similarity index 100% rename from testsuite/data/p3m_magnetostatics_expected.data rename to testsuite/python/data/p3m_magnetostatics_expected.data diff --git a/testsuite/data/p3m_magnetostatics_system.data b/testsuite/python/data/p3m_magnetostatics_system.data similarity index 100% rename from testsuite/data/p3m_magnetostatics_system.data rename to testsuite/python/data/p3m_magnetostatics_system.data diff --git a/testsuite/data/scafacos_dipoles_1d_reference_data_energy.dat b/testsuite/python/data/scafacos_dipoles_1d_reference_data_energy.dat similarity index 100% rename from testsuite/data/scafacos_dipoles_1d_reference_data_energy.dat rename to testsuite/python/data/scafacos_dipoles_1d_reference_data_energy.dat diff --git a/testsuite/data/scafacos_dipoles_1d_reference_data_forces_torques.dat b/testsuite/python/data/scafacos_dipoles_1d_reference_data_forces_torques.dat similarity index 100% rename from testsuite/data/scafacos_dipoles_1d_reference_data_forces_torques.dat rename to testsuite/python/data/scafacos_dipoles_1d_reference_data_forces_torques.dat diff --git a/testsuite/data/sphere393nodes.dat b/testsuite/python/data/sphere393nodes.dat similarity index 100% rename from testsuite/data/sphere393nodes.dat rename to testsuite/python/data/sphere393nodes.dat diff --git a/testsuite/data/sphere393triangles.dat b/testsuite/python/data/sphere393triangles.dat similarity index 100% rename from testsuite/data/sphere393triangles.dat rename to testsuite/python/data/sphere393triangles.dat diff --git a/testsuite/dawaanr-and-bh-gpu.py b/testsuite/python/dawaanr-and-bh-gpu.py similarity index 100% rename from testsuite/dawaanr-and-bh-gpu.py rename to testsuite/python/dawaanr-and-bh-gpu.py diff --git a/testsuite/dawaanr-and-dds-gpu.py b/testsuite/python/dawaanr-and-dds-gpu.py similarity index 100% rename from testsuite/dawaanr-and-dds-gpu.py rename to testsuite/python/dawaanr-and-dds-gpu.py diff --git a/testsuite/dds-and-bh-gpu-perf.py b/testsuite/python/dds-and-bh-gpu-perf.py similarity index 100% rename from testsuite/dds-and-bh-gpu-perf.py rename to testsuite/python/dds-and-bh-gpu-perf.py diff --git a/testsuite/dipolar_mdlc_p3m_scafacos_p2nfft.py b/testsuite/python/dipolar_mdlc_p3m_scafacos_p2nfft.py similarity index 100% rename from testsuite/dipolar_mdlc_p3m_scafacos_p2nfft.py rename to testsuite/python/dipolar_mdlc_p3m_scafacos_p2nfft.py diff --git a/testsuite/domain_decomposition.py b/testsuite/python/domain_decomposition.py similarity index 100% rename from testsuite/domain_decomposition.py rename to testsuite/python/domain_decomposition.py diff --git a/testsuite/dpd.py b/testsuite/python/dpd.py similarity index 100% rename from testsuite/dpd.py rename to testsuite/python/dpd.py diff --git a/testsuite/drude.py b/testsuite/python/drude.py similarity index 100% rename from testsuite/drude.py rename to testsuite/python/drude.py diff --git a/testsuite/ek_common.py b/testsuite/python/ek_common.py similarity index 100% rename from testsuite/ek_common.py rename to testsuite/python/ek_common.py diff --git a/testsuite/ek_eof_one_species_base.py b/testsuite/python/ek_eof_one_species_base.py similarity index 100% rename from testsuite/ek_eof_one_species_base.py rename to testsuite/python/ek_eof_one_species_base.py diff --git a/testsuite/ek_eof_one_species_x.py b/testsuite/python/ek_eof_one_species_x.py similarity index 100% rename from testsuite/ek_eof_one_species_x.py rename to testsuite/python/ek_eof_one_species_x.py diff --git a/testsuite/ek_eof_one_species_x_nonlinear.py b/testsuite/python/ek_eof_one_species_x_nonlinear.py similarity index 100% rename from testsuite/ek_eof_one_species_x_nonlinear.py rename to testsuite/python/ek_eof_one_species_x_nonlinear.py diff --git a/testsuite/ek_eof_one_species_y.py b/testsuite/python/ek_eof_one_species_y.py similarity index 100% rename from testsuite/ek_eof_one_species_y.py rename to testsuite/python/ek_eof_one_species_y.py diff --git a/testsuite/ek_eof_one_species_y_nonlinear.py b/testsuite/python/ek_eof_one_species_y_nonlinear.py similarity index 100% rename from testsuite/ek_eof_one_species_y_nonlinear.py rename to testsuite/python/ek_eof_one_species_y_nonlinear.py diff --git a/testsuite/ek_eof_one_species_z.py b/testsuite/python/ek_eof_one_species_z.py similarity index 100% rename from testsuite/ek_eof_one_species_z.py rename to testsuite/python/ek_eof_one_species_z.py diff --git a/testsuite/ek_eof_one_species_z_nonlinear.py b/testsuite/python/ek_eof_one_species_z_nonlinear.py similarity index 100% rename from testsuite/ek_eof_one_species_z_nonlinear.py rename to testsuite/python/ek_eof_one_species_z_nonlinear.py diff --git a/testsuite/elc_vs_mmm2d_neutral.py b/testsuite/python/elc_vs_mmm2d_neutral.py similarity index 100% rename from testsuite/elc_vs_mmm2d_neutral.py rename to testsuite/python/elc_vs_mmm2d_neutral.py diff --git a/testsuite/elc_vs_mmm2d_nonneutral.py b/testsuite/python/elc_vs_mmm2d_nonneutral.py similarity index 100% rename from testsuite/elc_vs_mmm2d_nonneutral.py rename to testsuite/python/elc_vs_mmm2d_nonneutral.py diff --git a/testsuite/electrostaticInteractions.py b/testsuite/python/electrostaticInteractions.py similarity index 100% rename from testsuite/electrostaticInteractions.py rename to testsuite/python/electrostaticInteractions.py diff --git a/testsuite/engine_langevin.py b/testsuite/python/engine_langevin.py similarity index 100% rename from testsuite/engine_langevin.py rename to testsuite/python/engine_langevin.py diff --git a/testsuite/engine_lb.py b/testsuite/python/engine_lb.py similarity index 100% rename from testsuite/engine_lb.py rename to testsuite/python/engine_lb.py diff --git a/testsuite/engine_lbgpu.py b/testsuite/python/engine_lbgpu.py similarity index 100% rename from testsuite/engine_lbgpu.py rename to testsuite/python/engine_lbgpu.py diff --git a/testsuite/exclusions.py b/testsuite/python/exclusions.py similarity index 100% rename from testsuite/exclusions.py rename to testsuite/python/exclusions.py diff --git a/testsuite/field_test.py b/testsuite/python/field_test.py similarity index 100% rename from testsuite/field_test.py rename to testsuite/python/field_test.py diff --git a/testsuite/force_cap.py b/testsuite/python/force_cap.py similarity index 100% rename from testsuite/force_cap.py rename to testsuite/python/force_cap.py diff --git a/testsuite/h5md.py b/testsuite/python/h5md.py similarity index 100% rename from testsuite/h5md.py rename to testsuite/python/h5md.py diff --git a/testsuite/hat.py b/testsuite/python/hat.py similarity index 100% rename from testsuite/hat.py rename to testsuite/python/hat.py diff --git a/testsuite/icc.py b/testsuite/python/icc.py similarity index 100% rename from testsuite/icc.py rename to testsuite/python/icc.py diff --git a/testsuite/interactions_bond_angle.py b/testsuite/python/interactions_bond_angle.py similarity index 100% rename from testsuite/interactions_bond_angle.py rename to testsuite/python/interactions_bond_angle.py diff --git a/testsuite/interactions_bonded.py b/testsuite/python/interactions_bonded.py similarity index 100% rename from testsuite/interactions_bonded.py rename to testsuite/python/interactions_bonded.py diff --git a/testsuite/interactions_bonded_interface.py b/testsuite/python/interactions_bonded_interface.py similarity index 100% rename from testsuite/interactions_bonded_interface.py rename to testsuite/python/interactions_bonded_interface.py diff --git a/testsuite/interactions_dihedral.py b/testsuite/python/interactions_dihedral.py similarity index 100% rename from testsuite/interactions_dihedral.py rename to testsuite/python/interactions_dihedral.py diff --git a/testsuite/interactions_non-bonded.py b/testsuite/python/interactions_non-bonded.py similarity index 100% rename from testsuite/interactions_non-bonded.py rename to testsuite/python/interactions_non-bonded.py diff --git a/testsuite/interactions_non-bonded_interface.py b/testsuite/python/interactions_non-bonded_interface.py similarity index 100% rename from testsuite/interactions_non-bonded_interface.py rename to testsuite/python/interactions_non-bonded_interface.py diff --git a/testsuite/langevin_thermostat.py b/testsuite/python/langevin_thermostat.py similarity index 100% rename from testsuite/langevin_thermostat.py rename to testsuite/python/langevin_thermostat.py diff --git a/testsuite/layered.py b/testsuite/python/layered.py similarity index 100% rename from testsuite/layered.py rename to testsuite/python/layered.py diff --git a/testsuite/lb.py b/testsuite/python/lb.py similarity index 100% rename from testsuite/lb.py rename to testsuite/python/lb.py diff --git a/testsuite/lb_boundary.py b/testsuite/python/lb_boundary.py similarity index 100% rename from testsuite/lb_boundary.py rename to testsuite/python/lb_boundary.py diff --git a/testsuite/lb_boundary_velocity.py b/testsuite/python/lb_boundary_velocity.py similarity index 100% rename from testsuite/lb_boundary_velocity.py rename to testsuite/python/lb_boundary_velocity.py diff --git a/testsuite/lb_electrohydrodynamics.py b/testsuite/python/lb_electrohydrodynamics.py similarity index 100% rename from testsuite/lb_electrohydrodynamics.py rename to testsuite/python/lb_electrohydrodynamics.py diff --git a/testsuite/lb_get_u_at_pos.py b/testsuite/python/lb_get_u_at_pos.py similarity index 100% rename from testsuite/lb_get_u_at_pos.py rename to testsuite/python/lb_get_u_at_pos.py diff --git a/testsuite/lb_gpu_viscous.py b/testsuite/python/lb_gpu_viscous.py similarity index 100% rename from testsuite/lb_gpu_viscous.py rename to testsuite/python/lb_gpu_viscous.py diff --git a/testsuite/lb_interpolation.py b/testsuite/python/lb_interpolation.py similarity index 100% rename from testsuite/lb_interpolation.py rename to testsuite/python/lb_interpolation.py diff --git a/testsuite/lb_poiseuille.py b/testsuite/python/lb_poiseuille.py similarity index 100% rename from testsuite/lb_poiseuille.py rename to testsuite/python/lb_poiseuille.py diff --git a/testsuite/lb_stokes_sphere_gpu.py b/testsuite/python/lb_stokes_sphere_gpu.py similarity index 100% rename from testsuite/lb_stokes_sphere_gpu.py rename to testsuite/python/lb_stokes_sphere_gpu.py diff --git a/testsuite/lb_streaming.py b/testsuite/python/lb_streaming.py similarity index 100% rename from testsuite/lb_streaming.py rename to testsuite/python/lb_streaming.py diff --git a/testsuite/lb_switch.py b/testsuite/python/lb_switch.py similarity index 100% rename from testsuite/lb_switch.py rename to testsuite/python/lb_switch.py diff --git a/testsuite/lb_thermo_virtual.py b/testsuite/python/lb_thermo_virtual.py similarity index 100% rename from testsuite/lb_thermo_virtual.py rename to testsuite/python/lb_thermo_virtual.py diff --git a/testsuite/lbgpu_remove_total_momentum.py b/testsuite/python/lbgpu_remove_total_momentum.py similarity index 100% rename from testsuite/lbgpu_remove_total_momentum.py rename to testsuite/python/lbgpu_remove_total_momentum.py diff --git a/testsuite/lj.py b/testsuite/python/lj.py similarity index 100% rename from testsuite/lj.py rename to testsuite/python/lj.py diff --git a/testsuite/magnetostaticInteractions.py b/testsuite/python/magnetostaticInteractions.py similarity index 100% rename from testsuite/magnetostaticInteractions.py rename to testsuite/python/magnetostaticInteractions.py diff --git a/testsuite/mass-and-rinertia_per_particle.py b/testsuite/python/mass-and-rinertia_per_particle.py similarity index 100% rename from testsuite/mass-and-rinertia_per_particle.py rename to testsuite/python/mass-and-rinertia_per_particle.py diff --git a/testsuite/minimize_energy.py b/testsuite/python/minimize_energy.py similarity index 100% rename from testsuite/minimize_energy.py rename to testsuite/python/minimize_energy.py diff --git a/testsuite/mmm1d.py b/testsuite/python/mmm1d.py similarity index 100% rename from testsuite/mmm1d.py rename to testsuite/python/mmm1d.py diff --git a/testsuite/npt.py b/testsuite/python/npt.py similarity index 100% rename from testsuite/npt.py rename to testsuite/python/npt.py diff --git a/testsuite/nsquare.py b/testsuite/python/nsquare.py similarity index 100% rename from testsuite/nsquare.py rename to testsuite/python/nsquare.py diff --git a/testsuite/observable_cylindrical.py b/testsuite/python/observable_cylindrical.py similarity index 100% rename from testsuite/observable_cylindrical.py rename to testsuite/python/observable_cylindrical.py diff --git a/testsuite/observable_cylindricalLB.py b/testsuite/python/observable_cylindricalLB.py similarity index 100% rename from testsuite/observable_cylindricalLB.py rename to testsuite/python/observable_cylindricalLB.py diff --git a/testsuite/observable_profile.py b/testsuite/python/observable_profile.py similarity index 100% rename from testsuite/observable_profile.py rename to testsuite/python/observable_profile.py diff --git a/testsuite/observable_profileLB.py b/testsuite/python/observable_profileLB.py similarity index 100% rename from testsuite/observable_profileLB.py rename to testsuite/python/observable_profileLB.py diff --git a/testsuite/observables.py b/testsuite/python/observables.py similarity index 100% rename from testsuite/observables.py rename to testsuite/python/observables.py diff --git a/testsuite/oif_volume_conservation.py b/testsuite/python/oif_volume_conservation.py similarity index 100% rename from testsuite/oif_volume_conservation.py rename to testsuite/python/oif_volume_conservation.py diff --git a/testsuite/p3m_gpu.py b/testsuite/python/p3m_gpu.py similarity index 100% rename from testsuite/p3m_gpu.py rename to testsuite/python/p3m_gpu.py diff --git a/testsuite/pair_criteria.py b/testsuite/python/pair_criteria.py similarity index 100% rename from testsuite/pair_criteria.py rename to testsuite/python/pair_criteria.py diff --git a/testsuite/pairs.py b/testsuite/python/pairs.py similarity index 100% rename from testsuite/pairs.py rename to testsuite/python/pairs.py diff --git a/testsuite/particle.py b/testsuite/python/particle.py similarity index 100% rename from testsuite/particle.py rename to testsuite/python/particle.py diff --git a/testsuite/particle_slice.py b/testsuite/python/particle_slice.py similarity index 100% rename from testsuite/particle_slice.py rename to testsuite/python/particle_slice.py diff --git a/testsuite/polymer.py b/testsuite/python/polymer.py similarity index 100% rename from testsuite/polymer.py rename to testsuite/python/polymer.py diff --git a/testsuite/random_pairs.py b/testsuite/python/random_pairs.py similarity index 100% rename from testsuite/random_pairs.py rename to testsuite/python/random_pairs.py diff --git a/testsuite/rdf.py b/testsuite/python/rdf.py similarity index 100% rename from testsuite/rdf.py rename to testsuite/python/rdf.py diff --git a/testsuite/reaction_ensemble.py b/testsuite/python/reaction_ensemble.py similarity index 100% rename from testsuite/reaction_ensemble.py rename to testsuite/python/reaction_ensemble.py diff --git a/testsuite/rescale.py b/testsuite/python/rescale.py similarity index 100% rename from testsuite/rescale.py rename to testsuite/python/rescale.py diff --git a/testsuite/rigid_bond.py b/testsuite/python/rigid_bond.py similarity index 100% rename from testsuite/rigid_bond.py rename to testsuite/python/rigid_bond.py diff --git a/testsuite/rotate_system.py b/testsuite/python/rotate_system.py similarity index 100% rename from testsuite/rotate_system.py rename to testsuite/python/rotate_system.py diff --git a/testsuite/rotation_per_particle.py b/testsuite/python/rotation_per_particle.py similarity index 100% rename from testsuite/rotation_per_particle.py rename to testsuite/python/rotation_per_particle.py diff --git a/testsuite/rotational_inertia.py b/testsuite/python/rotational_inertia.py similarity index 100% rename from testsuite/rotational_inertia.py rename to testsuite/python/rotational_inertia.py diff --git a/testsuite/save_checkpoint.py b/testsuite/python/save_checkpoint.py similarity index 100% rename from testsuite/save_checkpoint.py rename to testsuite/python/save_checkpoint.py diff --git a/testsuite/scafacos_dipoles_1d_2d.py b/testsuite/python/scafacos_dipoles_1d_2d.py similarity index 100% rename from testsuite/scafacos_dipoles_1d_2d.py rename to testsuite/python/scafacos_dipoles_1d_2d.py diff --git a/testsuite/script_interface_object_params.py b/testsuite/python/script_interface_object_params.py similarity index 100% rename from testsuite/script_interface_object_params.py rename to testsuite/python/script_interface_object_params.py diff --git a/testsuite/simple_pore.py b/testsuite/python/simple_pore.py similarity index 100% rename from testsuite/simple_pore.py rename to testsuite/python/simple_pore.py diff --git a/testsuite/stress.py b/testsuite/python/stress.py similarity index 100% rename from testsuite/stress.py rename to testsuite/python/stress.py diff --git a/testsuite/subt_lj.py b/testsuite/python/subt_lj.py similarity index 100% rename from testsuite/subt_lj.py rename to testsuite/python/subt_lj.py diff --git a/testsuite/swimmer_reaction.py b/testsuite/python/swimmer_reaction.py similarity index 100% rename from testsuite/swimmer_reaction.py rename to testsuite/python/swimmer_reaction.py diff --git a/testsuite/tabulated.py b/testsuite/python/tabulated.py similarity index 100% rename from testsuite/tabulated.py rename to testsuite/python/tabulated.py diff --git a/testsuite/test_checkpoint.py b/testsuite/python/test_checkpoint.py similarity index 100% rename from testsuite/test_checkpoint.py rename to testsuite/python/test_checkpoint.py diff --git a/testsuite/tests_common.py b/testsuite/python/tests_common.py similarity index 100% rename from testsuite/tests_common.py rename to testsuite/python/tests_common.py diff --git a/testsuite/thermalized_bond.py b/testsuite/python/thermalized_bond.py similarity index 100% rename from testsuite/thermalized_bond.py rename to testsuite/python/thermalized_bond.py diff --git a/testsuite/thole.py b/testsuite/python/thole.py similarity index 100% rename from testsuite/thole.py rename to testsuite/python/thole.py diff --git a/testsuite/unravel_index.py b/testsuite/python/unravel_index.py similarity index 100% rename from testsuite/unravel_index.py rename to testsuite/python/unravel_index.py diff --git a/testsuite/variant_conversion.py b/testsuite/python/variant_conversion.py similarity index 100% rename from testsuite/variant_conversion.py rename to testsuite/python/variant_conversion.py diff --git a/testsuite/virtual_sites_relative.py b/testsuite/python/virtual_sites_relative.py similarity index 100% rename from testsuite/virtual_sites_relative.py rename to testsuite/python/virtual_sites_relative.py diff --git a/testsuite/virtual_sites_tracers.py b/testsuite/python/virtual_sites_tracers.py similarity index 100% rename from testsuite/virtual_sites_tracers.py rename to testsuite/python/virtual_sites_tracers.py diff --git a/testsuite/virtual_sites_tracers_common.py b/testsuite/python/virtual_sites_tracers_common.py similarity index 100% rename from testsuite/virtual_sites_tracers_common.py rename to testsuite/python/virtual_sites_tracers_common.py diff --git a/testsuite/virtual_sites_tracers_const_force.py b/testsuite/python/virtual_sites_tracers_const_force.py similarity index 100% rename from testsuite/virtual_sites_tracers_const_force.py rename to testsuite/python/virtual_sites_tracers_const_force.py diff --git a/testsuite/virtual_sites_tracers_gpu.py b/testsuite/python/virtual_sites_tracers_gpu.py similarity index 100% rename from testsuite/virtual_sites_tracers_gpu.py rename to testsuite/python/virtual_sites_tracers_gpu.py diff --git a/testsuite/wang_landau_reaction_ensemble.py b/testsuite/python/wang_landau_reaction_ensemble.py similarity index 100% rename from testsuite/wang_landau_reaction_ensemble.py rename to testsuite/python/wang_landau_reaction_ensemble.py diff --git a/testsuite/writevtf.py b/testsuite/python/writevtf.py similarity index 100% rename from testsuite/writevtf.py rename to testsuite/python/writevtf.py