diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/16gheap.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/16gheap.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/16gheap.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/16gheap.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/1gheap.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/1gheap.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/1gheap.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/1gheap.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/24gheap.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/24gheap.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/24gheap.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/24gheap.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/2gheap.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/2gheap.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/2gheap.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/2gheap.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/4gheap.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/4gheap.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/4gheap.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/4gheap.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/8gheap.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/8gheap.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/8gheap.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/8gheap.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/basic-license.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/basic-license.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/basic-license.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/basic-license.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/dbg_non_safepoints/templates/config/jvm.options b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/dbg_non_safepoints/templates/config/jvm.options
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/dbg_non_safepoints/templates/config/jvm.options
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/dbg_non_safepoints/templates/config/jvm.options
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/debug-non-safepoints.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/debug-non-safepoints.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/debug-non-safepoints.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/debug-non-safepoints.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/default_distro/config.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/default_distro/config.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/default_distro/config.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/default_distro/config.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/default_distro/templates/config/opensearch.yml b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/default_distro/templates/config/opensearch.yml
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/default_distro/templates/config/opensearch.yml
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/default_distro/templates/config/opensearch.yml
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/defaults.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/defaults.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/defaults.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/defaults.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/ea.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/ea.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/ea.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/ea.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/ea/templates/config/jvm.options b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/ea/templates/config/jvm.options
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/ea/templates/config/jvm.options
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/ea/templates/config/jvm.options
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/fp.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/fp.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/fp.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/fp.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/fp/templates/config/jvm.options b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/fp/templates/config/jvm.options
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/fp/templates/config/jvm.options
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/fp/templates/config/jvm.options
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/g1gc.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/g1gc.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/g1gc.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/g1gc.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/trial-license.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/trial-license.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/trial-license.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/trial-license.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/unpooled.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/unpooled.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/unpooled.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/unpooled.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/unpooled/templates/config/jvm.options b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/unpooled/templates/config/jvm.options
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/unpooled/templates/config/jvm.options
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/unpooled/templates/config/jvm.options
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/vanilla/README.md b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/vanilla/README.md
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/vanilla/README.md
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/vanilla/README.md
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/vanilla/config.ini b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/vanilla/config.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/vanilla/config.ini
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/vanilla/config.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/vanilla/templates/config/jvm.options b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/vanilla/templates/config/jvm.options
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/vanilla/templates/config/jvm.options
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/vanilla/templates/config/jvm.options
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/vanilla/templates/config/log4j2.properties b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/vanilla/templates/config/log4j2.properties
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/vanilla/templates/config/log4j2.properties
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/vanilla/templates/config/log4j2.properties
diff --git a/osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/vanilla/templates/config/opensearch.yml b/osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/vanilla/templates/config/opensearch.yml
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/cluster_configs/v1/vanilla/templates/config/opensearch.yml
rename to osbenchmark/resources/cluster_configs/1.0/cluster_configs/v1/vanilla/templates/config/opensearch.yml
diff --git a/osbenchmark/resources/provision_configs/1.0/plugins/v1/core-plugins.txt b/osbenchmark/resources/cluster_configs/1.0/plugins/v1/core-plugins.txt
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/plugins/v1/core-plugins.txt
rename to osbenchmark/resources/cluster_configs/1.0/plugins/v1/core-plugins.txt
diff --git a/osbenchmark/resources/provision_configs/1.0/plugins/v1/repository_azure/README.md b/osbenchmark/resources/cluster_configs/1.0/plugins/v1/repository_azure/README.md
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/plugins/v1/repository_azure/README.md
rename to osbenchmark/resources/cluster_configs/1.0/plugins/v1/repository_azure/README.md
diff --git a/osbenchmark/resources/provision_configs/1.0/plugins/v1/repository_azure/plugin.py b/osbenchmark/resources/cluster_configs/1.0/plugins/v1/repository_azure/plugin.py
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/plugins/v1/repository_azure/plugin.py
rename to osbenchmark/resources/cluster_configs/1.0/plugins/v1/repository_azure/plugin.py
diff --git a/osbenchmark/resources/provision_configs/1.0/plugins/v1/repository_gcs/README.md b/osbenchmark/resources/cluster_configs/1.0/plugins/v1/repository_gcs/README.md
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/plugins/v1/repository_gcs/README.md
rename to osbenchmark/resources/cluster_configs/1.0/plugins/v1/repository_gcs/README.md
diff --git a/osbenchmark/resources/provision_configs/1.0/plugins/v1/repository_gcs/plugin.py b/osbenchmark/resources/cluster_configs/1.0/plugins/v1/repository_gcs/plugin.py
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/plugins/v1/repository_gcs/plugin.py
rename to osbenchmark/resources/cluster_configs/1.0/plugins/v1/repository_gcs/plugin.py
diff --git a/osbenchmark/resources/provision_configs/1.0/plugins/v1/repository_s3/README.md b/osbenchmark/resources/cluster_configs/1.0/plugins/v1/repository_s3/README.md
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/plugins/v1/repository_s3/README.md
rename to osbenchmark/resources/cluster_configs/1.0/plugins/v1/repository_s3/README.md
diff --git a/osbenchmark/resources/provision_configs/1.0/plugins/v1/repository_s3/plugin.py b/osbenchmark/resources/cluster_configs/1.0/plugins/v1/repository_s3/plugin.py
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/plugins/v1/repository_s3/plugin.py
rename to osbenchmark/resources/cluster_configs/1.0/plugins/v1/repository_s3/plugin.py
diff --git a/osbenchmark/resources/provision_configs/1.0/plugins/v1/transport_nio/default/templates/config/opensearch.yml b/osbenchmark/resources/cluster_configs/1.0/plugins/v1/transport_nio/default/templates/config/opensearch.yml
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/plugins/v1/transport_nio/default/templates/config/opensearch.yml
rename to osbenchmark/resources/cluster_configs/1.0/plugins/v1/transport_nio/default/templates/config/opensearch.yml
diff --git a/osbenchmark/resources/provision_configs/1.0/plugins/v1/transport_nio/http.ini b/osbenchmark/resources/cluster_configs/1.0/plugins/v1/transport_nio/http.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/plugins/v1/transport_nio/http.ini
rename to osbenchmark/resources/cluster_configs/1.0/plugins/v1/transport_nio/http.ini
diff --git a/osbenchmark/resources/provision_configs/1.0/plugins/v1/transport_nio/transport.ini b/osbenchmark/resources/cluster_configs/1.0/plugins/v1/transport_nio/transport.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/1.0/plugins/v1/transport_nio/transport.ini
rename to osbenchmark/resources/cluster_configs/1.0/plugins/v1/transport_nio/transport.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/16gheap.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/16gheap.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/16gheap.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/16gheap.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/1gheap.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/1gheap.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/1gheap.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/1gheap.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/24gheap.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/24gheap.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/24gheap.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/24gheap.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/2gheap.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/2gheap.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/2gheap.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/2gheap.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/4gheap.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/4gheap.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/4gheap.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/4gheap.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/8gheap.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/8gheap.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/8gheap.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/8gheap.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/basic-license.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/basic-license.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/basic-license.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/basic-license.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/dbg_non_safepoints/templates/config/jvm.options b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/dbg_non_safepoints/templates/config/jvm.options
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/dbg_non_safepoints/templates/config/jvm.options
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/dbg_non_safepoints/templates/config/jvm.options
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/debug-non-safepoints.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/debug-non-safepoints.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/debug-non-safepoints.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/debug-non-safepoints.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/defaults.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/defaults.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/defaults.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/defaults.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/ea.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/ea.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/ea.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/ea.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/ea/templates/config/jvm.options b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/ea/templates/config/jvm.options
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/ea/templates/config/jvm.options
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/ea/templates/config/jvm.options
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/fp.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/fp.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/fp.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/fp.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/fp/templates/config/jvm.options b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/fp/templates/config/jvm.options
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/fp/templates/config/jvm.options
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/fp/templates/config/jvm.options
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/g1gc.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/g1gc.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/g1gc.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/g1gc.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/parallelgc.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/parallelgc.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/parallelgc.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/parallelgc.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/trial-license.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/trial-license.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/trial-license.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/trial-license.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/unpooled.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/unpooled.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/unpooled.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/unpooled.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/unpooled/templates/config/jvm.options b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/unpooled/templates/config/jvm.options
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/unpooled/templates/config/jvm.options
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/unpooled/templates/config/jvm.options
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/vanilla/README.md b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/vanilla/README.md
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/vanilla/README.md
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/vanilla/README.md
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/vanilla/config.ini b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/vanilla/config.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/vanilla/config.ini
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/vanilla/config.ini
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/vanilla/templates/config/jvm.options b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/vanilla/templates/config/jvm.options
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/vanilla/templates/config/jvm.options
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/vanilla/templates/config/jvm.options
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/vanilla/templates/config/log4j2.properties b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/vanilla/templates/config/log4j2.properties
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/vanilla/templates/config/log4j2.properties
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/vanilla/templates/config/log4j2.properties
diff --git a/osbenchmark/resources/provision_configs/main/cluster_configs/v1/vanilla/templates/config/opensearch.yml b/osbenchmark/resources/cluster_configs/main/cluster_configs/v1/vanilla/templates/config/opensearch.yml
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/cluster_configs/v1/vanilla/templates/config/opensearch.yml
rename to osbenchmark/resources/cluster_configs/main/cluster_configs/v1/vanilla/templates/config/opensearch.yml
diff --git a/osbenchmark/resources/provision_configs/main/plugins/v1/core-plugins.txt b/osbenchmark/resources/cluster_configs/main/plugins/v1/core-plugins.txt
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/plugins/v1/core-plugins.txt
rename to osbenchmark/resources/cluster_configs/main/plugins/v1/core-plugins.txt
diff --git a/osbenchmark/resources/provision_configs/main/plugins/v1/repository_azure/README.md b/osbenchmark/resources/cluster_configs/main/plugins/v1/repository_azure/README.md
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/plugins/v1/repository_azure/README.md
rename to osbenchmark/resources/cluster_configs/main/plugins/v1/repository_azure/README.md
diff --git a/osbenchmark/resources/provision_configs/main/plugins/v1/repository_azure/plugin.py b/osbenchmark/resources/cluster_configs/main/plugins/v1/repository_azure/plugin.py
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/plugins/v1/repository_azure/plugin.py
rename to osbenchmark/resources/cluster_configs/main/plugins/v1/repository_azure/plugin.py
diff --git a/osbenchmark/resources/provision_configs/main/plugins/v1/repository_gcs/README.md b/osbenchmark/resources/cluster_configs/main/plugins/v1/repository_gcs/README.md
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/plugins/v1/repository_gcs/README.md
rename to osbenchmark/resources/cluster_configs/main/plugins/v1/repository_gcs/README.md
diff --git a/osbenchmark/resources/provision_configs/main/plugins/v1/repository_gcs/plugin.py b/osbenchmark/resources/cluster_configs/main/plugins/v1/repository_gcs/plugin.py
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/plugins/v1/repository_gcs/plugin.py
rename to osbenchmark/resources/cluster_configs/main/plugins/v1/repository_gcs/plugin.py
diff --git a/osbenchmark/resources/provision_configs/main/plugins/v1/repository_s3/README.md b/osbenchmark/resources/cluster_configs/main/plugins/v1/repository_s3/README.md
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/plugins/v1/repository_s3/README.md
rename to osbenchmark/resources/cluster_configs/main/plugins/v1/repository_s3/README.md
diff --git a/osbenchmark/resources/provision_configs/main/plugins/v1/repository_s3/plugin.py b/osbenchmark/resources/cluster_configs/main/plugins/v1/repository_s3/plugin.py
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/plugins/v1/repository_s3/plugin.py
rename to osbenchmark/resources/cluster_configs/main/plugins/v1/repository_s3/plugin.py
diff --git a/osbenchmark/resources/provision_configs/main/plugins/v1/transport_nio/default/templates/config/opensearch.yml b/osbenchmark/resources/cluster_configs/main/plugins/v1/transport_nio/default/templates/config/opensearch.yml
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/plugins/v1/transport_nio/default/templates/config/opensearch.yml
rename to osbenchmark/resources/cluster_configs/main/plugins/v1/transport_nio/default/templates/config/opensearch.yml
diff --git a/osbenchmark/resources/provision_configs/main/plugins/v1/transport_nio/http.ini b/osbenchmark/resources/cluster_configs/main/plugins/v1/transport_nio/http.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/plugins/v1/transport_nio/http.ini
rename to osbenchmark/resources/cluster_configs/main/plugins/v1/transport_nio/http.ini
diff --git a/osbenchmark/resources/provision_configs/main/plugins/v1/transport_nio/transport.ini b/osbenchmark/resources/cluster_configs/main/plugins/v1/transport_nio/transport.ini
similarity index 100%
rename from osbenchmark/resources/provision_configs/main/plugins/v1/transport_nio/transport.ini
rename to osbenchmark/resources/cluster_configs/main/plugins/v1/transport_nio/transport.ini