diff --git a/hsfs/python/tests/client/test_base_client.py b/python/tests/client/test_base_client.py
similarity index 100%
rename from hsfs/python/tests/client/test_base_client.py
rename to python/tests/client/test_base_client.py
diff --git a/hsfs/python/tests/constructor/test_external_feature_group_alias.py b/python/tests/constructor/test_external_feature_group_alias.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_external_feature_group_alias.py
rename to python/tests/constructor/test_external_feature_group_alias.py
diff --git a/hsfs/python/tests/constructor/test_filter.py b/python/tests/constructor/test_filter.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_filter.py
rename to python/tests/constructor/test_filter.py
diff --git a/hsfs/python/tests/constructor/test_fs_query.py b/python/tests/constructor/test_fs_query.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_fs_query.py
rename to python/tests/constructor/test_fs_query.py
diff --git a/hsfs/python/tests/constructor/test_hudi_feature_group_alias.py b/python/tests/constructor/test_hudi_feature_group_alias.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_hudi_feature_group_alias.py
rename to python/tests/constructor/test_hudi_feature_group_alias.py
diff --git a/hsfs/python/tests/constructor/test_join.py b/python/tests/constructor/test_join.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_join.py
rename to python/tests/constructor/test_join.py
diff --git a/hsfs/python/tests/constructor/test_prepared_statement_parameter.py b/python/tests/constructor/test_prepared_statement_parameter.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_prepared_statement_parameter.py
rename to python/tests/constructor/test_prepared_statement_parameter.py
diff --git a/hsfs/python/tests/constructor/test_query.py b/python/tests/constructor/test_query.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_query.py
rename to python/tests/constructor/test_query.py
diff --git a/hsfs/python/tests/constructor/test_serving_prepared_statement.py b/python/tests/constructor/test_serving_prepared_statement.py
similarity index 100%
rename from hsfs/python/tests/constructor/test_serving_prepared_statement.py
rename to python/tests/constructor/test_serving_prepared_statement.py
diff --git a/hsfs/python/tests/core/__init__.py b/python/tests/core/__init__.py
similarity index 100%
rename from hsfs/python/tests/core/__init__.py
rename to python/tests/core/__init__.py
diff --git a/hsfs/python/tests/core/test_arrow_flight_client.py b/python/tests/core/test_arrow_flight_client.py
similarity index 100%
rename from hsfs/python/tests/core/test_arrow_flight_client.py
rename to python/tests/core/test_arrow_flight_client.py
diff --git a/hsfs/python/tests/core/test_code_engine.py b/python/tests/core/test_code_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_code_engine.py
rename to python/tests/core/test_code_engine.py
diff --git a/hsfs/python/tests/core/test_execution.py b/python/tests/core/test_execution.py
similarity index 100%
rename from hsfs/python/tests/core/test_execution.py
rename to python/tests/core/test_execution.py
diff --git a/hsfs/python/tests/core/test_expectation_engine.py b/python/tests/core/test_expectation_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_expectation_engine.py
rename to python/tests/core/test_expectation_engine.py
diff --git a/hsfs/python/tests/core/test_expectation_suite_engine.py b/python/tests/core/test_expectation_suite_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_expectation_suite_engine.py
rename to python/tests/core/test_expectation_suite_engine.py
diff --git a/hsfs/python/tests/core/test_external_feature_group_engine.py b/python/tests/core/test_external_feature_group_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_external_feature_group_engine.py
rename to python/tests/core/test_external_feature_group_engine.py
diff --git a/hsfs/python/tests/core/test_feature_descriptive_statistics.py b/python/tests/core/test_feature_descriptive_statistics.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_descriptive_statistics.py
rename to python/tests/core/test_feature_descriptive_statistics.py
diff --git a/hsfs/python/tests/core/test_feature_group_api.py b/python/tests/core/test_feature_group_api.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_group_api.py
rename to python/tests/core/test_feature_group_api.py
diff --git a/hsfs/python/tests/core/test_feature_group_base_engine.py b/python/tests/core/test_feature_group_base_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_group_base_engine.py
rename to python/tests/core/test_feature_group_base_engine.py
diff --git a/hsfs/python/tests/core/test_feature_group_engine.py b/python/tests/core/test_feature_group_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_group_engine.py
rename to python/tests/core/test_feature_group_engine.py
diff --git a/hsfs/python/tests/core/test_feature_monitoring_config.py b/python/tests/core/test_feature_monitoring_config.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_monitoring_config.py
rename to python/tests/core/test_feature_monitoring_config.py
diff --git a/hsfs/python/tests/core/test_feature_monitoring_config_engine.py b/python/tests/core/test_feature_monitoring_config_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_monitoring_config_engine.py
rename to python/tests/core/test_feature_monitoring_config_engine.py
diff --git a/hsfs/python/tests/core/test_feature_monitoring_result.py b/python/tests/core/test_feature_monitoring_result.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_monitoring_result.py
rename to python/tests/core/test_feature_monitoring_result.py
diff --git a/hsfs/python/tests/core/test_feature_monitoring_result_engine.py b/python/tests/core/test_feature_monitoring_result_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_monitoring_result_engine.py
rename to python/tests/core/test_feature_monitoring_result_engine.py
diff --git a/hsfs/python/tests/core/test_feature_view_engine.py b/python/tests/core/test_feature_view_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_feature_view_engine.py
rename to python/tests/core/test_feature_view_engine.py
diff --git a/hsfs/python/tests/core/test_great_expectation_engine.py b/python/tests/core/test_great_expectation_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_great_expectation_engine.py
rename to python/tests/core/test_great_expectation_engine.py
diff --git a/hsfs/python/tests/core/test_hudi_engine.py b/python/tests/core/test_hudi_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_hudi_engine.py
rename to python/tests/core/test_hudi_engine.py
diff --git a/hsfs/python/tests/core/test_ingestion_job.py b/python/tests/core/test_ingestion_job.py
similarity index 100%
rename from hsfs/python/tests/core/test_ingestion_job.py
rename to python/tests/core/test_ingestion_job.py
diff --git a/hsfs/python/tests/core/test_inode.py b/python/tests/core/test_inode.py
similarity index 100%
rename from hsfs/python/tests/core/test_inode.py
rename to python/tests/core/test_inode.py
diff --git a/hsfs/python/tests/core/test_job.py b/python/tests/core/test_job.py
similarity index 100%
rename from hsfs/python/tests/core/test_job.py
rename to python/tests/core/test_job.py
diff --git a/hsfs/python/tests/core/test_job_configuration.py b/python/tests/core/test_job_configuration.py
similarity index 100%
rename from hsfs/python/tests/core/test_job_configuration.py
rename to python/tests/core/test_job_configuration.py
diff --git a/hsfs/python/tests/core/test_kafka_engine.py b/python/tests/core/test_kafka_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_kafka_engine.py
rename to python/tests/core/test_kafka_engine.py
diff --git a/hsfs/python/tests/core/test_monitoring_window_config.py b/python/tests/core/test_monitoring_window_config.py
similarity index 100%
rename from hsfs/python/tests/core/test_monitoring_window_config.py
rename to python/tests/core/test_monitoring_window_config.py
diff --git a/hsfs/python/tests/core/test_monitoring_window_config_engine.py b/python/tests/core/test_monitoring_window_config_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_monitoring_window_config_engine.py
rename to python/tests/core/test_monitoring_window_config_engine.py
diff --git a/hsfs/python/tests/core/test_online_store_rest_client.py b/python/tests/core/test_online_store_rest_client.py
similarity index 100%
rename from hsfs/python/tests/core/test_online_store_rest_client.py
rename to python/tests/core/test_online_store_rest_client.py
diff --git a/hsfs/python/tests/core/test_online_store_rest_client_api.py b/python/tests/core/test_online_store_rest_client_api.py
similarity index 100%
rename from hsfs/python/tests/core/test_online_store_rest_client_api.py
rename to python/tests/core/test_online_store_rest_client_api.py
diff --git a/hsfs/python/tests/core/test_online_store_rest_client_engine.py b/python/tests/core/test_online_store_rest_client_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_online_store_rest_client_engine.py
rename to python/tests/core/test_online_store_rest_client_engine.py
diff --git a/hsfs/python/tests/core/test_opensearch.py b/python/tests/core/test_opensearch.py
similarity index 100%
rename from hsfs/python/tests/core/test_opensearch.py
rename to python/tests/core/test_opensearch.py
diff --git a/hsfs/python/tests/core/test_statistics_engine.py b/python/tests/core/test_statistics_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_statistics_engine.py
rename to python/tests/core/test_statistics_engine.py
diff --git a/hsfs/python/tests/core/test_training_dataset_engine.py b/python/tests/core/test_training_dataset_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_training_dataset_engine.py
rename to python/tests/core/test_training_dataset_engine.py
diff --git a/hsfs/python/tests/core/test_transformation_function_engine.py b/python/tests/core/test_transformation_function_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_transformation_function_engine.py
rename to python/tests/core/test_transformation_function_engine.py
diff --git a/hsfs/python/tests/core/test_validation_report_engine.py b/python/tests/core/test_validation_report_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_validation_report_engine.py
rename to python/tests/core/test_validation_report_engine.py
diff --git a/hsfs/python/tests/core/test_validation_result_engine.py b/python/tests/core/test_validation_result_engine.py
similarity index 100%
rename from hsfs/python/tests/core/test_validation_result_engine.py
rename to python/tests/core/test_validation_result_engine.py
diff --git a/hsfs/python/tests/core/test_vector_db_client.py b/python/tests/core/test_vector_db_client.py
similarity index 100%
rename from hsfs/python/tests/core/test_vector_db_client.py
rename to python/tests/core/test_vector_db_client.py
diff --git a/hsfs/python/tests/data/hadoop/bin/winutils.exe b/python/tests/data/hadoop/bin/winutils.exe
similarity index 100%
rename from hsfs/python/tests/data/hadoop/bin/winutils.exe
rename to python/tests/data/hadoop/bin/winutils.exe
diff --git a/hsfs/python/tests/data/test_basic.csv b/python/tests/data/test_basic.csv
similarity index 100%
rename from hsfs/python/tests/data/test_basic.csv
rename to python/tests/data/test_basic.csv
diff --git a/hsfs/python/tests/data/test_basic.parquet b/python/tests/data/test_basic.parquet
similarity index 100%
rename from hsfs/python/tests/data/test_basic.parquet
rename to python/tests/data/test_basic.parquet
diff --git a/hsfs/python/tests/data/test_basic.tsv b/python/tests/data/test_basic.tsv
similarity index 100%
rename from hsfs/python/tests/data/test_basic.tsv
rename to python/tests/data/test_basic.tsv
diff --git a/hsfs/python/tests/engine/__init__.py b/python/tests/engine/__init__.py
similarity index 100%
rename from hsfs/python/tests/engine/__init__.py
rename to python/tests/engine/__init__.py
diff --git a/hsfs/python/tests/engine/test_python.py b/python/tests/engine/test_python.py
similarity index 100%
rename from hsfs/python/tests/engine/test_python.py
rename to python/tests/engine/test_python.py
diff --git a/hsfs/python/tests/engine/test_python_reader.py b/python/tests/engine/test_python_reader.py
similarity index 100%
rename from hsfs/python/tests/engine/test_python_reader.py
rename to python/tests/engine/test_python_reader.py
diff --git a/hsfs/python/tests/engine/test_python_spark_convert_dataframe.py b/python/tests/engine/test_python_spark_convert_dataframe.py
similarity index 100%
rename from hsfs/python/tests/engine/test_python_spark_convert_dataframe.py
rename to python/tests/engine/test_python_spark_convert_dataframe.py
diff --git a/hsfs/python/tests/engine/test_python_spark_transformation_functions.py b/python/tests/engine/test_python_spark_transformation_functions.py
similarity index 100%
rename from hsfs/python/tests/engine/test_python_spark_transformation_functions.py
rename to python/tests/engine/test_python_spark_transformation_functions.py
diff --git a/hsfs/python/tests/engine/test_python_writer.py b/python/tests/engine/test_python_writer.py
similarity index 100%
rename from hsfs/python/tests/engine/test_python_writer.py
rename to python/tests/engine/test_python_writer.py
diff --git a/hsfs/python/tests/engine/test_spark.py b/python/tests/engine/test_spark.py
similarity index 100%
rename from hsfs/python/tests/engine/test_spark.py
rename to python/tests/engine/test_spark.py
diff --git a/hsfs/python/tests/fixtures/dataframe_fixtures.py b/python/tests/fixtures/dataframe_fixtures.py
similarity index 100%
rename from hsfs/python/tests/fixtures/dataframe_fixtures.py
rename to python/tests/fixtures/dataframe_fixtures.py
diff --git a/hsfs/python/tests/fixtures/execution_fixtures.json b/python/tests/fixtures/execution_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/execution_fixtures.json
rename to python/tests/fixtures/execution_fixtures.json
diff --git a/hsfs/python/tests/fixtures/expectation_suite_fixtures.json b/python/tests/fixtures/expectation_suite_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/expectation_suite_fixtures.json
rename to python/tests/fixtures/expectation_suite_fixtures.json
diff --git a/hsfs/python/tests/fixtures/external_feature_group_alias_fixtures.json b/python/tests/fixtures/external_feature_group_alias_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/external_feature_group_alias_fixtures.json
rename to python/tests/fixtures/external_feature_group_alias_fixtures.json
diff --git a/hsfs/python/tests/fixtures/external_feature_group_fixtures.json b/python/tests/fixtures/external_feature_group_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/external_feature_group_fixtures.json
rename to python/tests/fixtures/external_feature_group_fixtures.json
diff --git a/hsfs/python/tests/fixtures/feature_descriptive_statistics_fixtures.json b/python/tests/fixtures/feature_descriptive_statistics_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/feature_descriptive_statistics_fixtures.json
rename to python/tests/fixtures/feature_descriptive_statistics_fixtures.json
diff --git a/hsfs/python/tests/fixtures/feature_fixtures.json b/python/tests/fixtures/feature_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/feature_fixtures.json
rename to python/tests/fixtures/feature_fixtures.json
diff --git a/hsfs/python/tests/fixtures/feature_group_commit_fixtures.json b/python/tests/fixtures/feature_group_commit_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/feature_group_commit_fixtures.json
rename to python/tests/fixtures/feature_group_commit_fixtures.json
diff --git a/hsfs/python/tests/fixtures/feature_group_fixtures.json b/python/tests/fixtures/feature_group_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/feature_group_fixtures.json
rename to python/tests/fixtures/feature_group_fixtures.json
diff --git a/hsfs/python/tests/fixtures/feature_monitoring_config_fixtures.json b/python/tests/fixtures/feature_monitoring_config_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/feature_monitoring_config_fixtures.json
rename to python/tests/fixtures/feature_monitoring_config_fixtures.json
diff --git a/hsfs/python/tests/fixtures/feature_monitoring_result_fixtures.json b/python/tests/fixtures/feature_monitoring_result_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/feature_monitoring_result_fixtures.json
rename to python/tests/fixtures/feature_monitoring_result_fixtures.json
diff --git a/hsfs/python/tests/fixtures/feature_store_fixtures.json b/python/tests/fixtures/feature_store_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/feature_store_fixtures.json
rename to python/tests/fixtures/feature_store_fixtures.json
diff --git a/hsfs/python/tests/fixtures/feature_view_fixtures.json b/python/tests/fixtures/feature_view_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/feature_view_fixtures.json
rename to python/tests/fixtures/feature_view_fixtures.json
diff --git a/hsfs/python/tests/fixtures/filter_fixtures.json b/python/tests/fixtures/filter_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/filter_fixtures.json
rename to python/tests/fixtures/filter_fixtures.json
diff --git a/hsfs/python/tests/fixtures/fs_query_fixtures.json b/python/tests/fixtures/fs_query_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/fs_query_fixtures.json
rename to python/tests/fixtures/fs_query_fixtures.json
diff --git a/hsfs/python/tests/fixtures/ge_expectation_fixtures.json b/python/tests/fixtures/ge_expectation_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/ge_expectation_fixtures.json
rename to python/tests/fixtures/ge_expectation_fixtures.json
diff --git a/hsfs/python/tests/fixtures/ge_validation_result_fixtures.json b/python/tests/fixtures/ge_validation_result_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/ge_validation_result_fixtures.json
rename to python/tests/fixtures/ge_validation_result_fixtures.json
diff --git a/hsfs/python/tests/fixtures/generate_backend_fixtures.ipynb b/python/tests/fixtures/generate_backend_fixtures.ipynb
similarity index 100%
rename from hsfs/python/tests/fixtures/generate_backend_fixtures.ipynb
rename to python/tests/fixtures/generate_backend_fixtures.ipynb
diff --git a/hsfs/python/tests/fixtures/hudi_feature_group_alias_fixtures.json b/python/tests/fixtures/hudi_feature_group_alias_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/hudi_feature_group_alias_fixtures.json
rename to python/tests/fixtures/hudi_feature_group_alias_fixtures.json
diff --git a/hsfs/python/tests/fixtures/ingestion_job_fixtures.json b/python/tests/fixtures/ingestion_job_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/ingestion_job_fixtures.json
rename to python/tests/fixtures/ingestion_job_fixtures.json
diff --git a/hsfs/python/tests/fixtures/inode_fixtures.json b/python/tests/fixtures/inode_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/inode_fixtures.json
rename to python/tests/fixtures/inode_fixtures.json
diff --git a/hsfs/python/tests/fixtures/job_fixtures.json b/python/tests/fixtures/job_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/job_fixtures.json
rename to python/tests/fixtures/job_fixtures.json
diff --git a/hsfs/python/tests/fixtures/join_fixtures.json b/python/tests/fixtures/join_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/join_fixtures.json
rename to python/tests/fixtures/join_fixtures.json
diff --git a/hsfs/python/tests/fixtures/logic_fixtures.json b/python/tests/fixtures/logic_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/logic_fixtures.json
rename to python/tests/fixtures/logic_fixtures.json
diff --git a/hsfs/python/tests/fixtures/prepared_statement_parameter_fixtures.json b/python/tests/fixtures/prepared_statement_parameter_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/prepared_statement_parameter_fixtures.json
rename to python/tests/fixtures/prepared_statement_parameter_fixtures.json
diff --git a/hsfs/python/tests/fixtures/query_fixtures.json b/python/tests/fixtures/query_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/query_fixtures.json
rename to python/tests/fixtures/query_fixtures.json
diff --git a/hsfs/python/tests/fixtures/rondb_server_fixtures.json b/python/tests/fixtures/rondb_server_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/rondb_server_fixtures.json
rename to python/tests/fixtures/rondb_server_fixtures.json
diff --git a/hsfs/python/tests/fixtures/serving_keys_fixtures.json b/python/tests/fixtures/serving_keys_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/serving_keys_fixtures.json
rename to python/tests/fixtures/serving_keys_fixtures.json
diff --git a/hsfs/python/tests/fixtures/serving_prepared_statement_fixtures.json b/python/tests/fixtures/serving_prepared_statement_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/serving_prepared_statement_fixtures.json
rename to python/tests/fixtures/serving_prepared_statement_fixtures.json
diff --git a/hsfs/python/tests/fixtures/spine_group_fixtures.json b/python/tests/fixtures/spine_group_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/spine_group_fixtures.json
rename to python/tests/fixtures/spine_group_fixtures.json
diff --git a/hsfs/python/tests/fixtures/split_statistics_fixtures.json b/python/tests/fixtures/split_statistics_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/split_statistics_fixtures.json
rename to python/tests/fixtures/split_statistics_fixtures.json
diff --git a/hsfs/python/tests/fixtures/statistics_config_fixtures.json b/python/tests/fixtures/statistics_config_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/statistics_config_fixtures.json
rename to python/tests/fixtures/statistics_config_fixtures.json
diff --git a/hsfs/python/tests/fixtures/statistics_fixtures.json b/python/tests/fixtures/statistics_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/statistics_fixtures.json
rename to python/tests/fixtures/statistics_fixtures.json
diff --git a/hsfs/python/tests/fixtures/storage_connector_fixtures.json b/python/tests/fixtures/storage_connector_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/storage_connector_fixtures.json
rename to python/tests/fixtures/storage_connector_fixtures.json
diff --git a/hsfs/python/tests/fixtures/training_dataset_feature_fixtures.json b/python/tests/fixtures/training_dataset_feature_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/training_dataset_feature_fixtures.json
rename to python/tests/fixtures/training_dataset_feature_fixtures.json
diff --git a/hsfs/python/tests/fixtures/training_dataset_fixtures.json b/python/tests/fixtures/training_dataset_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/training_dataset_fixtures.json
rename to python/tests/fixtures/training_dataset_fixtures.json
diff --git a/hsfs/python/tests/fixtures/training_dataset_split_fixtures.json b/python/tests/fixtures/training_dataset_split_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/training_dataset_split_fixtures.json
rename to python/tests/fixtures/training_dataset_split_fixtures.json
diff --git a/hsfs/python/tests/fixtures/transformation_function_attached_fixtures.json b/python/tests/fixtures/transformation_function_attached_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/transformation_function_attached_fixtures.json
rename to python/tests/fixtures/transformation_function_attached_fixtures.json
diff --git a/hsfs/python/tests/fixtures/transformation_function_fixtures.json b/python/tests/fixtures/transformation_function_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/transformation_function_fixtures.json
rename to python/tests/fixtures/transformation_function_fixtures.json
diff --git a/hsfs/python/tests/fixtures/user_fixtures.json b/python/tests/fixtures/user_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/user_fixtures.json
rename to python/tests/fixtures/user_fixtures.json
diff --git a/hsfs/python/tests/fixtures/validation_report_fixtures.json b/python/tests/fixtures/validation_report_fixtures.json
similarity index 100%
rename from hsfs/python/tests/fixtures/validation_report_fixtures.json
rename to python/tests/fixtures/validation_report_fixtures.json
diff --git a/hsfs/python/tests/test_expectation_suite.py b/python/tests/test_expectation_suite.py
similarity index 100%
rename from hsfs/python/tests/test_expectation_suite.py
rename to python/tests/test_expectation_suite.py
diff --git a/hsfs/python/tests/test_feature.py b/python/tests/test_feature.py
similarity index 100%
rename from hsfs/python/tests/test_feature.py
rename to python/tests/test_feature.py
diff --git a/hsfs/python/tests/test_feature_group.py b/python/tests/test_feature_group.py
similarity index 100%
rename from hsfs/python/tests/test_feature_group.py
rename to python/tests/test_feature_group.py
diff --git a/hsfs/python/tests/test_feature_group_commit.py b/python/tests/test_feature_group_commit.py
similarity index 100%
rename from hsfs/python/tests/test_feature_group_commit.py
rename to python/tests/test_feature_group_commit.py
diff --git a/hsfs/python/tests/test_feature_group_writer.py b/python/tests/test_feature_group_writer.py
similarity index 100%
rename from hsfs/python/tests/test_feature_group_writer.py
rename to python/tests/test_feature_group_writer.py
diff --git a/hsfs/python/tests/test_feature_store.py b/python/tests/test_feature_store.py
similarity index 100%
rename from hsfs/python/tests/test_feature_store.py
rename to python/tests/test_feature_store.py
diff --git a/hsfs/python/tests/test_feature_view.py b/python/tests/test_feature_view.py
similarity index 100%
rename from hsfs/python/tests/test_feature_view.py
rename to python/tests/test_feature_view.py
diff --git a/hsfs/python/tests/test_ge_expectation.py b/python/tests/test_ge_expectation.py
similarity index 100%
rename from hsfs/python/tests/test_ge_expectation.py
rename to python/tests/test_ge_expectation.py
diff --git a/hsfs/python/tests/test_ge_validation_result.py b/python/tests/test_ge_validation_result.py
similarity index 100%
rename from hsfs/python/tests/test_ge_validation_result.py
rename to python/tests/test_ge_validation_result.py
diff --git a/hsfs/python/tests/test_helpers/__init__.py b/python/tests/test_helpers/__init__.py
similarity index 100%
rename from hsfs/python/tests/test_helpers/__init__.py
rename to python/tests/test_helpers/__init__.py
diff --git a/hsfs/python/tests/test_helpers/transformation_test_helper.py b/python/tests/test_helpers/transformation_test_helper.py
similarity index 100%
rename from hsfs/python/tests/test_helpers/transformation_test_helper.py
rename to python/tests/test_helpers/transformation_test_helper.py
diff --git a/hsfs/python/tests/test_hopswork_udf.py b/python/tests/test_hopswork_udf.py
similarity index 100%
rename from hsfs/python/tests/test_hopswork_udf.py
rename to python/tests/test_hopswork_udf.py
diff --git a/hsfs/python/tests/test_serving_keys.py b/python/tests/test_serving_keys.py
similarity index 100%
rename from hsfs/python/tests/test_serving_keys.py
rename to python/tests/test_serving_keys.py
diff --git a/hsfs/python/tests/test_split_statistics.py b/python/tests/test_split_statistics.py
similarity index 100%
rename from hsfs/python/tests/test_split_statistics.py
rename to python/tests/test_split_statistics.py
diff --git a/hsfs/python/tests/test_statistics.py b/python/tests/test_statistics.py
similarity index 100%
rename from hsfs/python/tests/test_statistics.py
rename to python/tests/test_statistics.py
diff --git a/hsfs/python/tests/test_statistics_config.py b/python/tests/test_statistics_config.py
similarity index 100%
rename from hsfs/python/tests/test_statistics_config.py
rename to python/tests/test_statistics_config.py
diff --git a/hsfs/python/tests/test_storage_connector.py b/python/tests/test_storage_connector.py
similarity index 100%
rename from hsfs/python/tests/test_storage_connector.py
rename to python/tests/test_storage_connector.py
diff --git a/hsfs/python/tests/test_training_dataset.py b/python/tests/test_training_dataset.py
similarity index 100%
rename from hsfs/python/tests/test_training_dataset.py
rename to python/tests/test_training_dataset.py
diff --git a/hsfs/python/tests/test_training_dataset_feature.py b/python/tests/test_training_dataset_feature.py
similarity index 100%
rename from hsfs/python/tests/test_training_dataset_feature.py
rename to python/tests/test_training_dataset_feature.py
diff --git a/hsfs/python/tests/test_training_dataset_split.py b/python/tests/test_training_dataset_split.py
similarity index 100%
rename from hsfs/python/tests/test_training_dataset_split.py
rename to python/tests/test_training_dataset_split.py
diff --git a/hsfs/python/tests/test_transformation_function.py b/python/tests/test_transformation_function.py
similarity index 100%
rename from hsfs/python/tests/test_transformation_function.py
rename to python/tests/test_transformation_function.py
diff --git a/hsfs/python/tests/test_user.py b/python/tests/test_user.py
similarity index 100%
rename from hsfs/python/tests/test_user.py
rename to python/tests/test_user.py
diff --git a/hsfs/python/tests/test_validation_report.py b/python/tests/test_validation_report.py
similarity index 100%
rename from hsfs/python/tests/test_validation_report.py
rename to python/tests/test_validation_report.py
diff --git a/hsfs/python/tests/util.py b/python/tests/util.py
similarity index 100%
rename from hsfs/python/tests/util.py
rename to python/tests/util.py