diff --git a/config/yugabyte/non-colocated-single-tablet/deletes_batched_extra_index_0.yaml b/config/yugabyte/non-colocated/deletes_batched_extra_index_0.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/deletes_batched_extra_index_0.yaml
rename to config/yugabyte/non-colocated/deletes_batched_extra_index_0.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/deletes_batched_extra_index_1.yaml b/config/yugabyte/non-colocated/deletes_batched_extra_index_1.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/deletes_batched_extra_index_1.yaml
rename to config/yugabyte/non-colocated/deletes_batched_extra_index_1.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/deletes_batched_extra_index_10.yaml b/config/yugabyte/non-colocated/deletes_batched_extra_index_10.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/deletes_batched_extra_index_10.yaml
rename to config/yugabyte/non-colocated/deletes_batched_extra_index_10.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/deletes_batched_extra_index_2.yaml b/config/yugabyte/non-colocated/deletes_batched_extra_index_2.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/deletes_batched_extra_index_2.yaml
rename to config/yugabyte/non-colocated/deletes_batched_extra_index_2.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/deletes_batched_extra_index_3.yaml b/config/yugabyte/non-colocated/deletes_batched_extra_index_3.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/deletes_batched_extra_index_3.yaml
rename to config/yugabyte/non-colocated/deletes_batched_extra_index_3.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/deletes_batched_extra_index_5.yaml b/config/yugabyte/non-colocated/deletes_batched_extra_index_5.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/deletes_batched_extra_index_5.yaml
rename to config/yugabyte/non-colocated/deletes_batched_extra_index_5.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/deletes_sequential_extra_index_0.yaml b/config/yugabyte/non-colocated/deletes_sequential_extra_index_0.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/deletes_sequential_extra_index_0.yaml
rename to config/yugabyte/non-colocated/deletes_sequential_extra_index_0.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/deletes_sequential_extra_index_1.yaml b/config/yugabyte/non-colocated/deletes_sequential_extra_index_1.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/deletes_sequential_extra_index_1.yaml
rename to config/yugabyte/non-colocated/deletes_sequential_extra_index_1.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/deletes_sequential_extra_index_10.yaml b/config/yugabyte/non-colocated/deletes_sequential_extra_index_10.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/deletes_sequential_extra_index_10.yaml
rename to config/yugabyte/non-colocated/deletes_sequential_extra_index_10.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/deletes_sequential_extra_index_2.yaml b/config/yugabyte/non-colocated/deletes_sequential_extra_index_2.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/deletes_sequential_extra_index_2.yaml
rename to config/yugabyte/non-colocated/deletes_sequential_extra_index_2.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/deletes_sequential_extra_index_3.yaml b/config/yugabyte/non-colocated/deletes_sequential_extra_index_3.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/deletes_sequential_extra_index_3.yaml
rename to config/yugabyte/non-colocated/deletes_sequential_extra_index_3.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/deletes_sequential_extra_index_5.yaml b/config/yugabyte/non-colocated/deletes_sequential_extra_index_5.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/deletes_sequential_extra_index_5.yaml
rename to config/yugabyte/non-colocated/deletes_sequential_extra_index_5.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/insert_batched_extra_index_0.yaml b/config/yugabyte/non-colocated/insert_batched_extra_index_0.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/insert_batched_extra_index_0.yaml
rename to config/yugabyte/non-colocated/insert_batched_extra_index_0.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/insert_batched_extra_index_1.yaml b/config/yugabyte/non-colocated/insert_batched_extra_index_1.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/insert_batched_extra_index_1.yaml
rename to config/yugabyte/non-colocated/insert_batched_extra_index_1.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/insert_batched_extra_index_10.yaml b/config/yugabyte/non-colocated/insert_batched_extra_index_10.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/insert_batched_extra_index_10.yaml
rename to config/yugabyte/non-colocated/insert_batched_extra_index_10.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/insert_batched_extra_index_2.yaml b/config/yugabyte/non-colocated/insert_batched_extra_index_2.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/insert_batched_extra_index_2.yaml
rename to config/yugabyte/non-colocated/insert_batched_extra_index_2.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/insert_batched_extra_index_3.yaml b/config/yugabyte/non-colocated/insert_batched_extra_index_3.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/insert_batched_extra_index_3.yaml
rename to config/yugabyte/non-colocated/insert_batched_extra_index_3.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/insert_batched_extra_index_5.yaml b/config/yugabyte/non-colocated/insert_batched_extra_index_5.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/insert_batched_extra_index_5.yaml
rename to config/yugabyte/non-colocated/insert_batched_extra_index_5.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/insert_sequential_extra_index_0.yaml b/config/yugabyte/non-colocated/insert_sequential_extra_index_0.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/insert_sequential_extra_index_0.yaml
rename to config/yugabyte/non-colocated/insert_sequential_extra_index_0.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/insert_sequential_extra_index_1.yaml b/config/yugabyte/non-colocated/insert_sequential_extra_index_1.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/insert_sequential_extra_index_1.yaml
rename to config/yugabyte/non-colocated/insert_sequential_extra_index_1.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/insert_sequential_extra_index_10.yaml b/config/yugabyte/non-colocated/insert_sequential_extra_index_10.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/insert_sequential_extra_index_10.yaml
rename to config/yugabyte/non-colocated/insert_sequential_extra_index_10.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/insert_sequential_extra_index_2.yaml b/config/yugabyte/non-colocated/insert_sequential_extra_index_2.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/insert_sequential_extra_index_2.yaml
rename to config/yugabyte/non-colocated/insert_sequential_extra_index_2.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/insert_sequential_extra_index_3.yaml b/config/yugabyte/non-colocated/insert_sequential_extra_index_3.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/insert_sequential_extra_index_3.yaml
rename to config/yugabyte/non-colocated/insert_sequential_extra_index_3.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/insert_sequential_extra_index_5.yaml b/config/yugabyte/non-colocated/insert_sequential_extra_index_5.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/insert_sequential_extra_index_5.yaml
rename to config/yugabyte/non-colocated/insert_sequential_extra_index_5.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/updates_batched_extra_index_0.yaml b/config/yugabyte/non-colocated/updates_batched_extra_index_0.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/updates_batched_extra_index_0.yaml
rename to config/yugabyte/non-colocated/updates_batched_extra_index_0.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/updates_batched_extra_index_1.yaml b/config/yugabyte/non-colocated/updates_batched_extra_index_1.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/updates_batched_extra_index_1.yaml
rename to config/yugabyte/non-colocated/updates_batched_extra_index_1.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/updates_batched_extra_index_10.yaml b/config/yugabyte/non-colocated/updates_batched_extra_index_10.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/updates_batched_extra_index_10.yaml
rename to config/yugabyte/non-colocated/updates_batched_extra_index_10.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/updates_batched_extra_index_2.yaml b/config/yugabyte/non-colocated/updates_batched_extra_index_2.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/updates_batched_extra_index_2.yaml
rename to config/yugabyte/non-colocated/updates_batched_extra_index_2.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/updates_batched_extra_index_3.yaml b/config/yugabyte/non-colocated/updates_batched_extra_index_3.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/updates_batched_extra_index_3.yaml
rename to config/yugabyte/non-colocated/updates_batched_extra_index_3.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/updates_batched_extra_index_5.yaml b/config/yugabyte/non-colocated/updates_batched_extra_index_5.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/updates_batched_extra_index_5.yaml
rename to config/yugabyte/non-colocated/updates_batched_extra_index_5.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/updates_sequential_extra_index_0.yaml b/config/yugabyte/non-colocated/updates_sequential_extra_index_0.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/updates_sequential_extra_index_0.yaml
rename to config/yugabyte/non-colocated/updates_sequential_extra_index_0.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/updates_sequential_extra_index_1.yaml b/config/yugabyte/non-colocated/updates_sequential_extra_index_1.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/updates_sequential_extra_index_1.yaml
rename to config/yugabyte/non-colocated/updates_sequential_extra_index_1.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/updates_sequential_extra_index_10.yaml b/config/yugabyte/non-colocated/updates_sequential_extra_index_10.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/updates_sequential_extra_index_10.yaml
rename to config/yugabyte/non-colocated/updates_sequential_extra_index_10.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/updates_sequential_extra_index_2.yaml b/config/yugabyte/non-colocated/updates_sequential_extra_index_2.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/updates_sequential_extra_index_2.yaml
rename to config/yugabyte/non-colocated/updates_sequential_extra_index_2.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/updates_sequential_extra_index_3.yaml b/config/yugabyte/non-colocated/updates_sequential_extra_index_3.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/updates_sequential_extra_index_3.yaml
rename to config/yugabyte/non-colocated/updates_sequential_extra_index_3.yaml
diff --git a/config/yugabyte/non-colocated-single-tablet/updates_sequential_extra_index_5.yaml b/config/yugabyte/non-colocated/updates_sequential_extra_index_5.yaml
similarity index 100%
rename from config/yugabyte/non-colocated-single-tablet/updates_sequential_extra_index_5.yaml
rename to config/yugabyte/non-colocated/updates_sequential_extra_index_5.yaml