diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/common/__init__.py b/tests/common/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/common/filesystem/__init__.py b/tests/common/filesystem/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/common/filesystem/test_infer_fs.py b/tests/common/filesystem/test_infer_fs.py
similarity index 100%
rename from common/filesystem/test_infer_fs.py
rename to tests/common/filesystem/test_infer_fs.py
diff --git a/common/test_device.py b/tests/common/test_device.py
similarity index 100%
rename from common/test_device.py
rename to tests/common/test_device.py
diff --git a/common/testing_utils.py b/tests/common/test_utils.py
similarity index 100%
rename from common/testing_utils.py
rename to tests/common/test_utils.py
diff --git a/tests/core/__init__.py b/tests/core/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/core/config/__init__.py b/tests/core/config/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/core/config/base_config_test.py b/tests/core/config/test_base_config.py
similarity index 100%
rename from core/config/base_config_test.py
rename to tests/core/config/test_base_config.py
diff --git a/core/config/test_config_load.py b/tests/core/config/test_config_load.py
similarity index 100%
rename from core/config/test_config_load.py
rename to tests/core/config/test_config_load.py
diff --git a/core/test_metrics.py b/tests/core/test_metrics.py
similarity index 100%
rename from core/test_metrics.py
rename to tests/core/test_metrics.py
diff --git a/core/test_train_pipeline.py b/tests/core/test_train_pipeline.py
similarity index 100%
rename from core/test_train_pipeline.py
rename to tests/core/test_train_pipeline.py
diff --git a/tests/ml_logging/__init__.py b/tests/ml_logging/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/ml_logging/test_torch_logging.py b/tests/ml_logging/test_torch_logging.py
similarity index 100%
rename from ml_logging/test_torch_logging.py
rename to tests/ml_logging/test_torch_logging.py
diff --git a/tests/projects/__init__.py b/tests/projects/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/projects/twhin/__init__.py b/tests/projects/twhin/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/projects/twhin/data/__init__.py b/tests/projects/twhin/data/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/projects/twhin/data/test_data.py b/tests/projects/twhin/data/test_data.py
similarity index 100%
rename from projects/twhin/data/test_data.py
rename to tests/projects/twhin/data/test_data.py
diff --git a/projects/twhin/data/test_edges.py b/tests/projects/twhin/data/test_edges.py
similarity index 100%
rename from projects/twhin/data/test_edges.py
rename to tests/projects/twhin/data/test_edges.py
diff --git a/tests/projects/twhin/models/__init__.py b/tests/projects/twhin/models/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/projects/twhin/models/test_models.py b/tests/projects/twhin/models/test_models.py
similarity index 100%
rename from projects/twhin/models/test_models.py
rename to tests/projects/twhin/models/test_models.py
diff --git a/projects/twhin/test_optimizer.py b/tests/projects/twhin/test_optimizer.py
similarity index 100%
rename from projects/twhin/test_optimizer.py
rename to tests/projects/twhin/test_optimizer.py
diff --git a/tests/reader/__init__.py b/tests/reader/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/reader/test_dataset.py b/tests/reader/test_dataset.py
similarity index 100%
rename from reader/test_dataset.py
rename to tests/reader/test_dataset.py
diff --git a/reader/test_utils.py b/tests/reader/test_utils.py
similarity index 100%
rename from reader/test_utils.py
rename to tests/reader/test_utils.py