diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/default-vars.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/default-vars.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/default-vars.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/default-vars.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/errand-vars.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/errand-vars.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/errand-vars.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/errand-vars.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/network/2-az-configuration.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/network/2-az-configuration.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/network/2-az-configuration.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/network/2-az-configuration.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/network/3-az-configuration.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/network/3-az-configuration.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/network/3-az-configuration.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/network/3-az-configuration.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-10-maven_repositories.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-10-maven_repositories.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-10-maven_repositories.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-10-maven_repositories.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-2-maven_repositories.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-2-maven_repositories.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-2-maven_repositories.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-2-maven_repositories.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-3-maven_repositories.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-3-maven_repositories.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-3-maven_repositories.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-3-maven_repositories.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-4-maven_repositories.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-4-maven_repositories.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-4-maven_repositories.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-4-maven_repositories.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-5-maven_repositories.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-5-maven_repositories.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-5-maven_repositories.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-5-maven_repositories.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-6-maven_repositories.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-6-maven_repositories.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-6-maven_repositories.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-6-maven_repositories.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-7-maven_repositories.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-7-maven_repositories.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-7-maven_repositories.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-7-maven_repositories.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-8-maven_repositories.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-8-maven_repositories.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-8-maven_repositories.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-8-maven_repositories.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-9-maven_repositories.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-9-maven_repositories.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-9-maven_repositories.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-9-maven_repositories.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-composed_task_runner_uri.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-composed_task_runner_uri.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-composed_task_runner_uri.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-composed_task_runner_uri.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-security_groups.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-security_groups.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-security_groups.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-security_groups.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-wavefront_key.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-wavefront_key.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-wavefront_key.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-wavefront_key.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-wavefront_uri.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-wavefront_uri.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/optional/add-wavefront_uri.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/optional/add-wavefront_uri.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/product.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/product.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/product.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/product.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/required-vars.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/required-vars.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/required-vars.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/required-vars.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource-vars.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/resource-vars.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource-vars.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/resource-vars.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/create-uaa-client_additional_vm_extensions.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/create-uaa-client_additional_vm_extensions.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/create-uaa-client_additional_vm_extensions.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/create-uaa-client_additional_vm_extensions.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/create-uaa-client_elb_names.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/create-uaa-client_elb_names.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/create-uaa-client_elb_names.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/create-uaa-client_elb_names.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/create-uaa-client_internet_connected.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/create-uaa-client_internet_connected.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/create-uaa-client_internet_connected.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/create-uaa-client_internet_connected.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/create-uaa-client_nsx_security_groups.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/create-uaa-client_nsx_security_groups.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/create-uaa-client_nsx_security_groups.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/create-uaa-client_nsx_security_groups.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/delete-all_additional_vm_extensions.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/delete-all_additional_vm_extensions.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/delete-all_additional_vm_extensions.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/delete-all_additional_vm_extensions.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/delete-all_elb_names.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/delete-all_elb_names.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/delete-all_elb_names.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/delete-all_elb_names.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/delete-all_internet_connected.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/delete-all_internet_connected.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/delete-all_internet_connected.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/delete-all_internet_connected.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/delete-all_nsx_security_groups.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/delete-all_nsx_security_groups.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/delete-all_nsx_security_groups.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/delete-all_nsx_security_groups.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/deploy-all_additional_vm_extensions.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/deploy-all_additional_vm_extensions.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/deploy-all_additional_vm_extensions.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/deploy-all_additional_vm_extensions.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/deploy-all_elb_names.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/deploy-all_elb_names.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/deploy-all_elb_names.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/deploy-all_elb_names.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/deploy-all_internet_connected.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/deploy-all_internet_connected.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/deploy-all_internet_connected.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/deploy-all_internet_connected.yml
diff --git a/configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/deploy-all_nsx_security_groups.yml b/configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/deploy-all_nsx_security_groups.yml
similarity index 100%
rename from configtemplate/generator/fixtures/p-dataflow/1.14.2/p-dataflow/1.14.2/resource/deploy-all_nsx_security_groups.yml
rename to configtemplate/generator/fixtures/p-dataflow/1.14.2/resource/deploy-all_nsx_security_groups.yml