diff --git a/class/fluentbit.yml b/class/fluentbit.yml
index 76fa8bd..b186372 100644
--- a/class/fluentbit.yml
+++ b/class/fluentbit.yml
@@ -14,11 +14,11 @@ parameters:
       - input_paths:
           - fluentbit/component/main.jsonnet
         input_type: jsonnet
-        output_path: fluentbit/${_instance}/
+        output_path: ${_instance}/
       - input_paths:
           - ${_base_directory}/helmcharts/fluent-bit-${fluentbit:charts:fluent-bit:version}
         input_type: helm
-        output_path: fluentbit/${_instance}/01_fluentbit_helmchart
+        output_path: ${_instance}/01_fluentbit_helmchart
         helm_values: ${fluentbit:helm_values}
         helm_params:
           name: ${_instance}
@@ -27,5 +27,5 @@ parameters:
     postprocess:
       filters:
         - type: jsonnet
-          path: fluentbit/${_instance}/01_fluentbit_helmchart/fluent-bit/templates
+          path: ${_instance}/01_fluentbit_helmchart/fluent-bit/templates
           filter: postprocess/patch_helm_output.jsonnet
diff --git a/tests/golden/config/fluentbit/fluentbit/fluentbit/00_namespace.yaml b/tests/golden/config/fluentbit/fluentbit/00_namespace.yaml
similarity index 100%
rename from tests/golden/config/fluentbit/fluentbit/fluentbit/00_namespace.yaml
rename to tests/golden/config/fluentbit/fluentbit/00_namespace.yaml
diff --git a/tests/golden/config/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrole.yaml b/tests/golden/config/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrole.yaml
similarity index 100%
rename from tests/golden/config/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrole.yaml
rename to tests/golden/config/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrole.yaml
diff --git a/tests/golden/config/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrolebinding.yaml b/tests/golden/config/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrolebinding.yaml
similarity index 100%
rename from tests/golden/config/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrolebinding.yaml
rename to tests/golden/config/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrolebinding.yaml
diff --git a/tests/golden/config/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/daemonset.yaml b/tests/golden/config/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/daemonset.yaml
similarity index 100%
rename from tests/golden/config/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/daemonset.yaml
rename to tests/golden/config/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/daemonset.yaml
diff --git a/tests/golden/config/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/service.yaml b/tests/golden/config/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/service.yaml
similarity index 100%
rename from tests/golden/config/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/service.yaml
rename to tests/golden/config/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/service.yaml
diff --git a/tests/golden/config/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/serviceaccount.yaml b/tests/golden/config/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/serviceaccount.yaml
similarity index 100%
rename from tests/golden/config/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/serviceaccount.yaml
rename to tests/golden/config/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/serviceaccount.yaml
diff --git a/tests/golden/config/fluentbit/fluentbit/fluentbit/10_custom_config.yaml b/tests/golden/config/fluentbit/fluentbit/10_custom_config.yaml
similarity index 100%
rename from tests/golden/config/fluentbit/fluentbit/fluentbit/10_custom_config.yaml
rename to tests/golden/config/fluentbit/fluentbit/10_custom_config.yaml
diff --git a/tests/golden/config/fluentbit/fluentbit/fluentbit/10_custom_secret.yaml b/tests/golden/config/fluentbit/fluentbit/10_custom_secret.yaml
similarity index 100%
rename from tests/golden/config/fluentbit/fluentbit/fluentbit/10_custom_secret.yaml
rename to tests/golden/config/fluentbit/fluentbit/10_custom_secret.yaml
diff --git a/tests/golden/defaults/fluentbit/fluentbit/fluentbit/00_namespace.yaml b/tests/golden/defaults/fluentbit/fluentbit/00_namespace.yaml
similarity index 100%
rename from tests/golden/defaults/fluentbit/fluentbit/fluentbit/00_namespace.yaml
rename to tests/golden/defaults/fluentbit/fluentbit/00_namespace.yaml
diff --git a/tests/golden/defaults/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrole.yaml b/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrole.yaml
similarity index 100%
rename from tests/golden/defaults/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrole.yaml
rename to tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrole.yaml
diff --git a/tests/golden/defaults/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrolebinding.yaml b/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrolebinding.yaml
similarity index 100%
rename from tests/golden/defaults/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrolebinding.yaml
rename to tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrolebinding.yaml
diff --git a/tests/golden/defaults/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/daemonset.yaml b/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/daemonset.yaml
similarity index 100%
rename from tests/golden/defaults/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/daemonset.yaml
rename to tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/daemonset.yaml
diff --git a/tests/golden/defaults/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/service.yaml b/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/service.yaml
similarity index 100%
rename from tests/golden/defaults/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/service.yaml
rename to tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/service.yaml
diff --git a/tests/golden/defaults/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/serviceaccount.yaml b/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/serviceaccount.yaml
similarity index 100%
rename from tests/golden/defaults/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/serviceaccount.yaml
rename to tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/serviceaccount.yaml
diff --git a/tests/golden/defaults/fluentbit/fluentbit/fluentbit/10_custom_config.yaml b/tests/golden/defaults/fluentbit/fluentbit/10_custom_config.yaml
similarity index 100%
rename from tests/golden/defaults/fluentbit/fluentbit/fluentbit/10_custom_config.yaml
rename to tests/golden/defaults/fluentbit/fluentbit/10_custom_config.yaml