diff --git a/tests/test_cli.py b/tests/test_cli.py
index 67b39bd742d34ea8f30fa8555a003f1c68fbe3cf..3d6750326f6653eb4c9cfe539d5c5ee0854a2643 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -62,8 +62,8 @@ def test_config_list():
     runner = CliRunner()
     result = runner.invoke(list)
     _assert_exit_0(result)
-    assert "module: ptbench.configs.datasets" in result.output
-    assert "module: ptbench.configs.models" in result.output
+    assert "module: ptbench.data" in result.output
+    assert "module: ptbench.models.config" in result.output
 
 
 @pytest.mark.skip(reason="Test need to be updated")
@@ -72,8 +72,8 @@ def test_config_list_v():
 
     result = CliRunner().invoke(list, ["--verbose"])
     _assert_exit_0(result)
-    assert "module: ptbench.configs.datasets" in result.output
-    assert "module: ptbench.configs.models" in result.output
+    assert "module: ptbench.data" in result.output
+    assert "module: ptbench.models.config" in result.output
 
 
 def test_config_describe_help():
diff --git a/tests/test_mc_ch.py b/tests/test_mc_ch.py
index 17c1fb4c49ee6f0e88e6468f459109643a9bf71a..9fe5e6e37fac8ade8b63f7b136c17e448db21daf 100644
--- a/tests/test_mc_ch.py
+++ b/tests/test_mc_ch.py
@@ -8,69 +8,39 @@ import pytest
 
 @pytest.mark.skip(reason="Test need to be updated")
 def test_dataset_consistency():
-    from ptbench.configs.datasets.mc_ch import default as mc_ch
-    from ptbench.configs.datasets.mc_ch import fold_0 as mc_ch_f0
-    from ptbench.configs.datasets.mc_ch import fold_0_rgb as mc_ch_f0_rgb
-    from ptbench.configs.datasets.mc_ch import fold_1 as mc_ch_f1
-    from ptbench.configs.datasets.mc_ch import fold_1_rgb as mc_ch_f1_rgb
-    from ptbench.configs.datasets.mc_ch import fold_2 as mc_ch_f2
-    from ptbench.configs.datasets.mc_ch import fold_2_rgb as mc_ch_f2_rgb
-    from ptbench.configs.datasets.mc_ch import fold_3 as mc_ch_f3
-    from ptbench.configs.datasets.mc_ch import fold_3_rgb as mc_ch_f3_rgb
-    from ptbench.configs.datasets.mc_ch import fold_4 as mc_ch_f4
-    from ptbench.configs.datasets.mc_ch import fold_4_rgb as mc_ch_f4_rgb
-    from ptbench.configs.datasets.mc_ch import fold_5 as mc_ch_f5
-    from ptbench.configs.datasets.mc_ch import fold_5_rgb as mc_ch_f5_rgb
-    from ptbench.configs.datasets.mc_ch import fold_6 as mc_ch_f6
-    from ptbench.configs.datasets.mc_ch import fold_6_rgb as mc_ch_f6_rgb
-    from ptbench.configs.datasets.mc_ch import fold_7 as mc_ch_f7
-    from ptbench.configs.datasets.mc_ch import fold_7_rgb as mc_ch_f7_rgb
-    from ptbench.configs.datasets.mc_ch import fold_8 as mc_ch_f8
-    from ptbench.configs.datasets.mc_ch import fold_8_rgb as mc_ch_f8_rgb
-    from ptbench.configs.datasets.mc_ch import fold_9 as mc_ch_f9
-    from ptbench.configs.datasets.mc_ch import fold_9_rgb as mc_ch_f9_rgb
-    from ptbench.configs.datasets.montgomery import default as mc
-    from ptbench.configs.datasets.montgomery import fold_0 as mc_f0
-    from ptbench.configs.datasets.montgomery import fold_0_rgb as mc_f0_rgb
-    from ptbench.configs.datasets.montgomery import fold_1 as mc_f1
-    from ptbench.configs.datasets.montgomery import fold_1_rgb as mc_f1_rgb
-    from ptbench.configs.datasets.montgomery import fold_2 as mc_f2
-    from ptbench.configs.datasets.montgomery import fold_2_rgb as mc_f2_rgb
-    from ptbench.configs.datasets.montgomery import fold_3 as mc_f3
-    from ptbench.configs.datasets.montgomery import fold_3_rgb as mc_f3_rgb
-    from ptbench.configs.datasets.montgomery import fold_4 as mc_f4
-    from ptbench.configs.datasets.montgomery import fold_4_rgb as mc_f4_rgb
-    from ptbench.configs.datasets.montgomery import fold_5 as mc_f5
-    from ptbench.configs.datasets.montgomery import fold_5_rgb as mc_f5_rgb
-    from ptbench.configs.datasets.montgomery import fold_6 as mc_f6
-    from ptbench.configs.datasets.montgomery import fold_6_rgb as mc_f6_rgb
-    from ptbench.configs.datasets.montgomery import fold_7 as mc_f7
-    from ptbench.configs.datasets.montgomery import fold_7_rgb as mc_f7_rgb
-    from ptbench.configs.datasets.montgomery import fold_8 as mc_f8
-    from ptbench.configs.datasets.montgomery import fold_8_rgb as mc_f8_rgb
-    from ptbench.configs.datasets.montgomery import fold_9 as mc_f9
-    from ptbench.configs.datasets.montgomery import fold_9_rgb as mc_f9_rgb
-    from ptbench.configs.datasets.shenzhen import default as ch
-    from ptbench.configs.datasets.shenzhen import fold_0 as ch_f0
-    from ptbench.configs.datasets.shenzhen import fold_0_rgb as ch_f0_rgb
-    from ptbench.configs.datasets.shenzhen import fold_1 as ch_f1
-    from ptbench.configs.datasets.shenzhen import fold_1_rgb as ch_f1_rgb
-    from ptbench.configs.datasets.shenzhen import fold_2 as ch_f2
-    from ptbench.configs.datasets.shenzhen import fold_2_rgb as ch_f2_rgb
-    from ptbench.configs.datasets.shenzhen import fold_3 as ch_f3
-    from ptbench.configs.datasets.shenzhen import fold_3_rgb as ch_f3_rgb
-    from ptbench.configs.datasets.shenzhen import fold_4 as ch_f4
-    from ptbench.configs.datasets.shenzhen import fold_4_rgb as ch_f4_rgb
-    from ptbench.configs.datasets.shenzhen import fold_5 as ch_f5
-    from ptbench.configs.datasets.shenzhen import fold_5_rgb as ch_f5_rgb
-    from ptbench.configs.datasets.shenzhen import fold_6 as ch_f6
-    from ptbench.configs.datasets.shenzhen import fold_6_rgb as ch_f6_rgb
-    from ptbench.configs.datasets.shenzhen import fold_7 as ch_f7
-    from ptbench.configs.datasets.shenzhen import fold_7_rgb as ch_f7_rgb
-    from ptbench.configs.datasets.shenzhen import fold_8 as ch_f8
-    from ptbench.configs.datasets.shenzhen import fold_8_rgb as ch_f8_rgb
-    from ptbench.configs.datasets.shenzhen import fold_9 as ch_f9
-    from ptbench.configs.datasets.shenzhen import fold_9_rgb as ch_f9_rgb
+    from ptbench.data.montgomery import default as mc
+    from ptbench.data.montgomery import fold_0 as mc_f0
+    from ptbench.data.montgomery import fold_1 as mc_f1
+    from ptbench.data.montgomery import fold_2 as mc_f2
+    from ptbench.data.montgomery import fold_3 as mc_f3
+    from ptbench.data.montgomery import fold_4 as mc_f4
+    from ptbench.data.montgomery import fold_5 as mc_f5
+    from ptbench.data.montgomery import fold_6 as mc_f6
+    from ptbench.data.montgomery import fold_7 as mc_f7
+    from ptbench.data.montgomery import fold_8 as mc_f8
+    from ptbench.data.montgomery import fold_9 as mc_f9
+    from ptbench.data.montgomery_shenzhen import default as mc_ch
+    from ptbench.data.montgomery_shenzhen import fold_0 as mc_ch_f0
+    from ptbench.data.montgomery_shenzhen import fold_1 as mc_ch_f1
+    from ptbench.data.montgomery_shenzhen import fold_2 as mc_ch_f2
+    from ptbench.data.montgomery_shenzhen import fold_3 as mc_ch_f3
+    from ptbench.data.montgomery_shenzhen import fold_4 as mc_ch_f4
+    from ptbench.data.montgomery_shenzhen import fold_5 as mc_ch_f5
+    from ptbench.data.montgomery_shenzhen import fold_6 as mc_ch_f6
+    from ptbench.data.montgomery_shenzhen import fold_7 as mc_ch_f7
+    from ptbench.data.montgomery_shenzhen import fold_8 as mc_ch_f8
+    from ptbench.data.montgomery_shenzhen import fold_9 as mc_ch_f9
+    from ptbench.data.shenzhen import default as ch
+    from ptbench.data.shenzhen import fold_0 as ch_f0
+    from ptbench.data.shenzhen import fold_1 as ch_f1
+    from ptbench.data.shenzhen import fold_2 as ch_f2
+    from ptbench.data.shenzhen import fold_3 as ch_f3
+    from ptbench.data.shenzhen import fold_4 as ch_f4
+    from ptbench.data.shenzhen import fold_5 as ch_f5
+    from ptbench.data.shenzhen import fold_6 as ch_f6
+    from ptbench.data.shenzhen import fold_7 as ch_f7
+    from ptbench.data.shenzhen import fold_8 as ch_f8
+    from ptbench.data.shenzhen import fold_9 as ch_f9
 
     # Default protocol
     mc_ch_dataset = mc_ch.dataset
