diff --git a/packages/data/tests/data/archive/test_extensions.py b/packages/data/tests/archive/test_extensions.py
similarity index 100%
rename from packages/data/tests/data/archive/test_extensions.py
rename to packages/data/tests/archive/test_extensions.py
diff --git a/packages/data/tests/data/archive/test_zarr.py b/packages/data/tests/archive/test_zarr.py
similarity index 100%
rename from packages/data/tests/data/archive/test_zarr.py
rename to packages/data/tests/archive/test_zarr.py
diff --git a/packages/data/tests/data/derived/test_insolation.py b/packages/data/tests/derived/test_insolation.py
similarity index 100%
rename from packages/data/tests/data/derived/test_insolation.py
rename to packages/data/tests/derived/test_insolation.py
diff --git a/packages/data/tests/data/indexes/test_cacheIndex.py b/packages/data/tests/indexes/test_cacheIndex.py
similarity index 100%
rename from packages/data/tests/data/indexes/test_cacheIndex.py
rename to packages/data/tests/indexes/test_cacheIndex.py
diff --git a/packages/data/tests/data/indexes/test_decorators.py b/packages/data/tests/indexes/test_decorators.py
similarity index 100%
rename from packages/data/tests/data/indexes/test_decorators.py
rename to packages/data/tests/indexes/test_decorators.py
diff --git a/packages/data/tests/data/indexes/test_fake.py b/packages/data/tests/indexes/test_fake.py
similarity index 100%
rename from packages/data/tests/data/indexes/test_fake.py
rename to packages/data/tests/indexes/test_fake.py
diff --git a/packages/data/tests/data/indexes/test_indexes.py b/packages/data/tests/indexes/test_indexes.py
similarity index 100%
rename from packages/data/tests/data/indexes/test_indexes.py
rename to packages/data/tests/indexes/test_indexes.py
diff --git a/packages/data/tests/data/indexes/test_modifications.py b/packages/data/tests/indexes/test_modifications.py
similarity index 100%
rename from packages/data/tests/data/indexes/test_modifications.py
rename to packages/data/tests/indexes/test_modifications.py
diff --git a/packages/data/tests/data/indexes/utilities/mixins/test_index_repr.py b/packages/data/tests/indexes/utilities/mixins/test_index_repr.py
similarity index 100%
rename from packages/data/tests/data/indexes/utilities/mixins/test_index_repr.py
rename to packages/data/tests/indexes/utilities/mixins/test_index_repr.py
diff --git a/packages/data/tests/data/indexes/utilities/test_structure.py b/packages/data/tests/indexes/utilities/test_structure.py
similarity index 100%
rename from packages/data/tests/data/indexes/utilities/test_structure.py
rename to packages/data/tests/indexes/utilities/test_structure.py
diff --git a/packages/data/tests/data/operations/test_binning.py b/packages/data/tests/operations/test_binning.py
similarity index 100%
rename from packages/data/tests/data/operations/test_binning.py
rename to packages/data/tests/operations/test_binning.py
diff --git a/packages/data/tests/data/operations/test_interpolation.py b/packages/data/tests/operations/test_interpolation.py
similarity index 100%
rename from packages/data/tests/data/operations/test_interpolation.py
rename to packages/data/tests/operations/test_interpolation.py
diff --git a/packages/data/tests/data/operations/test_op_aggregation.py b/packages/data/tests/operations/test_op_aggregation.py
similarity index 100%
rename from packages/data/tests/data/operations/test_op_aggregation.py
rename to packages/data/tests/operations/test_op_aggregation.py
diff --git a/packages/data/tests/data/operations/test_op_utils.py b/packages/data/tests/operations/test_op_utils.py
similarity index 100%
rename from packages/data/tests/data/operations/test_op_utils.py
rename to packages/data/tests/operations/test_op_utils.py
diff --git a/packages/data/tests/data/operations/test_percentile.py b/packages/data/tests/operations/test_percentile.py
similarity index 100%
rename from packages/data/tests/data/operations/test_percentile.py
rename to packages/data/tests/operations/test_percentile.py
diff --git a/packages/data/tests/data/patterns/test_patterns_utils.py b/packages/data/tests/patterns/test_patterns_utils.py
similarity index 100%
rename from packages/data/tests/data/patterns/test_patterns_utils.py
rename to packages/data/tests/patterns/test_patterns_utils.py
diff --git a/packages/data/tests/data/save/test_dask_save.py b/packages/data/tests/save/test_dask_save.py
similarity index 100%
rename from packages/data/tests/data/save/test_dask_save.py
rename to packages/data/tests/save/test_dask_save.py
diff --git a/packages/data/tests/data/save/test_save_json.py b/packages/data/tests/save/test_save_json.py
similarity index 100%
rename from packages/data/tests/data/save/test_save_json.py
rename to packages/data/tests/save/test_save_json.py
diff --git a/packages/data/tests/data/test_catalog.py b/packages/data/tests/test_catalog.py
similarity index 100%
rename from packages/data/tests/data/test_catalog.py
rename to packages/data/tests/test_catalog.py
diff --git a/packages/data/tests/data/test_data_exceptions.py b/packages/data/tests/test_data_exceptions.py
similarity index 100%
rename from packages/data/tests/data/test_data_exceptions.py
rename to packages/data/tests/test_data_exceptions.py
diff --git a/packages/data/tests/data/test_data_utils.py b/packages/data/tests/test_data_utils.py
similarity index 100%
rename from packages/data/tests/data/test_data_utils.py
rename to packages/data/tests/test_data_utils.py
diff --git a/packages/data/tests/data/time/test_time.py b/packages/data/tests/time/test_time.py
similarity index 100%
rename from packages/data/tests/data/time/test_time.py
rename to packages/data/tests/time/test_time.py
diff --git a/packages/data/tests/data/transform/normalisation/test_default.py b/packages/data/tests/transform/normalisation/test_default.py
similarity index 100%
rename from packages/data/tests/data/transform/normalisation/test_default.py
rename to packages/data/tests/transform/normalisation/test_default.py
diff --git a/packages/data/tests/data/transform/normalisation/test_nutils.py b/packages/data/tests/transform/normalisation/test_nutils.py
similarity index 100%
rename from packages/data/tests/data/transform/normalisation/test_nutils.py
rename to packages/data/tests/transform/normalisation/test_nutils.py
diff --git a/packages/data/tests/data/transform/test_aggregation.py b/packages/data/tests/transform/test_aggregation.py
similarity index 100%
rename from packages/data/tests/data/transform/test_aggregation.py
rename to packages/data/tests/transform/test_aggregation.py
diff --git a/packages/data/tests/data/transform/test_coordinates.py b/packages/data/tests/transform/test_coordinates.py
similarity index 100%
rename from packages/data/tests/data/transform/test_coordinates.py
rename to packages/data/tests/transform/test_coordinates.py
diff --git a/packages/data/tests/data/transform/test_derive.py b/packages/data/tests/transform/test_derive.py
similarity index 100%
rename from packages/data/tests/data/transform/test_derive.py
rename to packages/data/tests/transform/test_derive.py
diff --git a/packages/data/tests/data/transform/test_mask.py b/packages/data/tests/transform/test_mask.py
similarity index 100%
rename from packages/data/tests/data/transform/test_mask.py
rename to packages/data/tests/transform/test_mask.py
diff --git a/packages/data/tests/data/transform/test_optimisation.py b/packages/data/tests/transform/test_optimisation.py
similarity index 100%
rename from packages/data/tests/data/transform/test_optimisation.py
rename to packages/data/tests/transform/test_optimisation.py
diff --git a/packages/data/tests/data/transform/test_tf_default.py b/packages/data/tests/transform/test_tf_default.py
similarity index 100%
rename from packages/data/tests/data/transform/test_tf_default.py
rename to packages/data/tests/transform/test_tf_default.py
diff --git a/packages/data/tests/data/transform/test_tf_utils.py b/packages/data/tests/transform/test_tf_utils.py
similarity index 100%
rename from packages/data/tests/data/transform/test_tf_utils.py
rename to packages/data/tests/transform/test_tf_utils.py
diff --git a/packages/data/tests/data/utils/fakedata.py b/packages/data/tests/utils/fakedata.py
similarity index 100%
rename from packages/data/tests/data/utils/fakedata.py
rename to packages/data/tests/utils/fakedata.py
diff --git a/packages/training/tests/training/test_exists.py b/packages/training/tests/test_exists.py
similarity index 100%
rename from packages/training/tests/training/test_exists.py
rename to packages/training/tests/test_exists.py
diff --git a/packages/training/tests/training/test_variable.py b/packages/training/tests/test_variable.py
similarity index 100%
rename from packages/training/tests/training/test_variable.py
rename to packages/training/tests/test_variable.py
diff --git a/packages/utils/tests/pyearthtools/utils/data/tesselator/test_reorder.py b/packages/utils/tests/data/tesselator/test_reorder.py
similarity index 100%
rename from packages/utils/tests/pyearthtools/utils/data/tesselator/test_reorder.py
rename to packages/utils/tests/data/tesselator/test_reorder.py
diff --git a/packages/utils/tests/pyearthtools/utils/data/tesselator/test_subset.py b/packages/utils/tests/data/tesselator/test_subset.py
similarity index 100%
rename from packages/utils/tests/pyearthtools/utils/data/tesselator/test_subset.py
rename to packages/utils/tests/data/tesselator/test_subset.py
diff --git a/packages/utils/tests/pyearthtools/utils/data/tesselator/test_tesselator.py b/packages/utils/tests/data/tesselator/test_tesselator.py
similarity index 100%
rename from packages/utils/tests/pyearthtools/utils/data/tesselator/test_tesselator.py
rename to packages/utils/tests/data/tesselator/test_tesselator.py
diff --git a/packages/utils/tests/pyearthtools/utils/data/test_converter.py b/packages/utils/tests/data/test_converter.py
similarity index 100%
rename from packages/utils/tests/pyearthtools/utils/data/test_converter.py
rename to packages/utils/tests/data/test_converter.py
diff --git a/packages/utils/tests/pyearthtools/utils/initialisation/test_init_parsing.py b/packages/utils/tests/initialisation/test_init_parsing.py
similarity index 100%
rename from packages/utils/tests/pyearthtools/utils/initialisation/test_init_parsing.py
rename to packages/utils/tests/initialisation/test_init_parsing.py
diff --git a/packages/utils/tests/pyearthtools/utils/parsing/test_names.py b/packages/utils/tests/parsing/test_names.py
similarity index 100%
rename from packages/utils/tests/pyearthtools/utils/parsing/test_names.py
rename to packages/utils/tests/parsing/test_names.py
diff --git a/packages/utils/tests/pyearthtools/utils/repr_utils/test_standard.py b/packages/utils/tests/repr_utils/test_standard.py
similarity index 100%
rename from packages/utils/tests/pyearthtools/utils/repr_utils/test_standard.py
rename to packages/utils/tests/repr_utils/test_standard.py