diff --git a/catalog-info.yaml b/test-framework/catalog-info.yaml
similarity index 100%
rename from catalog-info.yaml
rename to test-framework/catalog-info.yaml
diff --git a/property-settings-svc-v2-chart/.helmignore b/test-framework/helm/property-settings-svc-v2/.helmignore
similarity index 100%
rename from property-settings-svc-v2-chart/.helmignore
rename to test-framework/helm/property-settings-svc-v2/.helmignore
diff --git a/property-settings-svc-v2-chart/Chart.lock b/test-framework/helm/property-settings-svc-v2/Chart.lock
similarity index 100%
rename from property-settings-svc-v2-chart/Chart.lock
rename to test-framework/helm/property-settings-svc-v2/Chart.lock
diff --git a/property-settings-svc-v2-chart/Chart.yaml b/test-framework/helm/property-settings-svc-v2/Chart.yaml
similarity index 100%
rename from property-settings-svc-v2-chart/Chart.yaml
rename to test-framework/helm/property-settings-svc-v2/Chart.yaml
diff --git a/property-settings-svc-v2-chart/charts/mysql-1.6.9.tgz b/test-framework/helm/property-settings-svc-v2/charts/mysql-1.6.9.tgz
similarity index 100%
rename from property-settings-svc-v2-chart/charts/mysql-1.6.9.tgz
rename to test-framework/helm/property-settings-svc-v2/charts/mysql-1.6.9.tgz
diff --git a/property-settings-svc-v2-chart/hades.sql b/test-framework/helm/property-settings-svc-v2/hades.sql
similarity index 100%
rename from property-settings-svc-v2-chart/hades.sql
rename to test-framework/helm/property-settings-svc-v2/hades.sql
diff --git a/property-settings-svc-v2-chart/logs b/test-framework/helm/property-settings-svc-v2/logs
similarity index 100%
rename from property-settings-svc-v2-chart/logs
rename to test-framework/helm/property-settings-svc-v2/logs
diff --git a/property-settings-svc-v2-chart/sql/000_create_property_settings_db.sql b/test-framework/helm/property-settings-svc-v2/sql/000_create_property_settings_db.sql
similarity index 100%
rename from property-settings-svc-v2-chart/sql/000_create_property_settings_db.sql
rename to test-framework/helm/property-settings-svc-v2/sql/000_create_property_settings_db.sql
diff --git a/property-settings-svc-v2-chart/sql/001_properties_table.sql b/test-framework/helm/property-settings-svc-v2/sql/001_properties_table.sql
similarity index 100%
rename from property-settings-svc-v2-chart/sql/001_properties_table.sql
rename to test-framework/helm/property-settings-svc-v2/sql/001_properties_table.sql
diff --git a/property-settings-svc-v2-chart/sql/002_populate_properties_table.sql b/test-framework/helm/property-settings-svc-v2/sql/002_populate_properties_table.sql
similarity index 100%
rename from property-settings-svc-v2-chart/sql/002_populate_properties_table.sql
rename to test-framework/helm/property-settings-svc-v2/sql/002_populate_properties_table.sql
diff --git a/property-settings-svc-v2-chart/sql/003_alter_column_property_value.sql b/test-framework/helm/property-settings-svc-v2/sql/003_alter_column_property_value.sql
similarity index 100%
rename from property-settings-svc-v2-chart/sql/003_alter_column_property_value.sql
rename to test-framework/helm/property-settings-svc-v2/sql/003_alter_column_property_value.sql
diff --git a/property-settings-svc-v2-chart/sql/004_property_settings_db_v2.sql b/test-framework/helm/property-settings-svc-v2/sql/004_property_settings_db_v2.sql
similarity index 100%
rename from property-settings-svc-v2-chart/sql/004_property_settings_db_v2.sql
rename to test-framework/helm/property-settings-svc-v2/sql/004_property_settings_db_v2.sql
diff --git a/property-settings-svc-v2-chart/templates/NOTES.txt b/test-framework/helm/property-settings-svc-v2/templates/NOTES.txt
similarity index 100%
rename from property-settings-svc-v2-chart/templates/NOTES.txt
rename to test-framework/helm/property-settings-svc-v2/templates/NOTES.txt
diff --git a/property-settings-svc-v2-chart/templates/_db-helpers.tpl b/test-framework/helm/property-settings-svc-v2/templates/_db-helpers.tpl
similarity index 100%
rename from property-settings-svc-v2-chart/templates/_db-helpers.tpl
rename to test-framework/helm/property-settings-svc-v2/templates/_db-helpers.tpl
diff --git a/property-settings-svc-v2-chart/templates/_helpers.tpl b/test-framework/helm/property-settings-svc-v2/templates/_helpers.tpl
similarity index 100%
rename from property-settings-svc-v2-chart/templates/_helpers.tpl
rename to test-framework/helm/property-settings-svc-v2/templates/_helpers.tpl
diff --git a/property-settings-svc-v2-chart/templates/configmap-sql-migrations.yaml b/test-framework/helm/property-settings-svc-v2/templates/configmap-sql-migrations.yaml
similarity index 100%
rename from property-settings-svc-v2-chart/templates/configmap-sql-migrations.yaml
rename to test-framework/helm/property-settings-svc-v2/templates/configmap-sql-migrations.yaml
diff --git a/property-settings-svc-v2-chart/templates/configmap.yaml b/test-framework/helm/property-settings-svc-v2/templates/configmap.yaml
similarity index 100%
rename from property-settings-svc-v2-chart/templates/configmap.yaml
rename to test-framework/helm/property-settings-svc-v2/templates/configmap.yaml
diff --git a/property-settings-svc-v2-chart/templates/deployment.yaml b/test-framework/helm/property-settings-svc-v2/templates/deployment.yaml
similarity index 100%
rename from property-settings-svc-v2-chart/templates/deployment.yaml
rename to test-framework/helm/property-settings-svc-v2/templates/deployment.yaml
diff --git a/property-settings-svc-v2-chart/templates/hpa.yaml b/test-framework/helm/property-settings-svc-v2/templates/hpa.yaml
similarity index 100%
rename from property-settings-svc-v2-chart/templates/hpa.yaml
rename to test-framework/helm/property-settings-svc-v2/templates/hpa.yaml
diff --git a/property-settings-svc-v2-chart/templates/httproute.yaml b/test-framework/helm/property-settings-svc-v2/templates/httproute.yaml
similarity index 100%
rename from property-settings-svc-v2-chart/templates/httproute.yaml
rename to test-framework/helm/property-settings-svc-v2/templates/httproute.yaml
diff --git a/property-settings-svc-v2-chart/templates/ingress.yaml b/test-framework/helm/property-settings-svc-v2/templates/ingress.yaml
similarity index 100%
rename from property-settings-svc-v2-chart/templates/ingress.yaml
rename to test-framework/helm/property-settings-svc-v2/templates/ingress.yaml
diff --git a/property-settings-svc-v2-chart/templates/job-dbinit.yaml b/test-framework/helm/property-settings-svc-v2/templates/job-dbinit.yaml
similarity index 100%
rename from property-settings-svc-v2-chart/templates/job-dbinit.yaml
rename to test-framework/helm/property-settings-svc-v2/templates/job-dbinit.yaml
diff --git a/property-settings-svc-v2-chart/templates/secret.yaml b/test-framework/helm/property-settings-svc-v2/templates/secret.yaml
similarity index 100%
rename from property-settings-svc-v2-chart/templates/secret.yaml
rename to test-framework/helm/property-settings-svc-v2/templates/secret.yaml
diff --git a/property-settings-svc-v2-chart/templates/service.yaml b/test-framework/helm/property-settings-svc-v2/templates/service.yaml
similarity index 100%
rename from property-settings-svc-v2-chart/templates/service.yaml
rename to test-framework/helm/property-settings-svc-v2/templates/service.yaml
diff --git a/property-settings-svc-v2-chart/templates/serviceaccount.yaml b/test-framework/helm/property-settings-svc-v2/templates/serviceaccount.yaml
similarity index 100%
rename from property-settings-svc-v2-chart/templates/serviceaccount.yaml
rename to test-framework/helm/property-settings-svc-v2/templates/serviceaccount.yaml
diff --git a/property-settings-svc-v2-chart/templates/tests/test-connection.yaml b/test-framework/helm/property-settings-svc-v2/templates/tests/test-connection.yaml
similarity index 100%
rename from property-settings-svc-v2-chart/templates/tests/test-connection.yaml
rename to test-framework/helm/property-settings-svc-v2/templates/tests/test-connection.yaml
diff --git a/property-settings-svc-v2-chart/values.yaml b/test-framework/helm/property-settings-svc-v2/values.yaml
similarity index 100%
rename from property-settings-svc-v2-chart/values.yaml
rename to test-framework/helm/property-settings-svc-v2/values.yaml