diff --git a/tests/test_mc_ch_in.py b/tests/test_mc_ch_in.py
index 7305b66b7777f390c23a77a758f3dc5371fdb1bc..6c79da4f26326d158a247f5746d7d2a477344072 100644
--- a/tests/test_mc_ch_in.py
+++ b/tests/test_mc_ch_in.py
@@ -8,90 +8,50 @@ import pytest
 
 @pytest.mark.skip(reason="Test need to be updated")
 def test_dataset_consistency():
-    from ptbench.configs.datasets.indian import default as indian
-    from ptbench.configs.datasets.indian import fold_0 as indian_f0
-    from ptbench.configs.datasets.indian import fold_0_rgb as indian_f0_rgb
-    from ptbench.configs.datasets.indian import fold_1 as indian_f1
-    from ptbench.configs.datasets.indian import fold_1_rgb as indian_f1_rgb
-    from ptbench.configs.datasets.indian import fold_2 as indian_f2
-    from ptbench.configs.datasets.indian import fold_2_rgb as indian_f2_rgb
-    from ptbench.configs.datasets.indian import fold_3 as indian_f3
-    from ptbench.configs.datasets.indian import fold_3_rgb as indian_f3_rgb
-    from ptbench.configs.datasets.indian import fold_4 as indian_f4
-    from ptbench.configs.datasets.indian import fold_4_rgb as indian_f4_rgb
-    from ptbench.configs.datasets.indian import fold_5 as indian_f5
-    from ptbench.configs.datasets.indian import fold_5_rgb as indian_f5_rgb
-    from ptbench.configs.datasets.indian import fold_6 as indian_f6
-    from ptbench.configs.datasets.indian import fold_6_rgb as indian_f6_rgb
-    from ptbench.configs.datasets.indian import fold_7 as indian_f7
-    from ptbench.configs.datasets.indian import fold_7_rgb as indian_f7_rgb
-    from ptbench.configs.datasets.indian import fold_8 as indian_f8
-    from ptbench.configs.datasets.indian import fold_8_rgb as indian_f8_rgb
-    from ptbench.configs.datasets.indian import fold_9 as indian_f9
-    from ptbench.configs.datasets.indian import fold_9_rgb as indian_f9_rgb
-    from ptbench.configs.datasets.mc_ch_in import default as mc_ch_in
-    from ptbench.configs.datasets.mc_ch_in import fold_0 as mc_ch_in_f0
-    from ptbench.configs.datasets.mc_ch_in import fold_0_rgb as mc_ch_in_f0_rgb
-    from ptbench.configs.datasets.mc_ch_in import fold_1 as mc_ch_in_f1
-    from ptbench.configs.datasets.mc_ch_in import fold_1_rgb as mc_ch_in_f1_rgb
-    from ptbench.configs.datasets.mc_ch_in import fold_2 as mc_ch_in_f2
-    from ptbench.configs.datasets.mc_ch_in import fold_2_rgb as mc_ch_in_f2_rgb
-    from ptbench.configs.datasets.mc_ch_in import fold_3 as mc_ch_in_f3
-    from ptbench.configs.datasets.mc_ch_in import fold_3_rgb as mc_ch_in_f3_rgb
-    from ptbench.configs.datasets.mc_ch_in import fold_4 as mc_ch_in_f4
-    from ptbench.configs.datasets.mc_ch_in import fold_4_rgb as mc_ch_in_f4_rgb
-    from ptbench.configs.datasets.mc_ch_in import fold_5 as mc_ch_in_f5
-    from ptbench.configs.datasets.mc_ch_in import fold_5_rgb as mc_ch_in_f5_rgb
-    from ptbench.configs.datasets.mc_ch_in import fold_6 as mc_ch_in_f6
-    from ptbench.configs.datasets.mc_ch_in import fold_6_rgb as mc_ch_in_f6_rgb
-    from ptbench.configs.datasets.mc_ch_in import fold_7 as mc_ch_in_f7
-    from ptbench.configs.datasets.mc_ch_in import fold_7_rgb as mc_ch_in_f7_rgb
-    from ptbench.configs.datasets.mc_ch_in import fold_8 as mc_ch_in_f8
-    from ptbench.configs.datasets.mc_ch_in import fold_8_rgb as mc_ch_in_f8_rgb
-    from ptbench.configs.datasets.mc_ch_in import fold_9 as mc_ch_in_f9
-    from ptbench.configs.datasets.mc_ch_in import fold_9_rgb as mc_ch_in_f9_rgb
-    from ptbench.configs.datasets.montgomery import default as mc
-    from ptbench.configs.datasets.montgomery import fold_0 as mc_f0
-    from ptbench.configs.datasets.montgomery import fold_0_rgb as mc_f0_rgb
-    from ptbench.configs.datasets.montgomery import fold_1 as mc_f1
-    from ptbench.configs.datasets.montgomery import fold_1_rgb as mc_f1_rgb
-    from ptbench.configs.datasets.montgomery import fold_2 as mc_f2
-    from ptbench.configs.datasets.montgomery import fold_2_rgb as mc_f2_rgb
-    from ptbench.configs.datasets.montgomery import fold_3 as mc_f3
-    from ptbench.configs.datasets.montgomery import fold_3_rgb as mc_f3_rgb
-    from ptbench.configs.datasets.montgomery import fold_4 as mc_f4
-    from ptbench.configs.datasets.montgomery import fold_4_rgb as mc_f4_rgb
-    from ptbench.configs.datasets.montgomery import fold_5 as mc_f5
-    from ptbench.configs.datasets.montgomery import fold_5_rgb as mc_f5_rgb
-    from ptbench.configs.datasets.montgomery import fold_6 as mc_f6
-    from ptbench.configs.datasets.montgomery import fold_6_rgb as mc_f6_rgb
-    from ptbench.configs.datasets.montgomery import fold_7 as mc_f7
-    from ptbench.configs.datasets.montgomery import fold_7_rgb as mc_f7_rgb
-    from ptbench.configs.datasets.montgomery import fold_8 as mc_f8
-    from ptbench.configs.datasets.montgomery import fold_8_rgb as mc_f8_rgb
-    from ptbench.configs.datasets.montgomery import fold_9 as mc_f9
-    from ptbench.configs.datasets.montgomery import fold_9_rgb as mc_f9_rgb
-    from ptbench.configs.datasets.shenzhen import default as ch
-    from ptbench.configs.datasets.shenzhen import fold_0 as ch_f0
-    from ptbench.configs.datasets.shenzhen import fold_0_rgb as ch_f0_rgb
-    from ptbench.configs.datasets.shenzhen import fold_1 as ch_f1
-    from ptbench.configs.datasets.shenzhen import fold_1_rgb as ch_f1_rgb
-    from ptbench.configs.datasets.shenzhen import fold_2 as ch_f2
-    from ptbench.configs.datasets.shenzhen import fold_2_rgb as ch_f2_rgb
-    from ptbench.configs.datasets.shenzhen import fold_3 as ch_f3
-    from ptbench.configs.datasets.shenzhen import fold_3_rgb as ch_f3_rgb
-    from ptbench.configs.datasets.shenzhen import fold_4 as ch_f4
-    from ptbench.configs.datasets.shenzhen import fold_4_rgb as ch_f4_rgb
-    from ptbench.configs.datasets.shenzhen import fold_5 as ch_f5
-    from ptbench.configs.datasets.shenzhen import fold_5_rgb as ch_f5_rgb
-    from ptbench.configs.datasets.shenzhen import fold_6 as ch_f6
-    from ptbench.configs.datasets.shenzhen import fold_6_rgb as ch_f6_rgb
-    from ptbench.configs.datasets.shenzhen import fold_7 as ch_f7
-    from ptbench.configs.datasets.shenzhen import fold_7_rgb as ch_f7_rgb
-    from ptbench.configs.datasets.shenzhen import fold_8 as ch_f8
-    from ptbench.configs.datasets.shenzhen import fold_8_rgb as ch_f8_rgb
-    from ptbench.configs.datasets.shenzhen import fold_9 as ch_f9
-    from ptbench.configs.datasets.shenzhen import fold_9_rgb as ch_f9_rgb
+    from ptbench.data.indian import default as indian
+    from ptbench.data.indian import fold_0 as indian_f0
+    from ptbench.data.indian import fold_1 as indian_f1
+    from ptbench.data.indian import fold_2 as indian_f2
+    from ptbench.data.indian import fold_3 as indian_f3
+    from ptbench.data.indian import fold_4 as indian_f4
+    from ptbench.data.indian import fold_5 as indian_f5
+    from ptbench.data.indian import fold_6 as indian_f6
+    from ptbench.data.indian import fold_7 as indian_f7
+    from ptbench.data.indian import fold_8 as indian_f8
+    from ptbench.data.indian import fold_9 as indian_f9
+    from ptbench.data.montgomery import default as mc
+    from ptbench.data.montgomery import fold_0 as mc_f0
+    from ptbench.data.montgomery import fold_1 as mc_f1
+    from ptbench.data.montgomery import fold_2 as mc_f2
+    from ptbench.data.montgomery import fold_3 as mc_f3
+    from ptbench.data.montgomery import fold_4 as mc_f4
+    from ptbench.data.montgomery import fold_5 as mc_f5
+    from ptbench.data.montgomery import fold_6 as mc_f6
+    from ptbench.data.montgomery import fold_7 as mc_f7
+    from ptbench.data.montgomery import fold_8 as mc_f8
+    from ptbench.data.montgomery import fold_9 as mc_f9
+    from ptbench.data.montgomery_shenzhen_indian import default as mc_ch_in
+    from ptbench.data.montgomery_shenzhen_indian import fold_0 as mc_ch_in_f0
+    from ptbench.data.montgomery_shenzhen_indian import fold_1 as mc_ch_in_f1
+    from ptbench.data.montgomery_shenzhen_indian import fold_2 as mc_ch_in_f2
+    from ptbench.data.montgomery_shenzhen_indian import fold_3 as mc_ch_in_f3
+    from ptbench.data.montgomery_shenzhen_indian import fold_4 as mc_ch_in_f4
+    from ptbench.data.montgomery_shenzhen_indian import fold_5 as mc_ch_in_f5
+    from ptbench.data.montgomery_shenzhen_indian import fold_6 as mc_ch_in_f6
+    from ptbench.data.montgomery_shenzhen_indian import fold_7 as mc_ch_in_f7
+    from ptbench.data.montgomery_shenzhen_indian import fold_8 as mc_ch_in_f8
+    from ptbench.data.montgomery_shenzhen_indian import fold_9 as mc_ch_in_f9
+    from ptbench.data.shenzhen import default as ch
+    from ptbench.data.shenzhen import fold_0 as ch_f0
+    from ptbench.data.shenzhen import fold_1 as ch_f1
+    from ptbench.data.shenzhen import fold_2 as ch_f2
+    from ptbench.data.shenzhen import fold_3 as ch_f3
+    from ptbench.data.shenzhen import fold_4 as ch_f4
+    from ptbench.data.shenzhen import fold_5 as ch_f5
+    from ptbench.data.shenzhen import fold_6 as ch_f6
+    from ptbench.data.shenzhen import fold_7 as ch_f7
+    from ptbench.data.shenzhen import fold_8 as ch_f8
+    from ptbench.data.shenzhen import fold_9 as ch_f9
 
     # Default protocol
     mc_ch_in_dataset = mc_ch_in.dataset
