diff --git a/tests/test_is_linear.py b/tests/analysis/test_is_linear.py
similarity index 100%
rename from tests/test_is_linear.py
rename to tests/analysis/test_is_linear.py
diff --git a/tests/test_topology_checks.py b/tests/analysis/test_topology_checks.py
similarity index 100%
rename from tests/test_topology_checks.py
rename to tests/analysis/test_topology_checks.py
diff --git a/tests/test_datatypes.py b/tests/core/test_datatypes.py
similarity index 100%
rename from tests/test_datatypes.py
rename to tests/core/test_datatypes.py
diff --git a/tests/test_modelwrapper.py b/tests/core/test_modelwrapper.py
similarity index 100%
rename from tests/test_modelwrapper.py
rename to tests/core/test_modelwrapper.py
diff --git a/tests/test_npy2hls.py b/tests/fpgadataflow/test_npy2hls.py
similarity index 100%
rename from tests/test_npy2hls.py
rename to tests/fpgadataflow/test_npy2hls.py
diff --git a/tests/test_batchnorm_to_affine.py b/tests/transformation/test_batchnorm_to_affine.py
similarity index 100%
rename from tests/test_batchnorm_to_affine.py
rename to tests/transformation/test_batchnorm_to_affine.py
diff --git a/tests/test_collapse_repeated_op.py b/tests/transformation/test_collapse_repeated_op.py
similarity index 100%
rename from tests/test_collapse_repeated_op.py
rename to tests/transformation/test_collapse_repeated_op.py
diff --git a/tests/test_factor_out_mul_sign_magnitude.py b/tests/transformation/test_factor_out_mul_sign_magnitude.py
similarity index 100%
rename from tests/test_factor_out_mul_sign_magnitude.py
rename to tests/transformation/test_factor_out_mul_sign_magnitude.py
diff --git a/tests/test_fold_constants.py b/tests/transformation/test_fold_constants.py
similarity index 100%
rename from tests/test_fold_constants.py
rename to tests/transformation/test_fold_constants.py
diff --git a/tests/test_general_transformation.py b/tests/transformation/test_general_transformation.py
similarity index 100%
rename from tests/test_general_transformation.py
rename to tests/transformation/test_general_transformation.py
diff --git a/tests/test_infer_datatypes.py b/tests/transformation/test_infer_datatypes.py
similarity index 100%
rename from tests/test_infer_datatypes.py
rename to tests/transformation/test_infer_datatypes.py
diff --git a/tests/test_infer_shapes.py b/tests/transformation/test_infer_shapes.py
similarity index 100%
rename from tests/test_infer_shapes.py
rename to tests/transformation/test_infer_shapes.py
diff --git a/tests/test_move_add_past_mul.py b/tests/transformation/test_move_add_past_mul.py
similarity index 100%
rename from tests/test_move_add_past_mul.py
rename to tests/transformation/test_move_add_past_mul.py
diff --git a/tests/test_move_scalar_past_matmul.py b/tests/transformation/test_move_scalar_past_matmul.py
similarity index 100%
rename from tests/test_move_scalar_past_matmul.py
rename to tests/transformation/test_move_scalar_past_matmul.py
diff --git a/tests/test_renaming.py b/tests/transformation/test_renaming.py
similarity index 100%
rename from tests/test_renaming.py
rename to tests/transformation/test_renaming.py
diff --git a/tests/test_round_thresholds.py b/tests/transformation/test_round_thresholds.py
similarity index 100%
rename from tests/test_round_thresholds.py
rename to tests/transformation/test_round_thresholds.py
diff --git a/tests/test_sign_to_thres.py b/tests/transformation/test_sign_to_thres.py
similarity index 100%
rename from tests/test_sign_to_thres.py
rename to tests/transformation/test_sign_to_thres.py
diff --git a/tests/test_streamline.py b/tests/transformation/test_streamline.py
similarity index 100%
rename from tests/test_streamline.py
rename to tests/transformation/test_streamline.py