diff --git a/tests/test_mc_ch_in_11k.py b/tests/test_mc_ch_in_11k.py
index 964faf06ec8feba1fb8b7f50d38cbd6c225e061b..f4a04253a92bad340671bb6bc49575e59795c872 100644
--- a/tests/test_mc_ch_in_11k.py
+++ b/tests/test_mc_ch_in_11k.py
@@ -8,151 +8,80 @@ import pytest
 
 @pytest.mark.skip(reason="Test need to be updated")
 def test_dataset_consistency():
-    from ptbench.configs.datasets.indian import default as indian
-    from ptbench.configs.datasets.indian import fold_0 as indian_f0
-    from ptbench.configs.datasets.indian import fold_0_rgb as indian_f0_rgb
-    from ptbench.configs.datasets.indian import fold_1 as indian_f1
-    from ptbench.configs.datasets.indian import fold_1_rgb as indian_f1_rgb
-    from ptbench.configs.datasets.indian import fold_2 as indian_f2
-    from ptbench.configs.datasets.indian import fold_2_rgb as indian_f2_rgb
-    from ptbench.configs.datasets.indian import fold_3 as indian_f3
-    from ptbench.configs.datasets.indian import fold_3_rgb as indian_f3_rgb
-    from ptbench.configs.datasets.indian import fold_4 as indian_f4
-    from ptbench.configs.datasets.indian import fold_4_rgb as indian_f4_rgb
-    from ptbench.configs.datasets.indian import fold_5 as indian_f5
-    from ptbench.configs.datasets.indian import fold_5_rgb as indian_f5_rgb
-    from ptbench.configs.datasets.indian import fold_6 as indian_f6
-    from ptbench.configs.datasets.indian import fold_6_rgb as indian_f6_rgb
-    from ptbench.configs.datasets.indian import fold_7 as indian_f7
-    from ptbench.configs.datasets.indian import fold_7_rgb as indian_f7_rgb
-    from ptbench.configs.datasets.indian import fold_8 as indian_f8
-    from ptbench.configs.datasets.indian import fold_8_rgb as indian_f8_rgb
-    from ptbench.configs.datasets.indian import fold_9 as indian_f9
-    from ptbench.configs.datasets.indian import fold_9_rgb as indian_f9_rgb
-    from ptbench.configs.datasets.mc_ch_in_11k import default as mc_ch_in_11k
-    from ptbench.configs.datasets.mc_ch_in_11k import fold_0 as mc_ch_in_11k_f0
-    from ptbench.configs.datasets.mc_ch_in_11k import (
-        fold_0_rgb as mc_ch_in_11k_f0_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11k import fold_1 as mc_ch_in_11k_f1
-    from ptbench.configs.datasets.mc_ch_in_11k import (
-        fold_1_rgb as mc_ch_in_11k_f1_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11k import fold_2 as mc_ch_in_11k_f2
-    from ptbench.configs.datasets.mc_ch_in_11k import (
-        fold_2_rgb as mc_ch_in_11k_f2_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11k import fold_3 as mc_ch_in_11k_f3
-    from ptbench.configs.datasets.mc_ch_in_11k import (
-        fold_3_rgb as mc_ch_in_11k_f3_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11k import fold_4 as mc_ch_in_11k_f4
-    from ptbench.configs.datasets.mc_ch_in_11k import (
-        fold_4_rgb as mc_ch_in_11k_f4_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11k import fold_5 as mc_ch_in_11k_f5
-    from ptbench.configs.datasets.mc_ch_in_11k import (
-        fold_5_rgb as mc_ch_in_11k_f5_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11k import fold_6 as mc_ch_in_11k_f6
-    from ptbench.configs.datasets.mc_ch_in_11k import (
-        fold_6_rgb as mc_ch_in_11k_f6_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11k import fold_7 as mc_ch_in_11k_f7
-    from ptbench.configs.datasets.mc_ch_in_11k import (
-        fold_7_rgb as mc_ch_in_11k_f7_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11k import fold_8 as mc_ch_in_11k_f8
-    from ptbench.configs.datasets.mc_ch_in_11k import (
-        fold_8_rgb as mc_ch_in_11k_f8_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11k import fold_9 as mc_ch_in_11k_f9
-    from ptbench.configs.datasets.mc_ch_in_11k import (
-        fold_9_rgb as mc_ch_in_11k_f9_rgb,
-    )
-    from ptbench.configs.datasets.montgomery import default as mc
-    from ptbench.configs.datasets.montgomery import fold_0 as mc_f0
-    from ptbench.configs.datasets.montgomery import fold_0_rgb as mc_f0_rgb
-    from ptbench.configs.datasets.montgomery import fold_1 as mc_f1
-    from ptbench.configs.datasets.montgomery import fold_1_rgb as mc_f1_rgb
-    from ptbench.configs.datasets.montgomery import fold_2 as mc_f2
-    from ptbench.configs.datasets.montgomery import fold_2_rgb as mc_f2_rgb
-    from ptbench.configs.datasets.montgomery import fold_3 as mc_f3
-    from ptbench.configs.datasets.montgomery import fold_3_rgb as mc_f3_rgb
-    from ptbench.configs.datasets.montgomery import fold_4 as mc_f4
-    from ptbench.configs.datasets.montgomery import fold_4_rgb as mc_f4_rgb
-    from ptbench.configs.datasets.montgomery import fold_5 as mc_f5
-    from ptbench.configs.datasets.montgomery import fold_5_rgb as mc_f5_rgb
-    from ptbench.configs.datasets.montgomery import fold_6 as mc_f6
-    from ptbench.configs.datasets.montgomery import fold_6_rgb as mc_f6_rgb
-    from ptbench.configs.datasets.montgomery import fold_7 as mc_f7
-    from ptbench.configs.datasets.montgomery import fold_7_rgb as mc_f7_rgb
-    from ptbench.configs.datasets.montgomery import fold_8 as mc_f8
-    from ptbench.configs.datasets.montgomery import fold_8_rgb as mc_f8_rgb
-    from ptbench.configs.datasets.montgomery import fold_9 as mc_f9
-    from ptbench.configs.datasets.montgomery import fold_9_rgb as mc_f9_rgb
-    from ptbench.configs.datasets.shenzhen import default as ch
-    from ptbench.configs.datasets.shenzhen import fold_0 as ch_f0
-    from ptbench.configs.datasets.shenzhen import fold_0_rgb as ch_f0_rgb
-    from ptbench.configs.datasets.shenzhen import fold_1 as ch_f1
-    from ptbench.configs.datasets.shenzhen import fold_1_rgb as ch_f1_rgb
-    from ptbench.configs.datasets.shenzhen import fold_2 as ch_f2
-    from ptbench.configs.datasets.shenzhen import fold_2_rgb as ch_f2_rgb
-    from ptbench.configs.datasets.shenzhen import fold_3 as ch_f3
-    from ptbench.configs.datasets.shenzhen import fold_3_rgb as ch_f3_rgb
-    from ptbench.configs.datasets.shenzhen import fold_4 as ch_f4
-    from ptbench.configs.datasets.shenzhen import fold_4_rgb as ch_f4_rgb
-    from ptbench.configs.datasets.shenzhen import fold_5 as ch_f5
-    from ptbench.configs.datasets.shenzhen import fold_5_rgb as ch_f5_rgb
-    from ptbench.configs.datasets.shenzhen import fold_6 as ch_f6
-    from ptbench.configs.datasets.shenzhen import fold_6_rgb as ch_f6_rgb
-    from ptbench.configs.datasets.shenzhen import fold_7 as ch_f7
-    from ptbench.configs.datasets.shenzhen import fold_7_rgb as ch_f7_rgb
-    from ptbench.configs.datasets.shenzhen import fold_8 as ch_f8
-    from ptbench.configs.datasets.shenzhen import fold_8_rgb as ch_f8_rgb
-    from ptbench.configs.datasets.shenzhen import fold_9 as ch_f9
-    from ptbench.configs.datasets.shenzhen import fold_9_rgb as ch_f9_rgb
-    from ptbench.configs.datasets.tbx11k_simplified import default as tbx11k
-    from ptbench.configs.datasets.tbx11k_simplified import fold_0 as tbx11k_f0
-    from ptbench.configs.datasets.tbx11k_simplified import (
-        fold_0_rgb as tbx11k_f0_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified import fold_1 as tbx11k_f1
-    from ptbench.configs.datasets.tbx11k_simplified import (
-        fold_1_rgb as tbx11k_f1_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified import fold_2 as tbx11k_f2
-    from ptbench.configs.datasets.tbx11k_simplified import (
-        fold_2_rgb as tbx11k_f2_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified import fold_3 as tbx11k_f3
-    from ptbench.configs.datasets.tbx11k_simplified import (
-        fold_3_rgb as tbx11k_f3_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified import fold_4 as tbx11k_f4
-    from ptbench.configs.datasets.tbx11k_simplified import (
-        fold_4_rgb as tbx11k_f4_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified import fold_5 as tbx11k_f5
-    from ptbench.configs.datasets.tbx11k_simplified import (
-        fold_5_rgb as tbx11k_f5_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified import fold_6 as tbx11k_f6
-    from ptbench.configs.datasets.tbx11k_simplified import (
-        fold_6_rgb as tbx11k_f6_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified import fold_7 as tbx11k_f7
-    from ptbench.configs.datasets.tbx11k_simplified import (
-        fold_7_rgb as tbx11k_f7_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified import fold_8 as tbx11k_f8
-    from ptbench.configs.datasets.tbx11k_simplified import (
-        fold_8_rgb as tbx11k_f8_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified import fold_9 as tbx11k_f9
-    from ptbench.configs.datasets.tbx11k_simplified import (
-        fold_9_rgb as tbx11k_f9_rgb,
-    )
+    from ptbench.data.indian import default as indian
+    from ptbench.data.indian import fold_0 as indian_f0
+    from ptbench.data.indian import fold_1 as indian_f1
+    from ptbench.data.indian import fold_2 as indian_f2
+    from ptbench.data.indian import fold_3 as indian_f3
+    from ptbench.data.indian import fold_4 as indian_f4
+    from ptbench.data.indian import fold_5 as indian_f5
+    from ptbench.data.indian import fold_6 as indian_f6
+    from ptbench.data.indian import fold_7 as indian_f7
+    from ptbench.data.indian import fold_8 as indian_f8
+    from ptbench.data.indian import fold_9 as indian_f9
+    from ptbench.data.montgomery import default as mc
+    from ptbench.data.montgomery import fold_0 as mc_f0
+    from ptbench.data.montgomery import fold_1 as mc_f1
+    from ptbench.data.montgomery import fold_2 as mc_f2
+    from ptbench.data.montgomery import fold_3 as mc_f3
+    from ptbench.data.montgomery import fold_4 as mc_f4
+    from ptbench.data.montgomery import fold_5 as mc_f5
+    from ptbench.data.montgomery import fold_6 as mc_f6
+    from ptbench.data.montgomery import fold_7 as mc_f7
+    from ptbench.data.montgomery import fold_8 as mc_f8
+    from ptbench.data.montgomery import fold_9 as mc_f9
+    from ptbench.data.montgomery_shenzhen_indian_tbx11k import (
+        v1_fold_1 as mc_ch_in_11k_f1,
+    )
+    from ptbench.data.montgomery_shenzhen_indian_tbx11k import (
+        v1_fold_2 as mc_ch_in_11k_f2,
+    )
+    from ptbench.data.montgomery_shenzhen_indian_tbx11k import (
+        v1_fold_3 as mc_ch_in_11k_f3,
+    )
+    from ptbench.data.montgomery_shenzhen_indian_tbx11k import (
+        v1_fold_4 as mc_ch_in_11k_f4,
+    )
+    from ptbench.data.montgomery_shenzhen_indian_tbx11k import (
+        v1_fold_5 as mc_ch_in_11k_f5,
+    )
+    from ptbench.data.montgomery_shenzhen_indian_tbx11k import (
+        v1_fold_6 as mc_ch_in_11k_f6,
+    )
+    from ptbench.data.montgomery_shenzhen_indian_tbx11k import (
+        v1_fold_7 as mc_ch_in_11k_f7,
+    )
+    from ptbench.data.montgomery_shenzhen_indian_tbx11k import (
+        v1_fold_8 as mc_ch_in_11k_f8,
+    )
+    from ptbench.data.montgomery_shenzhen_indian_tbx11k import (
+        v1_fold_9 as mc_ch_in_11k_f9,
+    )
+    from ptbench.data.montgomery_shenzhen_indian_tbx11k import (
+        v1_healthy_vs_atb as mc_ch_in_11k,
+    )
+    from ptbench.data.shenzhen import default as ch
+    from ptbench.data.shenzhen import fold_0 as ch_f0
+    from ptbench.data.shenzhen import fold_1 as ch_f1
+    from ptbench.data.shenzhen import fold_2 as ch_f2
+    from ptbench.data.shenzhen import fold_3 as ch_f3
+    from ptbench.data.shenzhen import fold_4 as ch_f4
+    from ptbench.data.shenzhen import fold_5 as ch_f5
+    from ptbench.data.shenzhen import fold_6 as ch_f6
+    from ptbench.data.shenzhen import fold_7 as ch_f7
+    from ptbench.data.shenzhen import fold_8 as ch_f8
+    from ptbench.data.shenzhen import fold_9 as ch_f9
+    from ptbench.data.tbx11k import v1_fold_0 as tbx11k_f0
+    from ptbench.data.tbx11k import v1_fold_1 as tbx11k_f1
+    from ptbench.data.tbx11k import v1_fold_2 as tbx11k_f2
+    from ptbench.data.tbx11k import v1_fold_3 as tbx11k_f3
+    from ptbench.data.tbx11k import v1_fold_4 as tbx11k_f4
+    from ptbench.data.tbx11k import v1_fold_5 as tbx11k_f5
+    from ptbench.data.tbx11k import v1_fold_6 as tbx11k_f6
+    from ptbench.data.tbx11k import v1_fold_7 as tbx11k_f7
+    from ptbench.data.tbx11k import v1_fold_8 as tbx11k_f8
+    from ptbench.data.tbx11k import v1_fold_9 as tbx11k_f9
+    from ptbench.data.tbx11k import v1_healthy_vs_atb as tbx11k
 
     # Default protocol
     mc_ch_in_11k_dataset = mc_ch_in_11k.dataset
diff --git a/tests/test_mc_ch_in_11kv2.py b/tests/test_mc_ch_in_11kv2.py
index a4d801d6cc7f61a0ced15b0dfa9c6de52f573986..64f942d9a9e7d799c9255a3146164fa2879a411a 100644
--- a/tests/test_mc_ch_in_11kv2.py
+++ b/tests/test_mc_ch_in_11kv2.py
@@ -8,191 +8,63 @@ import pytest
 
 @pytest.mark.skip(reason="Test need to be updated")
 def test_dataset_consistency():
-    from ptbench.configs.datasets.indian import default as indian
-    from ptbench.configs.datasets.indian import fold_0 as indian_f0
-    from ptbench.configs.datasets.indian import fold_0_rgb as indian_f0_rgb
-    from ptbench.configs.datasets.indian import fold_1 as indian_f1
-    from ptbench.configs.datasets.indian import fold_1_rgb as indian_f1_rgb
-    from ptbench.configs.datasets.indian import fold_2 as indian_f2
-    from ptbench.configs.datasets.indian import fold_2_rgb as indian_f2_rgb
-    from ptbench.configs.datasets.indian import fold_3 as indian_f3
-    from ptbench.configs.datasets.indian import fold_3_rgb as indian_f3_rgb
-    from ptbench.configs.datasets.indian import fold_4 as indian_f4
-    from ptbench.configs.datasets.indian import fold_4_rgb as indian_f4_rgb
-    from ptbench.configs.datasets.indian import fold_5 as indian_f5
-    from ptbench.configs.datasets.indian import fold_5_rgb as indian_f5_rgb
-    from ptbench.configs.datasets.indian import fold_6 as indian_f6
-    from ptbench.configs.datasets.indian import fold_6_rgb as indian_f6_rgb
-    from ptbench.configs.datasets.indian import fold_7 as indian_f7
-    from ptbench.configs.datasets.indian import fold_7_rgb as indian_f7_rgb
-    from ptbench.configs.datasets.indian import fold_8 as indian_f8
-    from ptbench.configs.datasets.indian import fold_8_rgb as indian_f8_rgb
-    from ptbench.configs.datasets.indian import fold_9 as indian_f9
-    from ptbench.configs.datasets.indian import fold_9_rgb as indian_f9_rgb
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import default as mc_ch_in_11k
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_0 as mc_ch_in_11k_f0,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_0_rgb as mc_ch_in_11k_f0_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_1 as mc_ch_in_11k_f1,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_1_rgb as mc_ch_in_11k_f1_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_2 as mc_ch_in_11k_f2,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_2_rgb as mc_ch_in_11k_f2_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_3 as mc_ch_in_11k_f3,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_3_rgb as mc_ch_in_11k_f3_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_4 as mc_ch_in_11k_f4,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_4_rgb as mc_ch_in_11k_f4_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_5 as mc_ch_in_11k_f5,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_5_rgb as mc_ch_in_11k_f5_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_6 as mc_ch_in_11k_f6,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_6_rgb as mc_ch_in_11k_f6_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_7 as mc_ch_in_11k_f7,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_7_rgb as mc_ch_in_11k_f7_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_8 as mc_ch_in_11k_f8,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_8_rgb as mc_ch_in_11k_f8_rgb,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_9 as mc_ch_in_11k_f9,
-    )
-    from ptbench.configs.datasets.mc_ch_in_11kv2 import (
-        fold_9_rgb as mc_ch_in_11k_f9_rgb,
-    )
-    from ptbench.configs.datasets.montgomery import default as mc
-    from ptbench.configs.datasets.montgomery import fold_0 as mc_f0
-    from ptbench.configs.datasets.montgomery import fold_0_rgb as mc_f0_rgb
-    from ptbench.configs.datasets.montgomery import fold_1 as mc_f1
-    from ptbench.configs.datasets.montgomery import fold_1_rgb as mc_f1_rgb
-    from ptbench.configs.datasets.montgomery import fold_2 as mc_f2
-    from ptbench.configs.datasets.montgomery import fold_2_rgb as mc_f2_rgb
-    from ptbench.configs.datasets.montgomery import fold_3 as mc_f3
-    from ptbench.configs.datasets.montgomery import fold_3_rgb as mc_f3_rgb
-    from ptbench.configs.datasets.montgomery import fold_4 as mc_f4
-    from ptbench.configs.datasets.montgomery import fold_4_rgb as mc_f4_rgb
-    from ptbench.configs.datasets.montgomery import fold_5 as mc_f5
-    from ptbench.configs.datasets.montgomery import fold_5_rgb as mc_f5_rgb
-    from ptbench.configs.datasets.montgomery import fold_6 as mc_f6
-    from ptbench.configs.datasets.montgomery import fold_6_rgb as mc_f6_rgb
-    from ptbench.configs.datasets.montgomery import fold_7 as mc_f7
-    from ptbench.configs.datasets.montgomery import fold_7_rgb as mc_f7_rgb
-    from ptbench.configs.datasets.montgomery import fold_8 as mc_f8
-    from ptbench.configs.datasets.montgomery import fold_8_rgb as mc_f8_rgb
-    from ptbench.configs.datasets.montgomery import fold_9 as mc_f9
-    from ptbench.configs.datasets.montgomery import fold_9_rgb as mc_f9_rgb
-    from ptbench.configs.datasets.shenzhen import default as ch
-    from ptbench.configs.datasets.shenzhen import fold_0 as ch_f0
-    from ptbench.configs.datasets.shenzhen import fold_0_rgb as ch_f0_rgb
-    from ptbench.configs.datasets.shenzhen import fold_1 as ch_f1
-    from ptbench.configs.datasets.shenzhen import fold_1_rgb as ch_f1_rgb
-    from ptbench.configs.datasets.shenzhen import fold_2 as ch_f2
-    from ptbench.configs.datasets.shenzhen import fold_2_rgb as ch_f2_rgb
-    from ptbench.configs.datasets.shenzhen import fold_3 as ch_f3
-    from ptbench.configs.datasets.shenzhen import fold_3_rgb as ch_f3_rgb
-    from ptbench.configs.datasets.shenzhen import fold_4 as ch_f4
-    from ptbench.configs.datasets.shenzhen import fold_4_rgb as ch_f4_rgb
-    from ptbench.configs.datasets.shenzhen import fold_5 as ch_f5
-    from ptbench.configs.datasets.shenzhen import fold_5_rgb as ch_f5_rgb
-    from ptbench.configs.datasets.shenzhen import fold_6 as ch_f6
-    from ptbench.configs.datasets.shenzhen import fold_6_rgb as ch_f6_rgb
-    from ptbench.configs.datasets.shenzhen import fold_7 as ch_f7
-    from ptbench.configs.datasets.shenzhen import fold_7_rgb as ch_f7_rgb
-    from ptbench.configs.datasets.shenzhen import fold_8 as ch_f8
-    from ptbench.configs.datasets.shenzhen import fold_8_rgb as ch_f8_rgb
-    from ptbench.configs.datasets.shenzhen import fold_9 as ch_f9
-    from ptbench.configs.datasets.shenzhen import fold_9_rgb as ch_f9_rgb
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import default as tbx11k
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_0 as tbx11k_f0,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_0_rgb as tbx11k_f0_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_1 as tbx11k_f1,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_1_rgb as tbx11k_f1_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_2 as tbx11k_f2,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_2_rgb as tbx11k_f2_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_3 as tbx11k_f3,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_3_rgb as tbx11k_f3_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_4 as tbx11k_f4,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_4_rgb as tbx11k_f4_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_5 as tbx11k_f5,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_5_rgb as tbx11k_f5_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_6 as tbx11k_f6,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_6_rgb as tbx11k_f6_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_7 as tbx11k_f7,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_7_rgb as tbx11k_f7_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_8 as tbx11k_f8,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_8_rgb as tbx11k_f8_rgb,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_9 as tbx11k_f9,
-    )
-    from ptbench.configs.datasets.tbx11k_simplified_v2 import (
-        fold_9_rgb as tbx11k_f9_rgb,
-    )
+    from ptbench.data.indian import default as indian
+    from ptbench.data.indian import fold_0 as indian_f0
+    from ptbench.data.indian import fold_1 as indian_f1
+    from ptbench.data.indian import fold_2 as indian_f2
+    from ptbench.data.indian import fold_3 as indian_f3
+    from ptbench.data.indian import fold_4 as indian_f4
+    from ptbench.data.indian import fold_5 as indian_f5
+    from ptbench.data.indian import fold_6 as indian_f6
+    from ptbench.data.indian import fold_7 as indian_f7
+    from ptbench.data.indian import fold_8 as indian_f8
+    from ptbench.data.indian import fold_9 as indian_f9
+    from ptbench.data.mc_ch_in_11kv2 import fold_0 as mc_ch_in_11k_f0
+    from ptbench.data.mc_ch_in_11kv2 import fold_1 as mc_ch_in_11k_f1
+    from ptbench.data.mc_ch_in_11kv2 import fold_2 as mc_ch_in_11k_f2
+    from ptbench.data.mc_ch_in_11kv2 import fold_3 as mc_ch_in_11k_f3
+    from ptbench.data.mc_ch_in_11kv2 import fold_4 as mc_ch_in_11k_f4
+    from ptbench.data.mc_ch_in_11kv2 import fold_5 as mc_ch_in_11k_f5
+    from ptbench.data.mc_ch_in_11kv2 import fold_6 as mc_ch_in_11k_f6
+    from ptbench.data.mc_ch_in_11kv2 import fold_7 as mc_ch_in_11k_f7
+    from ptbench.data.mc_ch_in_11kv2 import fold_8 as mc_ch_in_11k_f8
+    from ptbench.data.mc_ch_in_11kv2 import fold_9 as mc_ch_in_11k_f9
+    from ptbench.data.montgomery import default as mc
+    from ptbench.data.montgomery import fold_0 as mc_f0
+    from ptbench.data.montgomery import fold_1 as mc_f1
+    from ptbench.data.montgomery import fold_2 as mc_f2
+    from ptbench.data.montgomery import fold_3 as mc_f3
+    from ptbench.data.montgomery import fold_4 as mc_f4
+    from ptbench.data.montgomery import fold_5 as mc_f5
+    from ptbench.data.montgomery import fold_6 as mc_f6
+    from ptbench.data.montgomery import fold_7 as mc_f7
+    from ptbench.data.montgomery import fold_8 as mc_f8
+    from ptbench.data.montgomery import fold_9 as mc_f9
+    from ptbench.data.montgomery_shenzhen_indian_tbx11k import (
+        v2_others_vs_atb as mc_ch_in_11k,
+    )
+    from ptbench.data.shenzhen import default as ch
+    from ptbench.data.shenzhen import fold_0 as ch_f0
+    from ptbench.data.shenzhen import fold_1 as ch_f1
+    from ptbench.data.shenzhen import fold_2 as ch_f2
+    from ptbench.data.shenzhen import fold_3 as ch_f3
+    from ptbench.data.shenzhen import fold_4 as ch_f4
+    from ptbench.data.shenzhen import fold_5 as ch_f5
+    from ptbench.data.shenzhen import fold_6 as ch_f6
+    from ptbench.data.shenzhen import fold_7 as ch_f7
+    from ptbench.data.shenzhen import fold_8 as ch_f8
+    from ptbench.data.shenzhen import fold_9 as ch_f9
+    from ptbench.data.tbx11k_simplified_v2 import default as tbx11k
+    from ptbench.data.tbx11k_simplified_v2 import fold_0 as tbx11k_f0
+    from ptbench.data.tbx11k_simplified_v2 import fold_1 as tbx11k_f1
+    from ptbench.data.tbx11k_simplified_v2 import fold_2 as tbx11k_f2
+    from ptbench.data.tbx11k_simplified_v2 import fold_3 as tbx11k_f3
+    from ptbench.data.tbx11k_simplified_v2 import fold_4 as tbx11k_f4
+    from ptbench.data.tbx11k_simplified_v2 import fold_5 as tbx11k_f5
+    from ptbench.data.tbx11k_simplified_v2 import fold_6 as tbx11k_f6
+    from ptbench.data.tbx11k_simplified_v2 import fold_7 as tbx11k_f7
+    from ptbench.data.tbx11k_simplified_v2 import fold_8 as tbx11k_f8
+    from ptbench.data.tbx11k_simplified_v2 import fold_9 as tbx11k_f9
 
     # Default protocol
     mc_ch_in_11k_dataset = mc_ch_in_11k.dataset
diff --git a/tests/test_mc_ch_in_pc.py b/tests/test_mc_ch_in_pc.py
index 8aa38bef456e8f153ab596f09f26baa4a2c42788..a1e4fc121fd3c5ae73aca7ac8fdde0abec6959a6 100644
--- a/tests/test_mc_ch_in_pc.py
+++ b/tests/test_mc_ch_in_pc.py
@@ -8,11 +8,13 @@ import pytest
 
 @pytest.mark.skip(reason="Test need to be updated")
 def test_dataset_consistency():
-    from ptbench.configs.datasets.indian import default as indian
-    from ptbench.configs.datasets.mc_ch_in_pc import default as mc_ch_in_pc
-    from ptbench.configs.datasets.montgomery import default as mc
-    from ptbench.configs.datasets.padchest import tb_idiap as pc
-    from ptbench.configs.datasets.shenzhen import default as ch
+    from ptbench.data.indian import default as indian
+    from ptbench.data.montgomery import default as mc
+    from ptbench.data.montgomery_shenzhen_indian_padchest import (
+        default as mc_ch_in_pc,
+    )
+    from ptbench.data.padchest import tb_idiap as pc
+    from ptbench.data.shenzhen import default as ch
 
     # Default protocol
     mc_ch_in_pc_dataset = mc_ch_in_pc.dataset
diff --git a/tests/test_nih_cxr14_pc.py b/tests/test_nih_cxr14_pc.py
index 05ae5a13ec648b75e566646330a9803fda22b453..6199ad54f6a1673aaab1d6141de0d832a6c1bbf2 100644
--- a/tests/test_nih_cxr14_pc.py
+++ b/tests/test_nih_cxr14_pc.py
@@ -8,9 +8,9 @@ import pytest
 
 @pytest.mark.skip(reason="Test need to be updated")
 def test_dataset_consistency():
-    from ptbench.configs.datasets.nih_cxr14_re import default as nih
-    from ptbench.configs.datasets.nih_cxr14_re_pc import idiap as nih_pc
-    from ptbench.configs.datasets.padchest import no_tb_idiap as pc
+    from ptbench.data.nih_cxr14 import default as nih
+    from ptbench.data.nih_cxr14_padchest import idiap as nih_pc
+    from ptbench.data.padchest import no_tb_idiap as pc
 
     # Default protocol
     nih_pc_dataset = nih_pc.dataset
diff --git a/tests/test_summary.py b/tests/test_summary.py
index 1f178fdc91dacf4a99eca3ced83d6628cca749d4..de8c55c586ddd9c8fef224833a62c8df3aafd85d 100644
--- a/tests/test_summary.py
+++ b/tests/test_summary.py
@@ -4,7 +4,7 @@
 
 import unittest
 
-import ptbench.configs.models.pasa as pasa_config
+import ptbench.models.config.pasa as pasa_config
 
 from ptbench.utils.summary import summary